Revert hasActiveSuggestion deletion

fleather-editor · Dec 10, 2023 · b73db1a · b73db1a
1 parent d2c0b4f
commit b73db1a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/packages/fleather/lib/src/widgets/autoformats.dart b/packages/fleather/lib/src/widgets/autoformats.dart
@@ -47,9 +47,12 @@ class AutoFormats {
   /// The position at which the active suggestion can be deactivated
   int get undoPosition => _activeSuggestion!.undoPositionCandidate;
 
-  /// `true` if there is an active suggestion and undo delta is not empty;
+  /// `true` if there is an active suggestion; `false` otherwise
+  bool get hasActiveSuggestion => _activeSuggestion != null;
+
+  /// `true` if hasActiveSuggestion and undo delta is not empty;
   /// `false` otherwise
-  bool get canUndo => _activeSuggestion?.undo.isNotEmpty == true;
+  bool get canUndo => hasActiveSuggestion && _activeSuggestion!.undo.isNotEmpty;
 
   /// Perform detection of auto formats and apply changes to [document].
   ///

diff --git a/packages/fleather/lib/src/widgets/controller.dart b/packages/fleather/lib/src/widgets/controller.dart
@@ -171,6 +171,8 @@ class FleatherController extends ChangeNotifier {
   // document; `false` otherwise
   bool _captureAutoFormatCancellationOrUndo(
       ParchmentDocument document, int position, int length, Object data) {
+    if (!_autoFormats.hasActiveSuggestion) return true;
+
     if (_autoFormats.canUndo) {
       final isDeletionOfOneChar = data is String && data.isEmpty && length == 1;
       if (isDeletionOfOneChar) {

diff --git a/packages/fleather/test/widgets/autoformats_test.dart b/packages/fleather/test/widgets/autoformats_test.dart
@@ -45,7 +45,7 @@ void main() {
       ]);
       final performed = autoformats.run(document, 54, 'p');
       expect(performed, false);
-      expect(autoformats.canUndo, isFalse);
+      expect(autoformats.hasActiveSuggestion, isFalse);
     });
 
     test('Deleting at candidate position, undoes link formatting', () {
@@ -67,7 +67,7 @@ void main() {
       ]);
       autoformats.run(document, 54, ' ');
       autoformats.cancelActive();
-      expect(autoformats.canUndo, isFalse);
+      expect(autoformats.hasActiveSuggestion, isFalse);
     });
   });
 
@@ -138,7 +138,7 @@ void main() {
       ]);
       final performed = autoformats.run(document, 16, 'p');
       expect(performed, false);
-      expect(autoformats.canUndo, isFalse);
+      expect(autoformats.hasActiveSuggestion, isFalse);
     });
 
     test('Deleting at candidate position, undoes link formatting', () {
@@ -160,7 +160,7 @@ void main() {
       ]);
       autoformats.run(document, 54, ' ');
       autoformats.cancelActive();
-      expect(autoformats.canUndo, isFalse);
+      expect(autoformats.hasActiveSuggestion, isFalse);
     });
   });