@superdoc-dev/cli 0.2.0-next.138 → 0.2.0-next.139

package/dist/index.js

@@ -135979,7 +135979,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-SNuegb28.es.js
+// ../../packages/superdoc/dist/chunks/src-D6jkx7VE.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -181952,19 +181952,31 @@ function safeCleanup(fn, context) {
   }
 }
 function createHiddenHost(doc$2, widthPx) {
+  const wrapper = doc$2.createElement("div");
+  wrapper.className = "presentation-editor__hidden-host-wrapper";
+  wrapper.style.setProperty("position", "fixed");
+  wrapper.style.setProperty("left", "-9999px");
+  wrapper.style.setProperty("top", "0");
+  wrapper.style.setProperty("width", "1px");
+  wrapper.style.setProperty("height", "1px");
+  wrapper.style.setProperty("overflow", "hidden");
+  wrapper.style.setProperty("opacity", "0");
+  wrapper.style.setProperty("z-index", "-1");
+  wrapper.style.setProperty("pointer-events", "none");
   const host = doc$2.createElement("div");
   host.className = "presentation-editor__hidden-host";
-  host.style.setProperty("position", "fixed");
-  host.style.setProperty("left", "-9999px");
+  host.style.setProperty("position", "absolute");
+  host.style.setProperty("left", "0");
   host.style.setProperty("top", "0");
   if (widthPx >= 0)
     host.style.setProperty("width", `${widthPx}px`);
   host.style.setProperty("overflow-anchor", "none");
-  host.style.setProperty("pointer-events", "none");
-  host.style.setProperty("opacity", "0");
-  host.style.setProperty("z-index", "-1");
   host.style.setProperty("user-select", "none");
-  return host;
+  wrapper.appendChild(host);
+  return {
+    wrapper,
+    host
+  };
 }
 function getFallbackCursorColor(clientId, fallbackColors) {
   return fallbackColors[clientId % fallbackColors.length];
@@ -191795,9 +191807,13 @@ function getAdjacentLineClientTarget(editor, coords, direction) {
   const clientY = rect.top + rect.height / 2;
   if (!Number.isFinite(clientY))
     return null;
+  const pmStart = Number(adjacentLine.dataset?.pmStart);
+  const pmEnd = Number(adjacentLine.dataset?.pmEnd);
   return {
     clientY,
-    pageIndex: Number.isFinite(pageIndex) ? pageIndex : undefined
+    pageIndex: Number.isFinite(pageIndex) ? pageIndex : undefined,
+    pmStart: Number.isFinite(pmStart) ? pmStart : undefined,
+    pmEnd: Number.isFinite(pmEnd) ? pmEnd : undefined
   };
 }
 function getHitFromLayoutCoords(editor, goalX, clientY, coords, pageIndex) {
@@ -191868,6 +191884,33 @@ function findAdjacentLineElement(currentLine, direction) {
     return getEdgeLineFromFragment(pageFragments[0], direction);
   return getEdgeLineFromFragment(pageFragments[pageFragments.length - 1], direction);
 }
+function resolvePositionAtGoalX(editor, pmStart, pmEnd, goalX) {
+  const presentationEditor = editor.presentationEditor;
+  let bestPos = pmStart;
+  let bestDist = Infinity;
+  let lo = pmStart;
+  let hi = pmEnd;
+  while (lo <= hi) {
+    const mid = Math.floor((lo + hi) / 2);
+    const rect = presentationEditor.computeCaretLayoutRect(mid);
+    if (!rect || !Number.isFinite(rect.x)) {
+      lo = mid + 1;
+      continue;
+    }
+    const dist = Math.abs(rect.x - goalX);
+    if (dist < bestDist) {
+      bestDist = dist;
+      bestPos = mid;
+    }
+    if (rect.x < goalX)
+      lo = mid + 1;
+    else if (rect.x > goalX)
+      hi = mid - 1;
+    else
+      break;
+  }
+  return { pos: bestPos };
+}
 function getEdgeLineFromFragment(fragment2, direction) {
   if (!fragment2)
     return null;
@@ -193369,7 +193412,14 @@ var Node$13 = class Node$14 {
             typeOver = true;
         }
       }
-    if (gecko && added.length) {
+    if (added.some((n) => n.nodeName == "BR") && (view.input.lastKeyCode == 8 || view.input.lastKeyCode == 46)) {
+      for (let node3 of added)
+        if (node3.nodeName == "BR" && node3.parentNode) {
+          let after = node3.nextSibling;
+          if (after && after.nodeType == 1 && after.contentEditable == "false")
+            node3.parentNode.removeChild(node3);
+        }
+    } else if (gecko && added.length) {
       let brs = added.filter((n) => n.nodeName == "BR");
       if (brs.length == 2) {
         let [a2, b$1] = brs;
@@ -193385,13 +193435,6 @@ var Node$13 = class Node$14 {
             br2.remove();
         }
       }
-    } else if ((chrome || safari) && added.some((n) => n.nodeName == "BR") && (view.input.lastKeyCode == 8 || view.input.lastKeyCode == 46)) {
-      for (let node3 of added)
-        if (node3.nodeName == "BR" && node3.parentNode) {
-          let after = node3.nextSibling;
-          if (after && after.nodeType == 1 && after.contentEditable == "false")
-            node3.parentNode.removeChild(node3);
-        }
     }
     let readSel = null;
     if (from$1 < 0 && newSel && view.input.lastFocus > Date.now() - 200 && Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 && selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) && readSel.eq(Selection.near(view.state.doc.resolve(0), 1))) {
@@ -219726,7 +219769,7 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_SNuegb28_es = __esm(() => {
+var init_src_D6jkx7VE_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_BQCVReWb_es();
   init_jszip_ChlR43oI_es();
@@ -238607,6 +238650,7 @@ function print() { __p += __j.call(arguments, '') }
     #selectionOverlay;
     #permissionOverlay = null;
     #hiddenHost;
+    #hiddenHostWrapper;
     #layoutOptions;
     #layoutState = {
       blocks: [],
@@ -238629,6 +238673,7 @@ function print() { __p += __j.call(arguments, '') }
     #pendingMapping = null;
     #isRerendering = false;
     #selectionSync = new SelectionSyncCoordinator;
+    #shouldScrollSelectionIntoView = false;
     #epochMapper = new EpochPositionMapper;
     #layoutEpoch = 0;
     #htmlAnnotationHeights = /* @__PURE__ */ new Map;
@@ -238847,11 +238892,13 @@ function print() { __p += __j.call(arguments, '') }
         clip: "rect(1px, 1px, 1px, 1px)"
       });
       this.#visibleHost.appendChild(this.#ariaLiveRegion);
-      this.#hiddenHost = createHiddenHost(doc$2, this.#layoutOptions.pageSize?.w ?? DEFAULT_PAGE_SIZE.w);
+      const { wrapper: hiddenHostWrapper, host: hiddenHost } = createHiddenHost(doc$2, this.#layoutOptions.pageSize?.w ?? DEFAULT_PAGE_SIZE.w);
+      this.#hiddenHostWrapper = hiddenHostWrapper;
+      this.#hiddenHost = hiddenHost;
       if (doc$2.body)
-        doc$2.body.appendChild(this.#hiddenHost);
+        doc$2.body.appendChild(this.#hiddenHostWrapper);
       else
-        this.#visibleHost.appendChild(this.#hiddenHost);
+        this.#visibleHost.appendChild(this.#hiddenHostWrapper);
       const { layoutEngineOptions: _layoutEngineOptions, element: _element, ...editorOptions } = options;
       const normalizedEditorProps = {
         ...editorOptions.editorProps ?? {},
@@ -239791,6 +239838,7 @@ function print() { __p += __j.call(arguments, '') }
       this.#applyZoom();
       this.#domPainter?.setZoom?.(zoom);
       this.emit("zoomChange", { zoom });
+      this.#shouldScrollSelectionIntoView = true;
       this.#scheduleSelectionUpdate();
       if (this.#remoteCursorManager?.hasRemoteCursors()) {
         this.#remoteCursorManager.markDirty();
@@ -239872,7 +239920,7 @@ function print() { __p += __j.call(arguments, '') }
       this.#dragDropManager = null;
       this.#selectionOverlay?.remove();
       this.#painterHost?.remove();
-      this.#hiddenHost?.remove();
+      this.#hiddenHostWrapper?.remove();
       this.#hoverOverlay = null;
       this.#hoverTooltip = null;
       this.#modeBanner?.remove();
@@ -239948,6 +239996,7 @@ function print() { __p += __j.call(arguments, '') }
         }
       };
       const handleSelection = () => {
+        this.#shouldScrollSelectionIntoView = true;
         this.#scheduleSelectionUpdate({ immediate: true });
         this.#updateLocalAwarenessCursor();
         this.#scheduleA11ySelectionAnnouncement();
@@ -240159,6 +240208,7 @@ function print() { __p += __j.call(arguments, '') }
       this.#dragDropManager.bind();
     }
     #focusEditorAfterImageSelection() {
+      this.#shouldScrollSelectionIntoView = true;
       this.#scheduleSelectionUpdate();
       if (document.activeElement instanceof HTMLElement)
         document.activeElement.blur();
@@ -240974,6 +241024,8 @@ function print() { __p += __j.call(arguments, '') }
       this.#setSelectedStructuredContentInlineClass(elements, id2);
     }
     #updateSelection() {
+      const shouldScrollIntoView = this.#shouldScrollSelectionIntoView;
+      this.#shouldScrollSelectionIntoView = false;
       if ((this.#headerFooterSession?.session?.mode ?? "body") !== "body") {
         this.#clearSelectedFieldAnnotationClass();
         return;
@@ -241049,6 +241101,8 @@ function print() { __p += __j.call(arguments, '') }
           if (process$1$1.env.NODE_ENV === "development")
             console.warn("[PresentationEditor] Failed to render caret overlay:", error);
         }
+        if (shouldScrollIntoView)
+          this.#scrollActiveEndIntoView(caretLayout.pageIndex);
         return;
       }
       const domRects = this.#computeSelectionRectsFromDom(from$1, to);
@@ -241081,6 +241135,59 @@ function print() { __p += __j.call(arguments, '') }
         if (process$1$1.env.NODE_ENV === "development")
           console.warn("[PresentationEditor] Failed to render selection rects:", error);
       }
+      if (shouldScrollIntoView) {
+        const head = activeEditor?.view?.state?.selection?.head ?? to;
+        const headLayout = this.#computeCaretLayoutRect(head);
+        if (headLayout)
+          this.#scrollActiveEndIntoView(headLayout.pageIndex);
+      }
+    }
+    #scrollScreenRectIntoView(screenTop, screenBottom) {
+      const scrollContainer = this.#scrollContainer;
+      if (!scrollContainer)
+        return;
+      let containerTop;
+      let containerBottom;
+      if (scrollContainer instanceof Window) {
+        containerTop = 0;
+        containerBottom = scrollContainer.innerHeight;
+      } else {
+        const r$1 = scrollContainer.getBoundingClientRect();
+        containerTop = r$1.top;
+        containerBottom = r$1.bottom;
+      }
+      const SCROLL_MARGIN = 20;
+      if (screenBottom > containerBottom - SCROLL_MARGIN) {
+        const delta = screenBottom - containerBottom + SCROLL_MARGIN;
+        if (scrollContainer instanceof Window)
+          scrollContainer.scrollBy({ top: delta });
+        else
+          scrollContainer.scrollTop += delta;
+      } else if (screenTop < containerTop + SCROLL_MARGIN) {
+        const delta = containerTop + SCROLL_MARGIN - screenTop;
+        if (scrollContainer instanceof Window)
+          scrollContainer.scrollBy({ top: -delta });
+        else
+          scrollContainer.scrollTop -= delta;
+      }
+    }
+    #scrollActiveEndIntoView(pageIndex) {
+      if (!!!this.#painterHost.querySelector(`[data-page-index="${pageIndex}"]`)) {
+        this.#scrollPageIntoView(pageIndex);
+        return;
+      }
+      const caretEl = this.#localSelectionLayer?.querySelector(".presentation-editor__selection-caret");
+      if (caretEl) {
+        const r$1 = caretEl.getBoundingClientRect();
+        this.#scrollScreenRectIntoView(r$1.top, r$1.bottom);
+        return;
+      }
+      const sel = this.getActiveEditor()?.view?.state?.selection;
+      const headRect = !sel || sel.head >= sel.anchor ? this.#localSelectionLayer?.lastElementChild : this.#localSelectionLayer?.firstElementChild;
+      if (headRect) {
+        const r$1 = headRect.getBoundingClientRect();
+        this.#scrollScreenRectIntoView(r$1.top, r$1.bottom);
+      }
     }
     #updatePermissionOverlay() {
       const overlay = this.#permissionOverlay;
@@ -249691,7 +249798,13 @@ function print() { __p += __j.call(arguments, '') }
             const adjacent = getAdjacentLineClientTarget(editor, coords, event.key === "ArrowUp" ? -1 : 1);
             if (!adjacent)
               return false;
-            const hit = getHitFromLayoutCoords(editor, goalX, adjacent.clientY, coords, adjacent.pageIndex);
+            let hit = getHitFromLayoutCoords(editor, goalX, adjacent.clientY, coords, adjacent.pageIndex);
+            if (adjacent.pmStart != null && adjacent.pmEnd != null) {
+              const TOLERANCE = 5;
+              const hitPos = hit?.pos;
+              if (!hit || !Number.isFinite(hitPos) || hitPos < adjacent.pmStart - TOLERANCE || hitPos > adjacent.pmEnd + TOLERANCE)
+                hit = resolvePositionAtGoalX(editor, adjacent.pmStart, adjacent.pmEnd, goalX);
+            }
             if (!hit || !Number.isFinite(hit.pos))
               return false;
             const selection = buildSelection(view.state, hit.pos, event.shiftKey);
@@ -253428,7 +253541,7 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_SNuegb28_es();
+  init_src_D6jkx7VE_es();
   init_SuperConverter_BQCVReWb_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -280544,7 +280657,7 @@ var init_awareness = __esm(() => {
   };
 });
 
-// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_bbc4954c3f565631ca331e4536595600/node_modules/y-prosemirror/src/plugins/keys.js
+// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_4cc29e23e769b0d152b4b8d1fb5406d2/node_modules/y-prosemirror/src/plugins/keys.js
 var ySyncPluginKey2, yUndoPluginKey2, yCursorPluginKey2;
 var init_keys = __esm(() => {
   init_dist5();
@@ -280553,18 +280666,18 @@ var init_keys = __esm(() => {
   yCursorPluginKey2 = new PluginKey2("yjs-cursor");
 });
 
-// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_bbc4954c3f565631ca331e4536595600/node_modules/y-prosemirror/src/plugins/cursor-plugin.js
+// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_4cc29e23e769b0d152b4b8d1fb5406d2/node_modules/y-prosemirror/src/plugins/cursor-plugin.js
 var init_cursor_plugin = __esm(() => {
   init_awareness();
 });
 
-// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_bbc4954c3f565631ca331e4536595600/node_modules/y-prosemirror/src/plugins/undo-plugin.js
+// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_4cc29e23e769b0d152b4b8d1fb5406d2/node_modules/y-prosemirror/src/plugins/undo-plugin.js
 var defaultProtectedNodes2;
 var init_undo_plugin = __esm(() => {
   defaultProtectedNodes2 = new Set(["paragraph"]);
 });
 
-// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_bbc4954c3f565631ca331e4536595600/node_modules/y-prosemirror/src/y-prosemirror.js
+// ../../node_modules/.pnpm/y-prosemirror@1.3.7_prosemirror-model@1.25.4_prosemirror-state@1.4.4_prosemirror-view@1_4cc29e23e769b0d152b4b8d1fb5406d2/node_modules/y-prosemirror/src/y-prosemirror.js
 var init_y_prosemirror = __esm(() => {
   init_cursor_plugin();
   init_undo_plugin();
@@ -394771,12 +394884,12 @@ class DetachedWindowAPI {
 }
 
 // ../../node_modules/.pnpm/happy-dom@20.4.0/node_modules/happy-dom/lib/window/Window.js
-var Window;
+var Window2;
 var init_Window = __esm(() => {
   init_BrowserWindow();
   init_DetachedBrowser();
   init_PropertySymbol();
-  Window = class Window extends BrowserWindow {
+  Window2 = class Window2 extends BrowserWindow {
     happyDOM;
     constructor(options2) {
       const browser3 = new DetachedBrowser(BrowserWindow, {
@@ -394809,7 +394922,7 @@ var GlobalWindow;
 var init_GlobalWindow = __esm(() => {
   init_PropertySymbol();
   init_Window();
-  GlobalWindow = class GlobalWindow extends Window {
+  GlobalWindow = class GlobalWindow extends Window2 {
     Array = globalThis.Array;
     ArrayBuffer = globalThis.ArrayBuffer;
     Boolean = globalThis.Boolean;
@@ -395061,7 +395174,7 @@ var init_lib20 = __esm(() => {
 
 // src/lib/dom-environment.ts
 function createCliDomEnvironment() {
-  const window3 = new Window;
+  const window3 = new Window2;
   return {
     document: window3.document,
     dispose() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.138",
+  "version": "0.2.0-next.139",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -20,21 +20,21 @@
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
-    "@superdoc/pm-adapter": "0.0.0",
-    "superdoc": "1.18.0",
+    "@superdoc/document-api": "0.0.1",
     "@superdoc/super-editor": "0.0.1",
-    "@superdoc/document-api": "0.0.1"
+    "superdoc": "1.18.0",
+    "@superdoc/pm-adapter": "0.0.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.138",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.138",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.138",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.138",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.138"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.139",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.139",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.139",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.139",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.139"
   },
   "scripts": {
     "dev": "bun run src/index.ts",