From 9292e4ef144f24bc164c9627edadf9b56cac145a Mon Sep 17 00:00:00 2001
From: Ellet <ellet@freshplatform.net>
Date: Wed, 20 Dec 2023 15:23:01 +0300
Subject: [PATCH] Fix history button

---
 example/lib/presentation/quill/my_quill_toolbar.dart   |  9 +--------
 lib/src/widgets/toolbar/buttons/history_button.dart    |  4 ++--
 lib/src/widgets/toolbar/buttons/quill_icon_button.dart | 10 ++++++----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/example/lib/presentation/quill/my_quill_toolbar.dart b/example/lib/presentation/quill/my_quill_toolbar.dart
index bc0a413b..1614528d 100644
--- a/example/lib/presentation/quill/my_quill_toolbar.dart
+++ b/example/lib/presentation/quill/my_quill_toolbar.dart
@@ -201,14 +201,7 @@ class MyQuillToolbar extends StatelessWidget {
           configurations: QuillSimpleToolbarConfigurations(
             controller: controller,
             showAlignmentButtons: true,
-            multiRowsDisplay: false,
-            buttonOptions: QuillSimpleToolbarButtonOptions(
-              base: QuillToolbarBaseButtonOptions(
-                // Request editor focus when any button is pressed
-                afterButtonPressed: focusNode.requestFocus,
-                // globalIconSize: 18,
-              ),
-            ),
+            multiRowsDisplay: true,
             customButtons: [
               QuillToolbarCustomButtonOptions(
                 icon: const Icon(Icons.add_alarm_rounded),
diff --git a/lib/src/widgets/toolbar/buttons/history_button.dart b/lib/src/widgets/toolbar/buttons/history_button.dart
index b9d4c504..21271a7f 100644
--- a/lib/src/widgets/toolbar/buttons/history_button.dart
+++ b/lib/src/widgets/toolbar/buttons/history_button.dart
@@ -103,10 +103,10 @@ class QuillToolbarHistoryButtonState extends State<QuillToolbarHistoryButton> {
         iconData,
         size: iconSize * iconButtonFactor,
       ),
-      isSelected: _canPressed,
+      isSelected: false,
       iconSelectedStyle: iconTheme?.iconButtonSelectedStyle,
       iconUnselectedStyle: iconTheme?.iconButtonUnselectedStyle,
-      onPressed: _updateHistory,
+      onPressed: _canPressed ? _updateHistory : null,
       afterPressed: afterButtonPressed,
     );
   }
diff --git a/lib/src/widgets/toolbar/buttons/quill_icon_button.dart b/lib/src/widgets/toolbar/buttons/quill_icon_button.dart
index 0ceeafff..91091099 100644
--- a/lib/src/widgets/toolbar/buttons/quill_icon_button.dart
+++ b/lib/src/widgets/toolbar/buttons/quill_icon_button.dart
@@ -35,10 +35,12 @@ class QuillToolbarIconButton extends StatelessWidget {
     }
     return IconButton(
       padding: padding,
-      onPressed: () {
-        onPressed?.call();
-        afterPressed?.call();
-      },
+      onPressed: onPressed != null
+          ? () {
+              onPressed?.call();
+              afterPressed?.call();
+            }
+          : null,
       icon: icon,
       style: iconUnselectedStyle,
     );