From 397f43cbe132819af18ce9f0acfc7aa7576f9623 Mon Sep 17 00:00:00 2001
From: "Lucas.Xu" <lucas.xu@appflowy.io>
Date: Tue, 2 Aug 2022 20:08:32 +0800
Subject: [PATCH] feat: implement remove subtype if text node is empty when
 pressing enter key

---
 .../enter_in_edge_of_text_node_handler.dart   | 59 +++++++++++++------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/frontend/app_flowy/packages/flowy_editor/lib/service/internal_key_event_handlers/enter_in_edge_of_text_node_handler.dart b/frontend/app_flowy/packages/flowy_editor/lib/service/internal_key_event_handlers/enter_in_edge_of_text_node_handler.dart
index 5b49907138..ccdfcad5dc 100644
--- a/frontend/app_flowy/packages/flowy_editor/lib/service/internal_key_event_handlers/enter_in_edge_of_text_node_handler.dart
+++ b/frontend/app_flowy/packages/flowy_editor/lib/service/internal_key_event_handlers/enter_in_edge_of_text_node_handler.dart
@@ -29,25 +29,46 @@ FlowyKeyEventHandler enterInEdgeOfTextNodeHandler = (editorState, event) {
 
   final textNode = nodes.first as TextNode;
   if (textNode.selectable!.end() == selection.end) {
-    final needCopyAttributes = StyleKey.globalStyleKeys
-        .where((key) => key != StyleKey.heading)
-        .contains(textNode.subtype);
-    TransactionBuilder(editorState)
-      ..insertNode(
-        textNode.path.next,
-        textNode.copyWith(
-          children: LinkedList(),
-          delta: Delta([TextInsert('')]),
-          attributes: needCopyAttributes ? textNode.attributes : {},
-        ),
-      )
-      ..afterSelection = Selection.collapsed(
-        Position(
-          path: textNode.path.next,
-          offset: 0,
-        ),
-      )
-      ..commit();
+    if (textNode.subtype != null && textNode.delta.length == 0) {
+      TransactionBuilder(editorState)
+        ..deleteNode(textNode)
+        ..insertNode(
+          textNode.path,
+          textNode.copyWith(
+            children: LinkedList(),
+            delta: Delta([TextInsert('')]),
+            attributes: {},
+          ),
+        )
+        ..afterSelection = Selection.collapsed(
+          Position(
+            path: textNode.path,
+            offset: 0,
+          ),
+        )
+        ..commit();
+    } else {
+      final needCopyAttributes = StyleKey.globalStyleKeys
+          .where((key) => key != StyleKey.heading)
+          .contains(textNode.subtype);
+      TransactionBuilder(editorState)
+        ..insertNode(
+          textNode.path.next,
+          textNode.copyWith(
+            children: LinkedList(),
+            delta: Delta([TextInsert('')]),
+            attributes: needCopyAttributes ? textNode.attributes : {},
+          ),
+        )
+        ..afterSelection = Selection.collapsed(
+          Position(
+            path: textNode.path.next,
+            offset: 0,
+          ),
+        )
+        ..commit();
+    }
+
     return KeyEventResult.handled;
   } else if (textNode.selectable!.start() == selection.start) {
     TransactionBuilder(editorState)