fix: Enter at beginning of collapsed heading should create a new head…

…ing above (#3754)
outline · Jul 9, 2022 · caaf6dd · caaf6dd
1 parent 2893924
commit caaf6dd
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 34 deletions.
diff --git a/app/editor/components/Styles.ts b/app/editor/components/Styles.ts
@@ -405,6 +405,7 @@ const EditorStyles = styled.div<{
     &.collapsed {
       svg {
         transform: rotate(${(props) => (props.rtl ? "90deg" : "-90deg")});
+        pointer-events: none;
       }
       transition-delay: 0.1s;
       opacity: 1;

diff --git a/shared/editor/commands/splitHeading.ts b/shared/editor/commands/splitHeading.ts
@@ -13,49 +13,83 @@ export default function splitHeading(type: NodeType) {
       return false;
     }
 
-    // check that the caret is at the end of the content, if it isn't then
-    // standard node splitting behaviour applies
-    const endPos = $to.after() - 1;
-    if (endPos !== to) {
+    // is the selection at the beginning of the node
+    const startPos = $from.before() + 1;
+    if (startPos === from) {
+      const collapsedNodes = findCollapsedNodes(state.doc);
+      const allBlocks = findBlockNodes(state.doc);
+      const previousBlock = allBlocks
+        .filter((a) => a.pos + a.node.nodeSize < startPos)
+        .pop();
+      const previousBlockIsCollapsed = !!collapsedNodes.find(
+        (a) => a.pos === previousBlock?.pos
+      );
+
+      if (previousBlockIsCollapsed) {
+        // Insert a new heading directly before this one
+        const transaction = state.tr.insert(
+          $from.before(),
+          type.create({ ...$from.parent.attrs, collapsed: false })
+        );
+
+        // Move the selection into the new heading node and make sure it's on screen
+        dispatch(
+          transaction
+            .setSelection(
+              TextSelection.near(transaction.doc.resolve($from.before()))
+            )
+            .scrollIntoView()
+        );
+
+        return true;
+      }
+
       return false;
     }
 
-    // If the node isn't collapsed standard behavior applies
+    // If the heading isn't collapsed standard behavior applies
     if (!$from.parent.attrs.collapsed) {
       return false;
     }
 
-    // Find the next visible block after this one. It takes into account nested
-    // collapsed headings and reaching the end of the document
-    const allBlocks = findBlockNodes(state.doc);
-    const collapsedBlocks = findCollapsedNodes(state.doc);
-    const visibleBlocks = allBlocks.filter(
-      (a) => !collapsedBlocks.find((b) => b.pos === a.pos)
-    );
-    const nextVisibleBlock = visibleBlocks.find((a) => a.pos > from);
-    const pos = nextVisibleBlock
-      ? nextVisibleBlock.pos
-      : state.doc.content.size;
-
-    // Insert our new heading directly before the next visible block
-    const transaction = state.tr.insert(
-      pos,
-      type.create({ ...$from.parent.attrs, collapsed: false })
-    );
-
-    // Move the selection into the new heading node and make sure it's on screen
-    dispatch(
-      transaction
-        .setSelection(
-          TextSelection.near(
-            transaction.doc.resolve(
-              Math.min(pos + 1, transaction.doc.content.size)
+    // is the selection at the end of the node. If not standard node-splitting
+    // behavior applies
+    const endPos = $to.after() - 1;
+    if (endPos === to) {
+      // Find the next visible block after this one. It takes into account nested
+      // collapsed headings and reaching the end of the document
+      const collapsedNodes = findCollapsedNodes(state.doc);
+      const allBlocks = findBlockNodes(state.doc);
+      const visibleBlocks = allBlocks.filter(
+        (a) => !collapsedNodes.find((b) => b.pos === a.pos)
+      );
+      const nextVisibleBlock = visibleBlocks.find((a) => a.pos > from);
+      const pos = nextVisibleBlock
+        ? nextVisibleBlock.pos
+        : state.doc.content.size;
+
+      // Insert a new heading directly before the next visible block
+      const transaction = state.tr.insert(
+        pos,
+        type.create({ ...$from.parent.attrs, collapsed: false })
+      );
+
+      // Move the selection into the new heading node and make sure it's on screen
+      dispatch(
+        transaction
+          .setSelection(
+            TextSelection.near(
+              transaction.doc.resolve(
+                Math.min(pos + 1, transaction.doc.content.size)
+              )
             )
           )
-        )
-        .scrollIntoView()
-    );
+          .scrollIntoView()
+      );
+
+      return true;
+    }
 
-    return true;
+    return false;
   };
 }