@kungal/editor-core 0.35.0 → 0.36.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @kungal/editor-core
 
+## 0.36.0
+
+### Minor Changes
+
+- f7c65c2: fix(editor): the spoiler toolbar button hides the selection instead of deleting it
+
+  `insertKunSpoilerCommand` built an EMPTY `kun-spoiler` node and dropped it over
+  the selection with `replaceSelectionWith`, so clicking 隐藏文本 with text selected
+  deleted the text and left a bare `||||` — and the next thing typed landed
+  outside the node, so nothing was hidden either. The JSDoc said "wraps the
+  current selection"; the code never wrapped anything.
+
+  The command now covers the three cases the `||…||` syntax does:
+
+  - **a selection** → its text moves inside the node. The schema is `marks: ''`
+    (inline formatting cannot round-trip through `||…||`), so bold is what's
+    dropped, never the words. Selections spanning paragraphs collapse into one
+    spoiler; select-all (an `AllSelection`) works too.
+  - **an empty selection** → a new spoiler with the caret INSIDE it: type and it
+    is hidden. It holds a zero-width caret anchor, because a caret cannot sit in
+    an inline node with no text node in it — the serializer strips anchors, and a
+    spoiler holding nothing else serializes to nothing, so a stray click cannot
+    leave `||||` behind.
+  - **the caret already inside a spoiler** → reveal it, leaving the text selected.
+    Nesting would have produced `||||text||||`, which reads back as nothing.
+
+  The button is therefore a toggle, and both toolbars (the headless one and the
+  KunUI one in `@kungal/editor-nuxt`) now show it pressed while the caret is
+  inside a spoiler — `KunToggleMark` gains a `'spoiler'` member for that, so
+  `activeMarks` carries one more key.
+
+  It returns `false` — no document change — inside a code block and with a node
+  selected (an image is not text; replacing it would delete it).
+
 ## 0.35.0
 
 ### Minor Changes

package/dist/preset/index.cjs

@@ -7,12 +7,13 @@ var listener = require('@milkdown/kit/plugin/listener');
 var clipboard = require('@milkdown/kit/plugin/clipboard');
 var indent = require('@milkdown/kit/plugin/indent');
 var trailing = require('@milkdown/kit/plugin/trailing');
+var model = require('@milkdown/kit/prose/model');
 var exception = require('@milkdown/kit/exception');
 var inputrules = require('@milkdown/kit/prose/inputrules');
+var state = require('@milkdown/kit/prose/state');
 var utils = require('@milkdown/kit/utils');
 var unistUtilVisit = require('unist-util-visit');
 var core = require('@milkdown/kit/core');
-var state = require('@milkdown/kit/prose/state');
 var commands = require('@milkdown/kit/prose/commands');
 var prose = require('@milkdown/kit/prose');
 var katex = require('katex');
@@ -39,6 +40,21 @@ var spoilerAttr = utils.$nodeAttr("kun-spoiler", () => ({
     style: "background: var(--color-default-500); border-radius: var(--radius-sm); padding: 0 4px; cursor: pointer;"
   }
 }));
+var CARET_ANCHOR = "\u200B";
+var withoutAnchors = (content) => {
+  const kept = [];
+  content.forEach((child) => {
+    if (!child.isText) {
+      kept.push(child);
+      return;
+    }
+    const text = (child.text ?? "").replaceAll(CARET_ANCHOR, "");
+    if (text) {
+      kept.push(child.type.schema.text(text, child.marks));
+    }
+  });
+  return model.Fragment.fromArray(kept);
+};
 var spoilerSchema = utils.$nodeSchema("kun-spoiler", (ctx) => ({
   group: "inline",
   inline: true,
@@ -83,23 +99,76 @@ var spoilerSchema = utils.$nodeSchema("kun-spoiler", (ctx) => ({
   toMarkdown: {
     match: (node) => node.type.name === "kun-spoiler",
     runner: (state, node) => {
+      const content = withoutAnchors(node.content);
+      if (!content.size) {
+        return;
+      }
       state.addNode("text", void 0, "||");
-      state.next(node.content);
+      state.next(content);
       state.addNode("text", void 0, "||");
     }
   }
 }));
+var enclosingSpoiler = ($pos, type) => {
+  for (let depth = $pos.depth; depth > 0; depth--) {
+    const node = $pos.node(depth);
+    if (node.type === type) {
+      return { pos: $pos.before(depth), node };
+    }
+  }
+  return null;
+};
 var insertKunSpoilerCommand = utils.$command(
   "InsertKunSpoiler",
-  (ctx) => () => (state, dispatch) => {
-    if (!dispatch) {
+  (ctx) => () => (state$1, dispatch) => {
+    const type = spoilerSchema.type(ctx);
+    const { $from, from, to, empty } = state$1.selection;
+    const open = enclosingSpoiler($from, type);
+    if (open) {
+      if (dispatch) {
+        const { pos, node: node2 } = open;
+        const revealed = withoutAnchors(node2.content);
+        const end = pos + node2.nodeSize;
+        const trailing2 = state$1.doc.textBetween(
+          end,
+          Math.min(end + CARET_ANCHOR.length, state$1.doc.content.size)
+        );
+        const tr2 = state$1.tr.replaceWith(
+          pos,
+          trailing2 === CARET_ANCHOR ? end + CARET_ANCHOR.length : end,
+          revealed
+        );
+        if (revealed.size) {
+          tr2.setSelection(state.TextSelection.create(tr2.doc, pos, pos + revealed.size));
+        }
+        dispatch(tr2.scrollIntoView());
+      }
       return true;
     }
-    const node = spoilerSchema.type(ctx).create();
-    if (!node) {
+    if (state$1.selection instanceof state.NodeSelection) {
+      return false;
+    }
+    if ($from.parent.isTextblock && !$from.parent.canReplaceWith($from.index(), $from.index(), type)) {
+      return false;
+    }
+    if (!dispatch) {
       return true;
     }
-    dispatch(state.tr.replaceSelectionWith(node).scrollIntoView());
+    const text = state$1.doc.textBetween(from, to, " ").replaceAll(CARET_ANCHOR, "");
+    const node = type.create(null, state$1.schema.text(text || CARET_ANCHOR));
+    const tr = state$1.tr.replaceSelectionWith(node, false);
+    const after = tr.selection.to;
+    tr.insertText(CARET_ANCHOR, after);
+    dispatch(
+      tr.setSelection(
+        state.TextSelection.create(
+          tr.doc,
+          // On the anchor inside the empty node (type and it is hidden), or
+          // past the one after a wrap (type and it is not).
+          empty ? after - node.nodeSize + 1 + CARET_ANCHOR.length : after + 1
+        )
+      ).scrollIntoView()
+    );
     return true;
   }
 );
@@ -116,7 +185,7 @@ var insertSpoilerInputRule = utils.$inputRule(
       { revealed: false },
       schema.text(content)
     );
-    const zeroWidthSpace = schema.text("\u200B");
+    const zeroWidthSpace = schema.text(CARET_ANCHOR);
     return tr.replaceWith(startPos, end, [spoilerNode, zeroWidthSpace]).setStoredMarks([]).scrollIntoView();
   })
 );