Merge remote-tracking branch 'upstream/master' into dev

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - 'pubspec.yaml'
+      - 'flutter_quill_extensions/pubspec.yaml'
 
 jobs:
   build_linux:

flutter_quill_extensions/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
+<<<<<<< HEAD
 ## 9.0.2-dev
 * **Breaking change** Remove the spacer widget, removed the controller option for each button
 * Add `toolbarRunSpacing` property to the simple toolbar
@@ -9,6 +10,8 @@ All notable changes to this project will be documented in this file.
 ## 9.0.1
 * Fix default icon size
 
+=======
+>>>>>>> upstream/master
 ## 9.0.0
 * This version is quite stable but it's not how we wanted to be, because the lack of time and there are not too many maintainers active, we decided to publish it, we might make a new breaking changes verion
 

flutter_quill_extensions/pubspec.yaml

@@ -1,6 +1,10 @@
 name: flutter_quill_extensions
 description: Embed extensions for flutter_quill including image, video, formula and etc.
+<<<<<<< HEAD
 version: 9.0.2-dev
+=======
+version: 9.0.0
+>>>>>>> upstream/master
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

flutter_quill_test/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
+<<<<<<< HEAD
 ## 9.0.2-dev
 * **Breaking change** Remove the spacer widget, removed the controller option for each button
 * Add `toolbarRunSpacing` property to the simple toolbar
@@ -9,6 +10,8 @@ All notable changes to this project will be documented in this file.
 ## 9.0.1
 * Fix default icon size
 
+=======
+>>>>>>> upstream/master
 ## 9.0.0
 * This version is quite stable but it's not how we wanted to be, because the lack of time and there are not too many maintainers active, we decided to publish it, we might make a new breaking changes verion
 

flutter_quill_test/pubspec.yaml

@@ -1,6 +1,10 @@
 name: flutter_quill_test
 description: Test utilities for flutter_quill which includes methods to simplify interacting with the editor in test cases.
+<<<<<<< HEAD
 version: 9.0.2-dev
+=======
+version: 9.0.0
+>>>>>>> upstream/master
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

lib/src/models/themes/quill_icon_theme.dart

@@ -1,6 +1,4 @@
-import 'package:flutter/widgets.dart' show Color;
+import 'package:flutter/material.dart';
-
-import 'package:meta/meta.dart' show immutable;
 
 @immutable
 class QuillIconTheme {
@@ -11,7 +9,8 @@ class QuillIconTheme {
       this.iconUnselectedFillColor,
       this.disabledIconColor,
       this.disabledIconFillColor,
-      this.borderRadius});
+      this.borderRadius,
+      this.padding});
 
   ///The color to use for selected icons in the toolbar
   final Color? iconSelectedColor;
@@ -33,4 +32,7 @@ class QuillIconTheme {
 
   ///The borderRadius for icons
   final double? borderRadius;
+
+  ///The padding for icons
+  final EdgeInsets? padding;  
 }

lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_button.dart

@@ -1,12 +1,18 @@
 import 'package:flutter/material.dart';
 
 import '../../../../../translations.dart';
+<<<<<<< HEAD
 import '../../../../extensions/quill_configurations_ext.dart';
 import '../../../../models/config/toolbar/buttons/select_header_style_button_configurations.dart';
 import '../../../../models/documents/attribute.dart';
 import '../../../../models/themes/quill_icon_theme.dart';
 import '../../../quill/quill_controller.dart';
 import '../../base_toolbar.dart';
+=======
+import '../../../../models/config/toolbar/buttons/select_header_style_configurations.dart';
+import '../../../../models/documents/attribute.dart';
+import '../../../quill/quill_controller.dart';
+>>>>>>> upstream/master
 
 enum _HeaderStyleOptions {
   normal,

lib/src/widgets/toolbar/buttons/quill_icon_button.dart

@@ -7,6 +7,7 @@ class QuillToolbarIconButton extends StatelessWidget {
     required this.isFilled,
     this.afterPressed,
     this.tooltip,
+    this.padding,
     super.key,
   });
 
@@ -15,14 +16,20 @@ class QuillToolbarIconButton extends StatelessWidget {
   final Widget icon;
 
   final String? tooltip;
+  final EdgeInsets? padding;
   final bool isFilled;
 
   @override
   Widget build(BuildContext context) {
     if (isFilled) {
-      return IconButton.filled(onPressed: onPressed, icon: icon);
+      return IconButton.filled(
+        padding: padding,
+        constraints: const BoxConstraints(),
+        onPressed: onPressed, icon: icon);
     }
     return IconButton(
+      padding: padding,
+      constraints: const BoxConstraints(),
       onPressed: () {
         onPressed?.call();
         afterPressed?.call();

lib/src/widgets/toolbar/buttons/toggle_style_button.dart

@@ -253,5 +253,6 @@ Widget defaultToggleStyleButtonBuilder(
     isFilled: isEnabled ? isToggled == true : false,
     onPressed: onPressed,
     afterPressed: afterPressed,
+    padding: iconTheme?.padding
   );
 }