From 77cf69097a018064d7c5d01842e20248ff402b7e Mon Sep 17 00:00:00 2001
From: Brett Morgan <brett.morgan@gmail.com>
Date: Fri, 17 Jun 2022 06:59:49 +1000
Subject: [PATCH] Pull up `TextEditingDeltaHistoryManager` to drop redundancy
 (#1306)

---
 simplistic_editor/lib/main.dart               | 100 +++++++++---------
 .../text_editing_delta_history_manager.dart   |   3 +-
 2 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/simplistic_editor/lib/main.dart b/simplistic_editor/lib/main.dart
index 19413980a..e95255e49 100644
--- a/simplistic_editor/lib/main.dart
+++ b/simplistic_editor/lib/main.dart
@@ -303,46 +303,46 @@ class _MyHomePageState extends State<MyHomePage> {
                 _updateToggleButtonsStateOnButtonPressed,
             updateToggleButtonStateOnSelectionChanged:
                 _updateToggleButtonsStateOnSelectionChanged,
-            child: Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 8.0),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Builder(builder: (innerContext) {
-                        final ToggleButtonsStateManager manager =
-                            ToggleButtonsStateManager.of(innerContext);
+            child: TextEditingDeltaHistoryManager(
+              history: _textEditingDeltaHistory,
+              updateHistoryOnInput: _updateTextEditingDeltaHistory,
+              child: Column(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 8.0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Builder(builder: (innerContext) {
+                          final ToggleButtonsStateManager manager =
+                              ToggleButtonsStateManager.of(innerContext);
 
-                        return ToggleButtons(
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(4.0)),
-                          isSelected: [
-                            manager.toggleButtonsState
-                                .contains(ToggleButtonsState.bold),
-                            manager.toggleButtonsState
-                                .contains(ToggleButtonsState.italic),
-                            manager.toggleButtonsState
-                                .contains(ToggleButtonsState.underline),
-                          ],
-                          onPressed: (index) =>
-                              manager.updateToggleButtonsOnButtonPressed(index),
-                          children: const [
-                            Icon(Icons.format_bold),
-                            Icon(Icons.format_italic),
-                            Icon(Icons.format_underline),
-                          ],
-                        );
-                      }),
-                    ],
+                          return ToggleButtons(
+                            borderRadius:
+                                const BorderRadius.all(Radius.circular(4.0)),
+                            isSelected: [
+                              manager.toggleButtonsState
+                                  .contains(ToggleButtonsState.bold),
+                              manager.toggleButtonsState
+                                  .contains(ToggleButtonsState.italic),
+                              manager.toggleButtonsState
+                                  .contains(ToggleButtonsState.underline),
+                            ],
+                            onPressed: (index) => manager
+                                .updateToggleButtonsOnButtonPressed(index),
+                            children: const [
+                              Icon(Icons.format_bold),
+                              Icon(Icons.format_italic),
+                              Icon(Icons.format_underline),
+                            ],
+                          );
+                        }),
+                      ],
+                    ),
                   ),
-                ),
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 35.0),
-                    child: TextEditingDeltaHistoryManager(
-                      history: _textEditingDeltaHistory,
-                      updateHistoryOnInput: _updateTextEditingDeltaHistory,
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 35.0),
                       child: BasicTextField(
                         controller: _replacementTextEditingController,
                         style: const TextStyle(
@@ -351,15 +351,11 @@ class _MyHomePageState extends State<MyHomePage> {
                       ),
                     ),
                   ),
-                ),
-                Expanded(
-                  child: Column(
-                    children: [
-                      _buildTextEditingDeltaViewHeader(),
-                      Expanded(
-                        child: TextEditingDeltaHistoryManager(
-                          history: _textEditingDeltaHistory,
-                          updateHistoryOnInput: _updateTextEditingDeltaHistory,
+                  Expanded(
+                    child: Column(
+                      children: [
+                        _buildTextEditingDeltaViewHeader(),
+                        Expanded(
                           child: Builder(
                             builder: (innerContext) {
                               final TextEditingDeltaHistoryManager manager =
@@ -381,12 +377,12 @@ class _MyHomePageState extends State<MyHomePage> {
                             },
                           ),
                         ),
-                      ),
-                      const SizedBox(height: 10),
-                    ],
+                        const SizedBox(height: 10),
+                      ],
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
           ),
         ),
diff --git a/simplistic_editor/lib/text_editing_delta_history_manager.dart b/simplistic_editor/lib/text_editing_delta_history_manager.dart
index 24740ac57..beb7bff6f 100644
--- a/simplistic_editor/lib/text_editing_delta_history_manager.dart
+++ b/simplistic_editor/lib/text_editing_delta_history_manager.dart
@@ -18,7 +18,8 @@ class TextEditingDeltaHistoryManager extends InheritedWidget {
   static TextEditingDeltaHistoryManager of(BuildContext context) {
     final TextEditingDeltaHistoryManager? result = context
         .dependOnInheritedWidgetOfExactType<TextEditingDeltaHistoryManager>();
-    assert(result != null, 'No ToggleButtonsStateManager found in context');
+    assert(
+        result != null, 'No TextEditingDeltaHistoryManager found in context');
     return result!;
   }