Fix offset for line wrapped in block

fleather-editor · Aug 20, 2024 · 30d0ca1 · 30d0ca1
1 parent d4125c2
commit 30d0ca1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/packages/parchment/lib/src/document/attributes.dart b/packages/parchment/lib/src/document/attributes.dart
@@ -1,7 +1,6 @@
 import 'dart:math' as math;
 
 import 'package:collection/collection.dart';
-import 'package:quiver/core.dart';
 
 /// Scope of a style attribute, defines context in which an attribute can be
 /// applied.
@@ -254,7 +253,7 @@ class ParchmentAttribute<T> implements ParchmentAttributeBuilder<T> {
   }
 
   @override
-  int get hashCode => hash3(key, scope, value);
+  int get hashCode => Object.hash(key, scope, value);
 
   @override
   String toString() => '$key: $value';
@@ -397,8 +396,9 @@ class ParchmentStyle {
 
   @override
   int get hashCode {
-    final hashes = _data.entries.map((entry) => hash2(entry.key, entry.value));
-    return hashObjects(hashes);
+    final hashes =
+        _data.entries.map((entry) => Object.hash(entry.key, entry.value));
+    return Object.hashAll(hashes);
   }
 
   @override

diff --git a/packages/parchment/lib/src/document/node.dart b/packages/parchment/lib/src/document/node.dart
@@ -112,8 +112,8 @@ abstract base class Node extends LinkedListEntry<Node> {
   void unlink() {
     assert(_parent != null);
     final oldParent = _parent;
-    _parent = null;
     final oldNext = next;
+    _parent = null;
     super.unlink();
     oldNext?.invalidateOffset();
     oldParent?.invalidateLength();
@@ -192,7 +192,7 @@ abstract base class ContainerNode<T extends Node> extends Node {
     assert(node._parent == null);
     node._parent = this;
     _children.add(node);
-    node.next?.invalidateOffset();
+    node.invalidateOffset();
     invalidateLength();
   }
 
@@ -201,7 +201,7 @@ abstract base class ContainerNode<T extends Node> extends Node {
     assert(node._parent == null);
     node._parent = this;
     _children.addFirst(node);
-    node.next?.invalidateOffset();
+    node.invalidateOffset();
     invalidateLength();
   }
 
@@ -227,8 +227,6 @@ abstract base class ContainerNode<T extends Node> extends Node {
       newParent.add(child);
     }
 
-    invalidateLength();
-
     /// In case [newParent] already had children we need to make sure
     /// combined list is optimized.
     if (toBeOptimized != null) toBeOptimized.optimize();
@@ -283,7 +281,6 @@ abstract base class ContainerNode<T extends Node> extends Node {
       final result = lookup(index);
       result.node!.insert(result.offset, data, style);
     }
-    invalidateLength();
   }
 
   @override
@@ -298,7 +295,6 @@ abstract base class ContainerNode<T extends Node> extends Node {
     assert(isNotEmpty);
     final res = lookup(index);
     res.node!.delete(res.offset, length);
-    invalidateLength();
   }
 
   @override

diff --git a/packages/parchment/test/document/line_test.dart b/packages/parchment/test/document/line_test.dart
@@ -127,10 +127,17 @@ void main() {
     });
 
     test('format line', () {
-      root.insert(0, 'Hello world', null);
+      root.insert(0, 'Hello world\n', null);
+      root.insert(12, 'Second headline\n', null);
       root.retain(11, 1, h1Style);
       root.retain(11, 1, rightStyle);
 
+      final secondHeadline = root.first.next!;
+      expect(secondHeadline.offset, 12);
+
+      root.retain(27, 1, ParchmentStyle().merge(ParchmentAttribute.cl));
+      expect(secondHeadline.offset, 0);
+
       final line = root.first as LineNode;
       expect(line, hasLength(12));