@superdoc-dev/cli 0.7.0-next.35 → 0.7.0-next.37

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-CKSsojHL.es.js
+// ../../packages/superdoc/dist/chunks/src-j2qoSUF1.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) => {
@@ -253786,6 +253890,25 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
           const maxReserve = computeMaxFootnoteReserve(layoutForPages, pageIndex, baseReserve);
           const columns = pageColumns$1.get(pageIndex);
           const columnCount = Math.max(1, Math.floor(columns?.count ?? 1));
+          let demand = 0;
+          for (let columnIndex = 0;columnIndex < columnCount; columnIndex += 1) {
+            const ids = idsByColumn$1.get(pageIndex)?.get(columnIndex) ?? [];
+            let columnDemand = 0;
+            ids.forEach((id2, idx) => {
+              const ranges = rangesByFootnoteId.get(id2) ?? [];
+              let rangesHeight = 0;
+              ranges.forEach((range) => {
+                const spacingAfter = "spacingAfter" in range ? range.spacingAfter ?? 0 : 0;
+                rangesHeight += range.height + spacingAfter;
+              });
+              columnDemand += rangesHeight + (idx > 0 ? safeGap : 0);
+            });
+            if (columnDemand > 0)
+              columnDemand += safeSeparatorSpacingBefore + safeDividerHeight + safeTopPadding;
+            if (columnDemand > demand)
+              demand = columnDemand;
+          }
+          const placementCeiling = demand > 0 ? Math.min(Math.ceil(demand), maxReserve) : maxReserve;
           const pendingForPage = /* @__PURE__ */ new Map;
           pendingByColumn.forEach((entries2, columnIndex) => {
             const targetIndex = columnIndex < columnCount ? columnIndex : Math.max(0, columnCount - 1);
@@ -253811,7 +253934,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
               const isFirstSlice = columnSlices.length === 0;
               const overhead = isFirstSlice ? (isFirstSlice ? safeSeparatorSpacingBefore : 0) + (isFirstSlice ? isContinuation ? continuationDividerHeight : safeDividerHeight : 0) + safeTopPadding : 0;
               const gapBefore = !isFirstSlice ? safeGap : 0;
-              const { slice: slice2, remainingRanges } = fitFootnoteContent(id2, ranges, Math.max(0, maxReserve - usedHeight - overhead - gapBefore), pageIndex, columnIndex, isContinuation, measuresById$1, isFirstSlice && maxReserve > 0);
+              const { slice: slice2, remainingRanges } = fitFootnoteContent(id2, ranges, Math.max(0, placementCeiling - usedHeight - overhead - gapBefore), pageIndex, columnIndex, isContinuation, measuresById$1, isFirstSlice && placementCeiling > 0);
               if (slice2.ranges.length === 0)
                 return {
                   placed: false,
@@ -254162,7 +254285,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
       let reserves = plan.reserves;
       if (reserves.some((h$2) => h$2 > 0)) {
         let reservesStabilized = false;
-        const seenReserveKeys = new Set([reserves.join(",")]);
+        const seenReserveVectors = [reserves.slice()];
         for (let pass = 0;pass < MAX_FOOTNOTE_LAYOUT_PASSES; pass += 1) {
           layout = relayout(reserves);
           ({ columns: pageColumns, idsByColumn } = resolveFootnoteAssignments(layout));
@@ -254175,9 +254298,22 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
             break;
           }
           const nextKey = nextReserves.join(",");
-          if (seenReserveKeys.has(nextKey))
+          if (seenReserveVectors.some((v) => v.join(",") === nextKey)) {
+            const allVectors = [...seenReserveVectors, nextReserves];
+            const mergedLength = Math.max(...allVectors.map((v) => v.length));
+            const merged = new Array(mergedLength).fill(0);
+            for (const vec of allVectors)
+              for (let i4 = 0;i4 < mergedLength; i4 += 1)
+                if ((vec[i4] ?? 0) > merged[i4])
+                  merged[i4] = vec[i4];
+            reserves = merged;
+            layout = relayout(reserves);
+            ({ columns: pageColumns, idsByColumn } = resolveFootnoteAssignments(layout));
+            ({ measuresById } = await measureFootnoteBlocks(collectFootnoteIdsByColumn(idsByColumn)));
+            plan = computeFootnoteLayoutPlan(layout, idsByColumn, measuresById, reserves, pageColumns);
             break;
-          seenReserveKeys.add(nextKey);
+          }
+          seenReserveVectors.push(nextReserves.slice());
           if (pass < MAX_FOOTNOTE_LAYOUT_PASSES - 1)
             reserves = nextReserves;
         }
@@ -254186,11 +254322,25 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
         let { columns: finalPageColumns, idsByColumn: finalIdsByColumn } = resolveFootnoteAssignments(layout);
         let { blocks: finalBlocks, measuresById: finalMeasuresById } = await measureFootnoteBlocks(collectFootnoteIdsByColumn(finalIdsByColumn));
         let finalPlan = computeFootnoteLayoutPlan(layout, finalIdsByColumn, finalMeasuresById, reserves, finalPageColumns);
-        const finalReserves = finalPlan.reserves;
         let reservesAppliedToLayout = reserves;
-        if (finalReserves.length !== reserves.length || finalReserves.some((h$2, i4) => (reserves[i4] ?? 0) !== h$2) || reserves.some((h$2, i4) => (finalReserves[i4] ?? 0) !== h$2)) {
-          layout = relayout(finalReserves);
-          reservesAppliedToLayout = finalReserves;
+        const MAX_POST_PASSES = 3;
+        for (let postPass = 0;postPass < MAX_POST_PASSES; postPass += 1) {
+          const target = reservesAppliedToLayout.slice();
+          const planReserves = finalPlan.reserves;
+          const len3 = Math.max(target.length, planReserves.length);
+          let needsRelayout = false;
+          for (let i4 = 0;i4 < len3; i4 += 1) {
+            const applied = target[i4] ?? 0;
+            const needed = planReserves[i4] ?? 0;
+            if (needed > applied) {
+              target[i4] = needed;
+              needsRelayout = true;
+            }
+          }
+          if (!needsRelayout)
+            break;
+          layout = relayout(target);
+          reservesAppliedToLayout = target;
           ({ columns: finalPageColumns, idsByColumn: finalIdsByColumn } = resolveFootnoteAssignments(layout));
           ({ blocks: finalBlocks, measuresById: finalMeasuresById } = await measureFootnoteBlocks(collectFootnoteIdsByColumn(finalIdsByColumn)));
           finalPlan = computeFootnoteLayoutPlan(layout, finalIdsByColumn, finalMeasuresById, reservesAppliedToLayout, finalPageColumns);
@@ -259333,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));
 }
@@ -259448,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;
@@ -287202,15 +287363,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);
@@ -290307,7 +290485,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_CKSsojHL_es = __esm(() => {
+var init_src_j2qoSUF1_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_D8HLuwGQ_es();
   init_jszip_C49i9kUs_es();
@@ -325181,7 +325359,7 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CKSsojHL_es();
+  init_src_j2qoSUF1_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.35",
+  "version": "0.7.0-next.37",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,20 +25,20 @@
     "@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": "1.26.0"
+    "superdoc": "1.26.0",
+    "@superdoc/pm-adapter": "0.0.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.35",
-    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.35",
-    "@superdoc-dev/cli-linux-x64": "0.7.0-next.35",
-    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.35",
-    "@superdoc-dev/cli-windows-x64": "0.7.0-next.35"
+    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.37",
+    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.37",
+    "@superdoc-dev/cli-linux-x64": "0.7.0-next.37",
+    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.37",
+    "@superdoc-dev/cli-windows-x64": "0.7.0-next.37"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",