test: added tests for undo and redo in load sketch (#69)

timcreatedit · TecReaGroup · commit 441d9c6ac3c8 · 2025-06-04T16:02:02.000+08:00
* test: added tests for undo and redo in load sketch

* removed import
diff --git a/coverage/lcov.info b/coverage/lcov.info
@@ -47,16 +47,16 @@ DA:102,0
 DA:103,3
 DA:109,2
 DA:114,2
-DA:131,0
+DA:131,3
 DA:135,1
 DA:136,1
-DA:144,0
-DA:150,0
-DA:151,0
-DA:164,0
-DA:168,0
-DA:172,0
-DA:174,0
+DA:144,1
+DA:150,2
+DA:151,1
+DA:164,1
+DA:168,3
+DA:172,1
+DA:174,1
 DA:179,0
 DA:180,0
 DA:181,0
@@ -101,41 +101,41 @@ DA:283,0
 DA:285,0
 DA:286,0
 DA:288,0
-DA:293,0
-DA:295,0
-DA:296,0
-DA:299,0
+DA:293,1
+DA:295,4
+DA:296,1
+DA:299,3
 DA:300,0
 DA:301,0
 DA:303,0
 DA:304,0
 DA:305,0
 DA:308,0
-DA:310,0
-DA:311,0
-DA:312,0
-DA:313,0
-DA:314,0
-DA:315,0
-DA:316,0
-DA:320,0
-DA:321,0
-DA:326,0
-DA:328,0
-DA:329,0
+DA:310,2
+DA:311,3
+DA:312,1
+DA:313,1
+DA:314,2
+DA:315,2
+DA:316,5
+DA:320,3
+DA:321,4
+DA:326,1
+DA:328,4
+DA:329,2
 DA:330,0
-DA:335,0
-DA:336,0
-DA:337,0
+DA:335,2
+DA:336,5
+DA:337,1
 DA:339,0
 DA:340,0
 DA:341,0
-DA:347,0
-DA:349,0
-DA:351,0
-DA:352,0
-DA:353,0
-DA:356,0
+DA:347,1
+DA:349,4
+DA:351,2
+DA:352,2
+DA:353,6
+DA:356,7
 DA:358,0
 DA:359,0
 DA:362,0
@@ -151,18 +151,18 @@ DA:386,0
 DA:388,0
 DA:389,0
 DA:392,0
-DA:396,0
-DA:397,0
-DA:398,0
-DA:399,0
-DA:400,0
-DA:402,0
-DA:403,0
-DA:404,0
-DA:405,0
-DA:406,0
-DA:407,0
-DA:408,0
+DA:396,1
+DA:397,2
+DA:398,2
+DA:399,1
+DA:400,2
+DA:402,6
+DA:403,3
+DA:404,2
+DA:405,2
+DA:406,1
+DA:407,1
+DA:408,1
 DA:414,0
 DA:415,0
 DA:416,0
@@ -172,24 +172,24 @@ DA:419,0
 DA:420,0
 DA:421,0
 DA:424,0
-DA:429,0
-DA:430,0
+DA:429,1
+DA:430,3
 DA:432,0
 DA:433,0
-DA:434,0
-DA:435,0
-DA:436,0
-DA:437,0
-DA:441,0
-DA:442,0
-DA:443,0
-DA:445,0
-DA:446,0
-DA:447,0
-DA:448,0
-DA:450,0
+DA:434,1
+DA:435,2
+DA:436,2
+DA:437,2
+DA:441,1
+DA:442,2
+DA:443,2
+DA:445,3
+DA:446,1
+DA:447,2
+DA:448,2
+DA:450,1
 LF:154
-LH:17
+LH:76
 end_of_record
 SF:lib/src/view/scribble.dart
 DA:19,1
@@ -242,16 +242,16 @@ SF:lib/src/view/state/scribble.state.dart
 DA:108,0
 DA:109,0
 DA:110,2
-DA:114,4
+DA:114,8
 DA:118,0
 DA:119,0
 DA:120,0
 DA:121,0
 DA:122,0
-DA:127,1
-DA:128,1
-DA:129,1
-DA:130,1
+DA:127,2
+DA:128,2
+DA:129,2
+DA:130,2
 DA:131,0
 DA:133,0
 DA:138,0
@@ -335,7 +335,7 @@ LF:15
 LH:15
 end_of_record
 SF:lib/src/domain/model/point/point.dart
-DA:18,3
+DA:18,4
 DA:21,2
 LF:2
 LH:2
@@ -376,9 +376,9 @@ LF:12
 LH:7
 end_of_record
 SF:lib/src/view/painting/point_to_offset_x.dart
-DA:8,0
+DA:8,4
 LF:1
-LH:0
+LH:1
 end_of_record
 SF:lib/src/view/painting/sketch_line_path_mixin.dart
 DA:20,0
diff --git a/example/.metadata b/example/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "68bfaea224880b488c617afe30ab12091ea8fa4e"
+  revision: "be698c48a6750c8cb8e61c740ca9991bb947aba2"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
-      base_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
-    - platform: macos
-      create_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
-      base_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+      create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
+      base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
+    - platform: windows
+      create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
+      base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
 
   # User provided section
 
diff --git a/lib/src/view/notifier/scribble_notifier.dart b/lib/src/view/notifier/scribble_notifier.dart
@@ -337,9 +337,19 @@ class ScribbleNotifier extends ScribbleNotifierBase
         pointerPosition: _getPointFromEvent(event),
       );
     } else if (value is Erasing) {
-      temporaryValue = _erasePoint(event).copyWith(
-        pointerPosition: _getPointFromEvent(event),
-      );
+      final erasedState = _erasePoint(event);
+      // Check if content was actually erased
+      if (erasedState != null) {
+        // Content was actually erased, add to undo stack
+        value = erasedState.copyWith(
+          pointerPosition: _getPointFromEvent(event),
+        );
+      } else {
+        // No content erased, only update pointer position
+        temporaryValue = value.copyWith(
+          pointerPosition: _getPointFromEvent(event),
+        );
+      }
     }
   }
 
@@ -356,11 +366,24 @@ class ScribbleNotifier extends ScribbleNotifierBase
             value.activePointerIds.where((id) => id != event.pointer).toList(),
       );
     } else if (value is Erasing) {
-      value = _erasePoint(event).copyWith(
-        pointerPosition: pos,
-        activePointerIds:
-            value.activePointerIds.where((id) => id != event.pointer).toList(),
-      );
+      final erasedState = _erasePoint(event);
+      // Only update value when content was actually erased (affects undo stack)
+      if (erasedState != null) {
+        value = erasedState.copyWith(
+          pointerPosition: pos,
+          activePointerIds: value.activePointerIds
+              .where((id) => id != event.pointer)
+              .toList(),
+        );
+      } else {
+        // No content erased, only update pointer position
+        temporaryValue = value.copyWith(
+          pointerPosition: pos,
+          activePointerIds: value.activePointerIds
+              .where((id) => id != event.pointer)
+              .toList(),
+        );
+      }
     }
   }
 
@@ -375,11 +398,24 @@ class ScribbleNotifier extends ScribbleNotifierBase
             value.activePointerIds.where((id) => id != event.pointer).toList(),
       );
     } else if (value is Erasing) {
-      value = _erasePoint(event).copyWith(
-        pointerPosition: null,
-        activePointerIds:
-            value.activePointerIds.where((id) => id != event.pointer).toList(),
-      );
+      final erasedState = _erasePoint(event);
+      // Only update value when content was actually erased (affects undo stack)
+      if (erasedState != null) {
+        value = erasedState.copyWith(
+          pointerPosition: null,
+          activePointerIds: value.activePointerIds
+              .where((id) => id != event.pointer)
+              .toList(),
+        );
+      } else {
+        // No content erased, only update pointer position
+        temporaryValue = value.copyWith(
+          pointerPosition: null,
+          activePointerIds: value.activePointerIds
+              .where((id) => id != event.pointer)
+              .toList(),
+        );
+      }
     }
   }
 
@@ -411,17 +447,25 @@ class ScribbleNotifier extends ScribbleNotifierBase
     );
   }
 
-  ScribbleState _erasePoint(PointerEvent event) {
-    return value.copyWith.sketch(
-      lines: value.sketch.lines
-          .where(
-            (l) => l.points.every(
-              (p) =>
-                  (event.localPosition - p.asOffset).distance >
-                  l.width + value.selectedWidth,
-            ),
-          )
-          .toList(),
+  ScribbleState? _erasePoint(PointerEvent event) {
+    final filteredLines = value.sketch.lines
+        .where(
+          (l) => l.points.every(
+            (p) =>
+                (event.localPosition - p.asOffset).distance >
+                l.width + value.selectedWidth,
+          ),
+        )
+        .toList();
+    // If no lines were erased, return null to avoid unnecessary state updates
+    if (filteredLines.length == value.sketch.lines.length) {
+      return null;
+    }
+
+    return value.copyWith(
+      sketch: value.sketch.copyWith(
+        lines: filteredLines,
+      ),
     );
   }
 
diff --git a/packages/value_notifier_tools/coverage/lcov.info b/packages/value_notifier_tools/coverage/lcov.info
@@ -30,6 +30,24 @@ DA:28,2
 LF:1
 LH:1
 end_of_record
+SF:lib/src/where_value_notifier/where_value_notifier_from_parent.dart
+DA:13,1
+DA:17,2
+DA:18,3
+DA:27,1
+DA:29,2
+DA:32,1
+DA:33,3
+DA:36,1
+DA:38,2
+DA:41,1
+DA:43,3
+DA:44,1
+DA:52,1
+DA:53,1
+LF:14
+LH:14
+end_of_record
 SF:lib/src/history_value_notifier/history_value_notifier.dart
 DA:17,1
 LF:1
@@ -84,21 +102,3 @@ DA:135,1
 LF:45
 LH:45
 end_of_record
-SF:lib/src/where_value_notifier/where_value_notifier_from_parent.dart
-DA:13,1
-DA:17,2
-DA:18,3
-DA:27,1
-DA:29,2
-DA:32,1
-DA:33,3
-DA:36,1
-DA:38,2
-DA:41,1
-DA:43,3
-DA:44,1
-DA:52,1
-DA:53,1
-LF:14
-LH:14
-end_of_record
diff --git a/test/src/view/notifier/scribble_notifier_test.dart b/test/src/view/notifier/scribble_notifier_test.dart
