@kungal/editor-core 0.35.0 → 0.36.0

package/dist/preset/index.d.cts

@@ -13,8 +13,30 @@ declare const spoilerAttr: _milkdown_kit_utils.$NodeAttr;
 /** The `kun-spoiler` inline node: parses/serializes `||text||` and renders a
  * `<span data-type="kun-spoiler">` the render layer toggles on click. */
 declare const spoilerSchema: _milkdown_kit_utils.$NodeSchema<"kun-spoiler">;
-/** Toolbar entry point: wraps the current selection in a spoiler node. The
- * render layer's toolbar calls this via commandsCtx (P3). */
+/**
+ * Toolbar entry point ("隐藏文本"): hide the selection, or reveal the spoiler the
+ * caret is in. The only way into a spoiler other than typing `||…||`, so it has
+ * to cover the same cases the syntax does:
+ *
+ * - a selection → its TEXT moves INSIDE the node. It has to be moved, not
+ *   replaced: `replaceSelectionWith` on its own deletes what you selected. The
+ *   schema is `marks: ''` (bold inside `||…||` cannot round-trip), so the
+ *   formatting is what's dropped, never the words.
+ * - an empty selection → an empty spoiler with the caret inside it: type, and
+ *   what you type is hidden. "Empty" means holding a caret anchor — a caret
+ *   cannot sit in an inline node with no text node in it — and a spoiler with
+ *   nothing but an anchor serializes to nothing at all, so an unused one cannot
+ *   rot into the document.
+ * - the caret already inside a spoiler → reveal it, leaving the text selected.
+ *   Nesting would serialize to `||||text||||`, which reads back as nothing at
+ *   all, so this button has to toggle.
+ *
+ * Returns false where there is nothing to hide or nowhere to put it — inside a
+ * code block, or with a NODE selected (an image is not text; replacing it would
+ * delete it) — so a host can grey the button out. A spoiler holds text, so any
+ * other inline node caught in a text selection (an image, inline math) does not
+ * survive the move: `||…||` cannot carry one.
+ */
 declare const insertKunSpoilerCommand: _milkdown_kit_utils.$Command<unknown>;
 /** Typing `||text||` in the editor turns it into a spoiler node in place. The
  * trailing zero-width space gives the caret a stable anchor after the atom. */

package/dist/preset/index.d.ts

@@ -13,8 +13,30 @@ declare const spoilerAttr: _milkdown_kit_utils.$NodeAttr;
 /** The `kun-spoiler` inline node: parses/serializes `||text||` and renders a
  * `<span data-type="kun-spoiler">` the render layer toggles on click. */
 declare const spoilerSchema: _milkdown_kit_utils.$NodeSchema<"kun-spoiler">;
-/** Toolbar entry point: wraps the current selection in a spoiler node. The
- * render layer's toolbar calls this via commandsCtx (P3). */
+/**
+ * Toolbar entry point ("隐藏文本"): hide the selection, or reveal the spoiler the
+ * caret is in. The only way into a spoiler other than typing `||…||`, so it has
+ * to cover the same cases the syntax does:
+ *
+ * - a selection → its TEXT moves INSIDE the node. It has to be moved, not
+ *   replaced: `replaceSelectionWith` on its own deletes what you selected. The
+ *   schema is `marks: ''` (bold inside `||…||` cannot round-trip), so the
+ *   formatting is what's dropped, never the words.
+ * - an empty selection → an empty spoiler with the caret inside it: type, and
+ *   what you type is hidden. "Empty" means holding a caret anchor — a caret
+ *   cannot sit in an inline node with no text node in it — and a spoiler with
+ *   nothing but an anchor serializes to nothing at all, so an unused one cannot
+ *   rot into the document.
+ * - the caret already inside a spoiler → reveal it, leaving the text selected.
+ *   Nesting would serialize to `||||text||||`, which reads back as nothing at
+ *   all, so this button has to toggle.
+ *
+ * Returns false where there is nothing to hide or nowhere to put it — inside a
+ * code block, or with a NODE selected (an image is not text; replacing it would
+ * delete it) — so a host can grey the button out. A spoiler holds text, so any
+ * other inline node caught in a text selection (an image, inline math) does not
+ * survive the move: `||…||` cannot carry one.
+ */
 declare const insertKunSpoilerCommand: _milkdown_kit_utils.$Command<unknown>;
 /** Typing `||text||` in the editor turns it into a spoiler node in place. The
  * trailing zero-width space gives the caret a stable anchor after the atom. */

package/dist/preset/index.js

@@ -6,12 +6,13 @@ import { listener } from '@milkdown/kit/plugin/listener';
 import { clipboard } from '@milkdown/kit/plugin/clipboard';
 import { indent } from '@milkdown/kit/plugin/indent';
 import { trailing } from '@milkdown/kit/plugin/trailing';
+import { Fragment } from '@milkdown/kit/prose/model';
 import { expectDomTypeError } from '@milkdown/kit/exception';
 import { InputRule, textblockTypeInputRule } from '@milkdown/kit/prose/inputrules';
+import { TextSelection, NodeSelection, PluginKey, Plugin } from '@milkdown/kit/prose/state';
 import { $nodeAttr, $nodeSchema, $command, $inputRule, $remark, $useKeymap, $prose } from '@milkdown/kit/utils';
 import { visit } from 'unist-util-visit';
 import { commandsCtx, editorViewOptionsCtx } from '@milkdown/kit/core';
-import { PluginKey, Plugin, NodeSelection, TextSelection } from '@milkdown/kit/prose/state';
 import { setBlockType } from '@milkdown/kit/prose/commands';
 import { findNodeInSelection, nodeRule } from '@milkdown/kit/prose';
 import katex from 'katex';
@@ -32,6 +33,21 @@ var spoilerAttr = $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 Fragment.fromArray(kept);
+};
 var spoilerSchema = $nodeSchema("kun-spoiler", (ctx) => ({
   group: "inline",
   inline: true,
@@ -76,23 +92,76 @@ var spoilerSchema = $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 = $command(
   "InsertKunSpoiler",
   (ctx) => () => (state, dispatch) => {
-    if (!dispatch) {
+    const type = spoilerSchema.type(ctx);
+    const { $from, from, to, empty } = state.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.doc.textBetween(
+          end,
+          Math.min(end + CARET_ANCHOR.length, state.doc.content.size)
+        );
+        const tr2 = state.tr.replaceWith(
+          pos,
+          trailing2 === CARET_ANCHOR ? end + CARET_ANCHOR.length : end,
+          revealed
+        );
+        if (revealed.size) {
+          tr2.setSelection(TextSelection.create(tr2.doc, pos, pos + revealed.size));
+        }
+        dispatch(tr2.scrollIntoView());
+      }
       return true;
     }
-    const node = spoilerSchema.type(ctx).create();
-    if (!node) {
+    if (state.selection instanceof 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.doc.textBetween(from, to, " ").replaceAll(CARET_ANCHOR, "");
+    const node = type.create(null, state.schema.text(text || CARET_ANCHOR));
+    const tr = state.tr.replaceSelectionWith(node, false);
+    const after = tr.selection.to;
+    tr.insertText(CARET_ANCHOR, after);
+    dispatch(
+      tr.setSelection(
+        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;
   }
 );
@@ -109,7 +178,7 @@ var insertSpoilerInputRule = $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();
   })
 );