Fixes for before_push script

example/lib/screens/quill/my_quill_toolbar.dart

@@ -223,24 +223,24 @@ class MyQuillToolbar extends StatelessWidget {
               '40': '40.0'
             },
             // headerStyleType: HeaderStyleType.buttons,
-            buttonOptions: QuillSimpleToolbarButtonOptions(
+            // buttonOptions: QuillSimpleToolbarButtonOptions(
-              base: QuillToolbarBaseButtonOptions(
+            //   base: QuillToolbarBaseButtonOptions(
-                afterButtonPressed: focusNode.requestFocus,
+            //   afterButtonPressed: focusNode.requestFocus,
-                //     // iconSize: 20,
+            //     // iconSize: 20,
-                //     iconTheme: QuillIconTheme(
+            //     iconTheme: QuillIconTheme(
-                //       iconButtonSelectedData: IconButtonData(
+            //       iconButtonSelectedData: IconButtonData(
-                //         style: IconButton.styleFrom(
+            //         style: IconButton.styleFrom(
-                //           foregroundColor: Colors.blue,
+            //           foregroundColor: Colors.blue,
-                //         ),
+            //         ),
-                //       ),
+            //       ),
-                //       iconButtonUnselectedData: IconButtonData(
+            //       iconButtonUnselectedData: IconButtonData(
-                //         style: IconButton.styleFrom(
+            //         style: IconButton.styleFrom(
-                //           foregroundColor: Colors.red,
+            //           foregroundColor: Colors.red,
-                //         ),
+            //         ),
-                //       ),
+            //       ),
-                //     ),
+            //     ),
-              ),
+            //  ),
-            ),
+            //),
             customButtons: [
               QuillToolbarCustomButtonOptions(
                 icon: const Icon(Icons.add_alarm_rounded),

lib/src/widgets/toolbar/base_button/base_value_button.dart

@@ -21,7 +21,7 @@ abstract class QuillToolbarBaseValueButtonState<
     W extends QuillToolbarBaseValueButton<T, E>,
     T extends QuillToolbarBaseButtonOptions<T, E>,
     E extends QuillToolbarBaseButtonExtraOptions,
-    V > extends State<W> {
+    V> extends State<W> {
   T get options => widget.options;
 
   QuillController get controller => widget.controller;
@@ -72,7 +72,7 @@ abstract class QuillToolbarBaseValueButtonState<
   }
 
   double get iconSize {
-    final baseFontSize = context.quillToolbarBaseButtonOptions?.iconSize;
+    final baseFontSize = baseButtonExtraOptions?.iconSize;
     final iconSize = options.iconSize;
     return iconSize ?? baseFontSize ?? kDefaultIconSize;
   }

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

@@ -28,16 +28,19 @@ class QuillToolbarFontFamilyButton extends QuillToolbarBaseValueButton<
       QuillToolbarFontFamilyButtonState();
 }
 
-class QuillToolbarFontFamilyButtonState extends QuillToolbarBaseValueButtonState<
+class QuillToolbarFontFamilyButtonState
-    QuillToolbarFontFamilyButton,
+    extends QuillToolbarBaseValueButtonState<
-    QuillToolbarFontFamilyButtonOptions,
+        QuillToolbarFontFamilyButton,
-    QuillToolbarFontFamilyButtonExtraOptions,
+        QuillToolbarFontFamilyButtonOptions,
-    String> {
+        QuillToolbarFontFamilyButtonExtraOptions,
-
+        String> {
   @override
   String get currentStateValue {
-    final attribute = controller.getSelectionStyle().attributes[options.attribute.key];
+    final attribute =
-    return attribute == null ? _defaultDisplayText : (_getKeyName(attribute.value) ?? _defaultDisplayText);
+        controller.getSelectionStyle().attributes[options.attribute.key];
+    return attribute == null
+        ? _defaultDisplayText
+        : (_getKeyName(attribute.value) ?? _defaultDisplayText);
   }
 
   String get _defaultDisplayText {

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

@@ -66,8 +66,11 @@ class QuillToolbarFontSizeButtonState extends QuillToolbarBaseValueButtonState<
 
   @override
   String get currentStateValue {
-    final attribute = controller.getSelectionStyle().attributes[options.attribute.key];
+    final attribute =
-    return attribute == null ? _defaultDisplayText : (_getKeyName(attribute.value) ?? _defaultDisplayText);
+        controller.getSelectionStyle().attributes[options.attribute.key];
+    return attribute == null
+        ? _defaultDisplayText
+        : (_getKeyName(attribute.value) ?? _defaultDisplayText);
   }
 
   String? _getKeyName(dynamic value) {

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

@@ -27,7 +27,6 @@ class QuillToolbarToggleCheckListButtonState
         QuillToolbarToggleCheckListButtonOptions,
         QuillToolbarToggleCheckListButtonExtraOptions,
         bool> {
-
   Style get _selectionStyle => controller.getSelectionStyle();
 
   @override

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

@@ -21,9 +21,7 @@ typedef ToggleStyleButtonBuilder = Widget Function(
   QuillIconTheme? iconTheme,
 ]);
 
-class QuillToolbarToggleStyleButton extends QuillToolbarBaseValueButton<
+class QuillToolbarToggleStyleButton extends QuillToolbarBaseValueButton<QuillToolbarToggleStyleButtonOptions, QuillToolbarToggleStyleButtonExtraOptions> {
-    QuillToolbarToggleStyleButtonOptions,
-    QuillToolbarToggleStyleButtonExtraOptions> {
   const QuillToolbarToggleStyleButton({
     required super.controller,
     required this.attribute,
@@ -34,16 +32,11 @@ class QuillToolbarToggleStyleButton extends QuillToolbarBaseValueButton<
   final Attribute attribute;
 
   @override
-  QuillToolbarToggleStyleButtonState createState() =>
+  QuillToolbarToggleStyleButtonState createState() => QuillToolbarToggleStyleButtonState();
-      QuillToolbarToggleStyleButtonState();
 }
 
-class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonState<
+class QuillToolbarToggleStyleButtonState
-    QuillToolbarToggleStyleButton,
+    extends QuillToolbarBaseValueButtonState<QuillToolbarToggleStyleButton, QuillToolbarToggleStyleButtonOptions, QuillToolbarToggleStyleButtonExtraOptions, bool> {
-    QuillToolbarToggleStyleButtonOptions,
-    QuillToolbarToggleStyleButtonExtraOptions,
-    bool> {
-
   Style get _selectionStyle => controller.getSelectionStyle();
 
   @override
@@ -84,10 +77,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat
           'left' => (context.loc.alignLeft, Icons.format_align_left),
           'right' => (context.loc.alignRight, Icons.format_align_right),
           'center' => (context.loc.alignCenter, Icons.format_align_center),
-          'justify' => (
+          'justify' => (context.loc.justifyWinWidth, Icons.format_align_justify),
-              context.loc.justifyWinWidth,
-              Icons.format_align_justify
-            ),
           Object() => throw ArgumentError(widget.attribute.value),
           null => (context.loc.alignCenter, Icons.format_align_center),
         };
@@ -103,9 +93,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat
   String get defaultTooltip => _defaultTooltipAndIconData.$1;
 
   IconData get iconData {
-    return options.iconData ??
+    return options.iconData ?? context.quillToolbarBaseButtonOptions?.iconData ?? _defaultTooltipAndIconData.$2;
-        context.quillToolbarBaseButtonOptions?.iconData ??
-        _defaultTooltipAndIconData.$2;
   }
 
   void _onPressed() {
@@ -115,8 +103,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat
 
   @override
   Widget build(BuildContext context) {
-    final childBuilder = options.childBuilder ??
+    final childBuilder = options.childBuilder ?? context.quillToolbarBaseButtonOptions?.childBuilder;
-        context.quillToolbarBaseButtonOptions?.childBuilder;
     if (childBuilder != null) {
       return childBuilder(
         options,
@@ -146,9 +133,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat
   }
 
   bool _getIsToggled(Map<String, Attribute> attrs) {
-    if (widget.attribute.key == Attribute.list.key ||
+    if (widget.attribute.key == Attribute.list.key || widget.attribute.key == Attribute.script.key || widget.attribute.key == Attribute.align.key) {
-        widget.attribute.key == Attribute.script.key ||
-        widget.attribute.key == Attribute.align.key) {
       final attribute = attrs[widget.attribute.key];
       if (attribute == null) {
         return false;
@@ -159,11 +144,11 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat
   }
 
   void _toggleAttribute() {
-    controller..formatSelection(
+    controller
-      currentValue
+      ..skipRequestKeyboard = !widget.attribute.isInline
-          ? Attribute.clone(widget.attribute, null)
+      ..formatSelection(
-          : widget.attribute,
+        currentValue ? Attribute.clone(widget.attribute, null) : widget.attribute,
-    )
+      )
       ..selectStyle(widget.attribute, currentValue);
   }
 }