@superdoc-dev/cli 0.2.0-next.125 → 0.2.0-next.127

package/dist/index.js

@@ -135072,7 +135072,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-Gw0CeXiy.es.js
+// ../../packages/superdoc/dist/chunks/src-gn4Pflqy.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -184850,7 +184850,7 @@ function computeAnchorMap(bookmarks, layout, blocks2) {
   });
   return anchorMap;
 }
-async function goToAnchor({ anchor, layout, blocks: blocks2, measures, bookmarks, pageGeometryHelper, painterHost, scrollPageIntoView, waitForPageMount, getActiveEditor, timeoutMs }) {
+async function goToAnchor({ anchor, layout, blocks: blocks2, measures, bookmarks, pageGeometryHelper, painterHost, scrollContainer, zoom, scrollPageIntoView, waitForPageMount, getActiveEditor, timeoutMs }) {
   if (!anchor)
     return false;
   if (!layout)
@@ -184862,9 +184862,11 @@ async function goToAnchor({ anchor, layout, blocks: blocks2, measures, bookmarks
   if (pmPos == null)
     return false;
   let pageIndex = (selectionToRects(layout, blocks2, measures, pmPos, pmPos + 1, pageGeometryHelper) ?? [])[0]?.pageIndex ?? null;
+  let fragmentY = null;
   if (pageIndex == null) {
     let nextFragmentPage = null;
     let nextFragmentStart = null;
+    let nextFragmentY = null;
     for (const page of layout.pages) {
       for (const fragment2 of page.fragments) {
         if (fragment2.kind !== "para")
@@ -184875,25 +184877,46 @@ async function goToAnchor({ anchor, layout, blocks: blocks2, measures, bookmarks
           continue;
         if (pmPos >= fragStart && pmPos < fragEnd) {
           pageIndex = page.number - 1;
+          fragmentY = fragment2.y;
           break;
         }
         if (fragStart > pmPos && (nextFragmentStart === null || fragStart < nextFragmentStart)) {
           nextFragmentPage = page.number - 1;
           nextFragmentStart = fragStart;
+          nextFragmentY = fragment2.y;
         }
       }
       if (pageIndex != null)
         break;
     }
-    if (pageIndex == null && nextFragmentPage != null)
+    if (pageIndex == null && nextFragmentPage != null) {
       pageIndex = nextFragmentPage;
+      fragmentY = nextFragmentY;
+    }
   }
   if (pageIndex == null)
     return false;
   scrollPageIntoView(pageIndex);
   await waitForPageMount(pageIndex, timeoutMs);
   const pageEl = getPageElementByIndex(painterHost, pageIndex);
-  if (pageEl)
+  if (pageEl && fragmentY != null) {
+    const scaledY = fragmentY * zoom;
+    if (scrollContainer instanceof Element) {
+      const pageRect = pageEl.getBoundingClientRect();
+      const containerRect = scrollContainer.getBoundingClientRect();
+      const targetY = pageRect.top - containerRect.top + scrollContainer.scrollTop + scaledY;
+      scrollContainer.scrollTo({
+        top: targetY,
+        behavior: "instant"
+      });
+    } else {
+      const targetY = pageEl.getBoundingClientRect().top + scrollContainer.scrollY + scaledY;
+      scrollContainer.scrollTo({
+        top: targetY,
+        behavior: "instant"
+      });
+    }
+  } else if (pageEl)
     pageEl.scrollIntoView({
       behavior: "instant",
       block: "start"
@@ -197545,10 +197568,29 @@ var Node$13 = class Node$14 {
   newTr.setMeta(CommentsPluginKey, { type: "force" });
 }, require_lodash, import_lodash$1, normalizeAttrs = (attrs = {}) => {
   return Object.fromEntries(Object.entries(attrs).filter(([, value]) => value !== null && value !== undefined));
-}, attrsExactlyMatch = (left$1 = {}, right$1 = {}) => {
-  return (0, import_lodash$1.isEqual)(normalizeAttrs(left$1), normalizeAttrs(right$1));
+}, IDENTITY_ATTR_VALUES, ATTRIBUTE_ONLY_MARKS, normalizeSnapshotAttrs = (attrs = {}) => {
+  const base$1 = normalizeAttrs(attrs);
+  return Object.fromEntries(Object.entries(base$1).filter(([key$1, value]) => IDENTITY_ATTR_VALUES[key$1] !== value));
 }, getTypeName = (markLike) => {
   return markLike?.type?.name ?? markLike?.type;
+}, isTrackFormatNoOp = (before, after) => {
+  const normalize$1 = (entries) => entries.map((s2) => ({
+    type: getTypeName(s2),
+    attrs: normalizeSnapshotAttrs(s2.attrs || {})
+  })).filter((s2) => {
+    if (ATTRIBUTE_ONLY_MARKS.includes(s2.type) && Object.keys(s2.attrs).length === 0)
+      return false;
+    return true;
+  });
+  const normBefore = normalize$1(before);
+  const normAfter = normalize$1(after);
+  if (normBefore.length === 0 && normAfter.length === 0)
+    return true;
+  if (normBefore.length !== normAfter.length)
+    return false;
+  return normBefore.every((b$1) => normAfter.some((a2) => a2.type === b$1.type && (0, import_lodash$1.isEqual)(a2.attrs, b$1.attrs))) && normAfter.every((a2) => normBefore.some((b$1) => b$1.type === a2.type && (0, import_lodash$1.isEqual)(b$1.attrs, a2.attrs)));
+}, attrsExactlyMatch = (left$1 = {}, right$1 = {}) => {
+  return (0, import_lodash$1.isEqual)(normalizeAttrs(left$1), normalizeAttrs(right$1));
 }, marksMatch = (left$1, right$1, exact = true) => {
   if (!left$1 || !right$1 || getTypeName(left$1) !== getTypeName(right$1))
     return false;
@@ -197651,7 +197693,7 @@ var Node$13 = class Node$14 {
       if (formatChangeMark)
         if (formatChangeMark.attrs.before.find((mark2) => markSnapshotMatchesStepMark(mark2, step3.mark, true))) {
           before = [...formatChangeMark.attrs.before.filter((mark2) => !markSnapshotMatchesStepMark(mark2, step3.mark, true))];
-          after = [...formatChangeMark.attrs.after];
+          after = formatChangeMark.attrs.after.filter((mark2) => getTypeName(mark2) !== step3.mark.type.name);
         } else {
           before = [...formatChangeMark.attrs.before];
           after = upsertMarkSnapshotByType(formatChangeMark.attrs.after, {
@@ -197670,6 +197712,11 @@ var Node$13 = class Node$14 {
           attrs: { ...step3.mark.attrs }
         }];
       }
+      if (isTrackFormatNoOp(before, after)) {
+        if (formatChangeMark)
+          newTr.removeMark(Math.max(step3.from, pos), Math.min(step3.to, pos + node3.nodeSize), formatChangeMark);
+        return;
+      }
       if (after.length || before.length) {
         const newFormatMark = state.schema.marks[TrackFormatMarkName].create({
           id: wid,
@@ -217791,7 +217838,7 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_Gw0CeXiy_es = __esm(() => {
+var init_src_gn4Pflqy_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_Cw5CEerM_es();
   init_jszip_ChlR43oI_es();
@@ -225419,6 +225466,11 @@ function print() { __p += __j.call(arguments, '') }
     }).call(exports);
   });
   import_lodash$1 = require_lodash();
+  IDENTITY_ATTR_VALUES = {
+    vertAlign: "baseline",
+    position: "0pt"
+  };
+  ATTRIBUTE_ONLY_MARKS = ["textStyle"];
   DOCUMENT_MIGRATIONS = { initial: migration_after_0_4_14 };
   AnnotatorHelpers = {
     getFieldAttrs,
@@ -239443,6 +239495,8 @@ function print() { __p += __j.call(arguments, '') }
           bookmarks: this.#layoutState.bookmarks,
           pageGeometryHelper: this.#pageGeometryHelper ?? undefined,
           painterHost: this.#painterHost,
+          scrollContainer: this.#scrollContainer ?? this.#visibleHost,
+          zoom: this.zoom,
           scrollPageIntoView: (pageIndex) => this.#scrollPageIntoView(pageIndex),
           waitForPageMount: (pageIndex, timeoutMs) => this.#waitForPageMount(pageIndex, { timeout: timeoutMs }),
           getActiveEditor: () => this.getActiveEditor(),
@@ -251392,7 +251446,7 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_Gw0CeXiy_es();
+  init_src_gn4Pflqy_es();
   init_SuperConverter_Cw5CEerM_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.125",
+  "version": "0.2.0-next.127",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -30,11 +30,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.125",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.125",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.125",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.125",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.125"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.127",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.127",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.127",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.127",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.127"
   },
   "scripts": {
     "dev": "bun run src/index.ts",