@superdoc-dev/cli 0.7.0-next.36 → 0.7.0-next.38

package/dist/index.js

@@ -205830,7 +205830,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-nnj-4GhR.es.js
+// ../../packages/superdoc/dist/chunks/src-_aJt3Hgw.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -207576,33 +207576,137 @@ function createStructuredContentLockPlugin() {
     }
   });
 }
+function needsEditableSlot(node3, side) {
+  if (!node3)
+    return true;
+  const name = node3.type.name;
+  if (name === "hardBreak" || name === "lineBreak" || name === "structuredContent")
+    return true;
+  if (name === "run")
+    return !(side === "before" ? node3.lastChild?.isText : node3.firstChild?.isText);
+  return false;
+}
+function applyEditableSlotAtInlineBoundary(tr, pos, direction) {
+  const clampedPos = Math.max(0, Math.min(pos, tr.doc.content.size));
+  if (direction === "before") {
+    if (!needsEditableSlot(tr.doc.resolve(clampedPos).nodeBefore, "before"))
+      return tr.setSelection(TextSelection.create(tr.doc, clampedPos));
+    tr.insertText("​", clampedPos);
+    return tr.setSelection(TextSelection.create(tr.doc, clampedPos + 1));
+  }
+  if (!needsEditableSlot(tr.doc.nodeAt(clampedPos), "after"))
+    return tr.setSelection(TextSelection.create(tr.doc, clampedPos));
+  tr.insertText("​", clampedPos);
+  return tr.setSelection(TextSelection.create(tr.doc, clampedPos + 1));
+}
 function createStructuredContentSelectPlugin(editor) {
-  return new Plugin({ appendTransaction(transactions, oldState, newState) {
-    if (editor?.options?.documentMode === "viewing")
-      return null;
-    const { selection } = newState;
-    if (!selection.empty)
-      return null;
-    if (oldState.selection.eq(newState.selection))
-      return null;
-    if (transactions.some((tr) => tr.docChanged))
-      return null;
-    const $pos = selection.$from;
-    for (let d = $pos.depth;d > 0; d--)
-      if ($pos.node(d).type.name === "structuredContent") {
+  return new Plugin({
+    props: { handleKeyDown(view, event) {
+      if (editor?.options?.documentMode === "viewing")
+        return false;
+      if (event.key !== "ArrowRight" && event.key !== "ArrowLeft")
+        return false;
+      if (event.shiftKey || event.altKey || event.ctrlKey || event.metaKey)
+        return false;
+      const { state } = view;
+      const { selection } = state;
+      const resolveBoundaryExit = ($pos) => {
+        for (let depth = $pos.depth;depth > 0; depth -= 1) {
+          const node3 = $pos.node(depth);
+          if (node3.type.name !== "structuredContent")
+            continue;
+          const contentFrom = $pos.start(depth);
+          const contentTo = $pos.end(depth);
+          const nodePos = $pos.before(depth);
+          const beforePos = nodePos;
+          const afterPos = nodePos + node3.nodeSize;
+          if (selection.empty) {
+            if (event.key === "ArrowRight" && selection.from >= contentTo - 1)
+              return afterPos;
+            if (event.key === "ArrowLeft" && selection.from <= contentFrom + 1)
+              return beforePos;
+            return null;
+          }
+          if (!(selection.from === contentFrom && selection.to === contentTo))
+            return null;
+          if (event.key === "ArrowRight")
+            return afterPos;
+          if (event.key === "ArrowLeft")
+            return beforePos;
+          return null;
+        }
+        return null;
+      };
+      const nextPos = resolveBoundaryExit(selection.$from);
+      if (nextPos == null)
+        return false;
+      try {
+        const direction = event.key === "ArrowLeft" ? "before" : "after";
+        const tr = applyEditableSlotAtInlineBoundary(state.tr, nextPos, direction);
+        view.dispatch(tr);
+        event.preventDefault();
+        return true;
+      } catch {
+        return false;
+      }
+    } },
+    appendTransaction(transactions, oldState, newState) {
+      if (editor?.options?.documentMode === "viewing")
+        return null;
+      const { selection } = newState;
+      if (oldState.selection.eq(newState.selection))
+        return null;
+      if (transactions.some((tr) => tr.docChanged))
+        return null;
+      if (!selection.empty) {
+        let selectedSdt = null;
+        newState.doc.descendants((node3, pos) => {
+          if (node3.type.name !== "structuredContent")
+            return true;
+          const contentFrom = pos + 1;
+          const contentTo = pos + node3.nodeSize - 1;
+          if (!(selection.from <= contentFrom && selection.to >= contentTo))
+            return true;
+          selectedSdt = {
+            node: node3,
+            pos,
+            contentFrom,
+            contentTo
+          };
+          return false;
+        });
+        if (selectedSdt) {
+          const oldAtTrailingBoundary = oldState.selection.empty && oldState.selection.from >= selectedSdt.pos + selectedSdt.node.nodeSize;
+          const oldAtLeadingBoundary = oldState.selection.empty && oldState.selection.from <= selectedSdt.pos;
+          if (oldAtTrailingBoundary)
+            return applyEditableSlotAtInlineBoundary(newState.tr, selectedSdt.pos + selectedSdt.node.nodeSize, "after");
+          if (oldAtLeadingBoundary)
+            return applyEditableSlotAtInlineBoundary(newState.tr, selectedSdt.pos, "before");
+        }
+        return null;
+      }
+      if (!selection.empty)
+        return null;
+      const $pos = selection.$from;
+      const old$pos = oldState.selection.$from;
+      for (let d = $pos.depth;d > 0; d--) {
+        if ($pos.node(d).type.name !== "structuredContent")
+          continue;
         const sdtStart = $pos.before(d);
         const contentFrom = $pos.start(d);
         const contentTo = $pos.end(d);
+        if (selection.from <= contentFrom || selection.from >= contentTo)
+          return null;
         if (contentFrom === contentTo)
           return null;
-        const old$pos = oldState.selection.$from;
         for (let od = old$pos.depth;od > 0; od--)
           if (old$pos.node(od).type.name === "structuredContent" && old$pos.before(od) === sdtStart)
             return null;
         return newState.tr.setSelection(TextSelection.create(newState.doc, contentFrom, contentTo));
       }
-    return null;
-  } });
+      return null;
+    }
+  });
 }
 function getStructuredContentTagsById(idOrIds, state) {
   return findChildren$1(state.doc, (node3) => {
@@ -259379,6 +259483,17 @@ function readPmRange(el) {
     end: Number(el.dataset.pmEnd ?? "NaN")
   };
 }
+function getInlineSdtWrapperBoundaryPos(spanEl, side) {
+  if (!(spanEl instanceof HTMLElement))
+    return null;
+  const wrapper = spanEl.closest(`.${CLASS.inlineSdtWrapper}`);
+  if (!wrapper)
+    return null;
+  const { start: start$1, end: end$1 } = readPmRange(wrapper);
+  if (!Number.isFinite(start$1) || !Number.isFinite(end$1))
+    return null;
+  return side === "before" ? start$1 - 1 : end$1 + 1;
+}
 function getClickableSpans(lineEl) {
   return Array.from(lineEl.querySelectorAll("span, a")).filter((el) => el.dataset.pmStart !== undefined && el.dataset.pmEnd !== undefined && !el.classList.contains(CLASS.inlineSdtWrapper));
 }
@@ -259494,9 +259609,9 @@ function resolvePositionInLine(lineEl, lineStart, lineEnd, spanEls, viewX) {
   const visualLeft = Math.min(...boundsRects.map((r$1) => r$1.left));
   const visualRight = Math.max(...boundsRects.map((r$1) => r$1.right));
   if (viewX <= visualLeft)
-    return rtl ? lineEnd : lineStart;
+    return getInlineSdtWrapperBoundaryPos(rtl ? spanEls[spanEls.length - 1] : spanEls[0], rtl ? "after" : "before") ?? (rtl ? lineEnd : lineStart);
   if (viewX >= visualRight)
-    return rtl ? lineStart : lineEnd;
+    return getInlineSdtWrapperBoundaryPos(rtl ? spanEls[0] : spanEls[spanEls.length - 1], rtl ? "before" : "after") ?? (rtl ? lineStart : lineEnd);
   const targetEl = findSpanAtX(spanEls, viewX);
   if (!targetEl)
     return lineStart;
@@ -268768,20 +268883,39 @@ var Node$13 = class Node$14 {
   if (!insertedMark && !deletionMark && !formatMark)
     return;
   const newTrackedChanges = { ...trackedChanges };
-  let id2 = insertedMark?.attrs?.id || deletionMark?.attrs?.id || formatMark?.attrs?.id;
-  if (!id2)
+  const insertedId = insertedMark?.attrs?.id ?? null;
+  const deletionId = deletionMark?.attrs?.id ?? null;
+  const formatId = formatMark?.attrs?.id ?? null;
+  const primaryId = insertedId || deletionId || formatId;
+  if (!primaryId)
     return trackedChanges;
-  let isNewChange = false;
-  if (!newTrackedChanges[id2]) {
-    newTrackedChanges[id2] = {};
-    isNewChange = true;
-  }
-  if (insertedMark)
-    newTrackedChanges[id2].insertion = id2;
-  if (deletionMark)
-    newTrackedChanges[id2].deletion = deletionMark.attrs?.id;
-  if (formatMark)
-    newTrackedChanges[id2].format = formatMark.attrs?.id;
+  const registerTrackedChangeId = (changeId, patch3) => {
+    if (!changeId)
+      return false;
+    const existing = newTrackedChanges[changeId];
+    if (existing) {
+      Object.assign(existing, patch3);
+      return false;
+    }
+    newTrackedChanges[changeId] = { ...patch3 };
+    return true;
+  };
+  const buildTrackedChangePayload = ({ event, marks, nodes: nodes$1, deletionNodes: deletionNodes$1 = [] }) => {
+    if (!marks.insertedMark && !marks.deletionMark && !marks.formatMark)
+      return null;
+    const trackedMarkId = marks.insertedMark?.attrs?.id ?? marks.deletionMark?.attrs?.id ?? marks.formatMark?.attrs?.id ?? null;
+    if (!trackedMarkId)
+      return null;
+    return createOrUpdateTrackedChangeComment({
+      documentId: editor.options.documentId,
+      event,
+      marks,
+      deletionNodes: deletionNodes$1,
+      nodes: nodes$1,
+      newEditorState,
+      trackedChangesForId: getTrackChanges(newEditorState, trackedMarkId)
+    });
+  };
   const { step: step3 } = trackedChangeMeta;
   let nodes = step3?.slice?.content?.content || [];
   if (!nodes.length)
@@ -268791,8 +268925,42 @@ var Node$13 = class Node$14 {
         return false;
       }
     });
-  const emitParams = nodes.length > 0 || Boolean(deletionNodes?.length) ? createOrUpdateTrackedChangeComment({
-    documentId: editor.options.documentId,
+  const hasCandidateNodes = nodes.length > 0 || Boolean(deletionNodes?.length);
+  if (Boolean(insertedMark && deletionMark) && Boolean(insertedId) && Boolean(deletionId) && insertedId !== deletionId) {
+    const isNewInsertion = registerTrackedChangeId(insertedId, { insertion: insertedId });
+    const isNewDeletion = registerTrackedChangeId(deletionId, { deletion: deletionId });
+    const insertionPayload = hasCandidateNodes ? buildTrackedChangePayload({
+      event: isNewInsertion ? "add" : "update",
+      marks: {
+        insertedMark,
+        deletionMark: null,
+        formatMark: null
+      },
+      deletionNodes: [],
+      nodes
+    }) : null;
+    const deletionPayload = deletionMark && (hasCandidateNodes || getTrackChanges(newEditorState, deletionId).length > 0) ? buildTrackedChangePayload({
+      event: isNewDeletion ? "add" : "update",
+      marks: {
+        insertedMark: null,
+        deletionMark,
+        formatMark: null
+      },
+      deletionNodes,
+      nodes: []
+    }) : null;
+    if (emitCommentEvent && insertionPayload)
+      editor.emit("commentsUpdate", insertionPayload);
+    if (emitCommentEvent && deletionPayload)
+      editor.emit("commentsUpdate", deletionPayload);
+    return newTrackedChanges;
+  }
+  const isNewChange = registerTrackedChangeId(primaryId, {
+    ...insertedMark ? { insertion: primaryId } : {},
+    ...deletionMark ? { deletion: deletionId } : {},
+    ...formatMark ? { format: formatId } : {}
+  });
+  const emitParams = hasCandidateNodes ? buildTrackedChangePayload({
     event: isNewChange ? "add" : "update",
     marks: {
       insertedMark,
@@ -268800,8 +268968,7 @@ var Node$13 = class Node$14 {
       formatMark
     },
     deletionNodes,
-    nodes,
-    newEditorState
+    nodes
   }) : null;
   if (emitParams && emitCommentEvent)
     editor.emit("commentsUpdate", emitParams);
@@ -268899,7 +269066,9 @@ var Node$13 = class Node$14 {
   const { name: trackedChangeType } = type;
   const { author, authorEmail, authorImage, date, importedAuthor } = attrs;
   const id2 = attrs.id;
-  let isReplacement = !!(marks.insertedMark && marks.deletionMark);
+  const insertedMarkId = marks.insertedMark?.attrs?.id ?? null;
+  const deletionMarkId = marks.deletionMark?.attrs?.id ?? null;
+  let isReplacement = Boolean(insertedMarkId && deletionMarkId && insertedMarkId === deletionMarkId);
   if (!isReplacement) {
     const hasInsertMark = trackedChangesWithId.some(({ mark: mark2 }) => mark2.type.name === TrackInsertMarkName);
     const hasDeleteMark = trackedChangesWithId.some(({ mark: mark2 }) => mark2.type.name === TrackDeleteMarkName);
@@ -287248,15 +287417,32 @@ menclose::after {
       try {
         const sdtBlock = clickDepth === 1 ? this.#findStructuredContentBlockAtPos(doc$12, hit.pos) : null;
         let nextSelection;
+        let inlineSdtBoundaryPos = null;
+        let inlineSdtBoundaryDirection = null;
         const insideTableInSdt = !!sdtBlock && this.#isInsideTableWithinStructuredContentBlock(doc$12, hit.pos, sdtBlock.pos);
         if (sdtBlock && !insideTableInSdt)
           nextSelection = NodeSelection.create(doc$12, sdtBlock.pos);
         else {
-          nextSelection = TextSelection.create(doc$12, hit.pos);
+          const inlineSdt = clickDepth === 1 ? this.#findStructuredContentInlineAtPos(doc$12, hit.pos) : null;
+          if (inlineSdt && hit.pos >= inlineSdt.end) {
+            const afterInlineSdt = inlineSdt.pos + inlineSdt.node.nodeSize;
+            inlineSdtBoundaryPos = afterInlineSdt;
+            inlineSdtBoundaryDirection = "after";
+            nextSelection = TextSelection.create(doc$12, afterInlineSdt);
+          } else if (inlineSdt && hit.pos <= inlineSdt.start) {
+            inlineSdtBoundaryPos = inlineSdt.pos;
+            inlineSdtBoundaryDirection = "before";
+            nextSelection = TextSelection.create(doc$12, inlineSdt.pos);
+          } else
+            nextSelection = TextSelection.create(doc$12, hit.pos);
           if (!nextSelection.$from.parent.inlineContent)
             nextSelection = Selection.near(doc$12.resolve(hit.pos), 1);
         }
-        const tr = editor.state.tr.setSelection(nextSelection);
+        let tr = editor.state.tr.setSelection(nextSelection);
+        if (inlineSdtBoundaryPos != null && inlineSdtBoundaryDirection) {
+          tr = applyEditableSlotAtInlineBoundary(tr, inlineSdtBoundaryPos, inlineSdtBoundaryDirection);
+          nextSelection = tr.selection;
+        }
         if (nextSelection instanceof TextSelection && nextSelection.empty && editor.state.storedMarks)
           tr.setStoredMarks(editor.state.storedMarks);
         editor.view?.dispatch(tr);
@@ -290353,7 +290539,7 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions;
-var init_src_nnj_4GhR_es = __esm(() => {
+var init_src__aJt3Hgw_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_D8HLuwGQ_es();
   init_jszip_C49i9kUs_es();
@@ -325227,7 +325413,7 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_nnj_4GhR_es();
+  init_src__aJt3Hgw_es();
   init_SuperConverter_D8HLuwGQ_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.7.0-next.36",
+  "version": "0.7.0-next.38",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,8 +25,8 @@
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
+    "@superdoc/pm-adapter": "0.0.0",
     "superdoc": "1.26.0"
   },
   "module": "src/index.ts",
@@ -34,11 +34,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.36",
-    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.36",
-    "@superdoc-dev/cli-windows-x64": "0.7.0-next.36",
-    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.36",
-    "@superdoc-dev/cli-linux-x64": "0.7.0-next.36"
+    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.38",
+    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.38",
+    "@superdoc-dev/cli-windows-x64": "0.7.0-next.38",
+    "@superdoc-dev/cli-linux-x64": "0.7.0-next.38",
+    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.38"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",