fix: miss the nested node when copying (#406)

AppFlowy-IO · Aug 22, 2023 · aaef934 · aaef934
1 parent 5e78abc
commit aaef934
Showing 1 changed file with 55 additions and 15 deletions.
diff --git a/lib/src/editor_state.dart b/lib/src/editor_state.dart
@@ -290,25 +290,65 @@ class EditorState {
     if (selection == null || selection.isCollapsed) {
       return res;
     }
-    final nodes = getNodesInSelection(selection);
+    final nodes = getNodesInSelection(selection).map((e) => e.copyWith());
     for (final node in nodes) {
-      if (node.level > 1) {
-        continue;
-      }
-      final delta = node.delta;
-      if (delta == null) {
+      if (res.any((element) => element.path.isParentOf(node.path))) {
         continue;
       }
-      final startIndex = node == nodes.first ? selection.startIndex : 0;
-      final endIndex = node == nodes.last ? selection.endIndex : delta.length;
-      res.add(
-        node.copyWith(
-          attributes: {
-            ...node.attributes,
-            blockComponentDelta: delta.slice(startIndex, endIndex).toJson()
+      res.add(node);
+    }
+
+    if (res.isNotEmpty) {
+      var delta = res.first.delta;
+      if (delta != null) {
+        res.first.updateAttributes(
+          {
+            ...res.first.attributes,
+            blockComponentDelta: delta
+                .slice(
+                  selection.startIndex,
+                  delta.length,
+                )
+                .toJson()
           },
-        ),
-      );
+        );
+      }
+
+      var node = res.last;
+      while (node.children.isNotEmpty) {
+        node = node.children.last;
+      }
+      delta = node.delta;
+      if (delta != null) {
+        if (node.parent != null) {
+          node.insertBefore(
+            node.copyWith(
+              attributes: {
+                ...node.attributes,
+                blockComponentDelta: delta
+                    .slice(
+                      0,
+                      selection.endIndex,
+                    )
+                    .toJson()
+              },
+            ),
+          );
+          node.unlink();
+        } else {
+          node.updateAttributes(
+            {
+              ...node.attributes,
+              blockComponentDelta: delta
+                  .slice(
+                    0,
+                    selection.endIndex,
+                  )
+                  .toJson()
+            },
+          );
+        }
+      }
     }
 
     return res;