@extend-ai/react-docx 0.7.0-alpha.5 → 0.7.0-alpha.7

package/dist/index.d.cts

@@ -968,6 +968,22 @@ interface DocxPageVirtualizationOptions {
      * @defaultValue `0`
      */
     settleDelayMs?: number;
+    /**
+     * Explicit scroll container for internal page virtualization.
+     *
+     * Omit this to let the viewer discover the nearest scrollable ancestor.
+     * Provide it when the host app owns scrolling, such as when the viewer is
+     * mounted inside a custom scroll-area viewport.
+     */
+    scrollElement?: HTMLElement | null;
+    /**
+     * Effective visual scale applied around the viewer.
+     *
+     * Omit this to let the viewer infer CSS `zoom` from its ancestor chain.
+     * Provide it when toolbar zoom is controlled outside the viewer so virtual
+     * page offsets update synchronously with the selected zoom.
+     */
+    zoomScale?: number;
 }
 /**
  * Externally controlled visible page window.

package/dist/index.d.ts

@@ -968,6 +968,22 @@ interface DocxPageVirtualizationOptions {
      * @defaultValue `0`
      */
     settleDelayMs?: number;
+    /**
+     * Explicit scroll container for internal page virtualization.
+     *
+     * Omit this to let the viewer discover the nearest scrollable ancestor.
+     * Provide it when the host app owns scrolling, such as when the viewer is
+     * mounted inside a custom scroll-area viewport.
+     */
+    scrollElement?: HTMLElement | null;
+    /**
+     * Effective visual scale applied around the viewer.
+     *
+     * Omit this to let the viewer infer CSS `zoom` from its ancestor chain.
+     * Provide it when toolbar zoom is controlled outside the viewer so virtual
+     * page offsets update synchronously with the selected zoom.
+     */
+    zoomScale?: number;
 }
 /**
  * Externally controlled visible page window.

package/dist/index.js

@@ -3992,6 +3992,10 @@ function resolveEffectiveZoomScale(element) {
   }
   return Number.isFinite(scale) && scale > 0 ? scale : 1;
 }
+function normalizePageVirtualizationZoomScale(value) {
+  const scale = Number(value);
+  return Number.isFinite(scale) && scale > 0 ? scale : void 0;
+}
 var DOC_SURFACE_STYLE_BY_THEME = {
   light: {
     backgroundColor: "#ffffff",
@@ -22435,13 +22439,14 @@ function ensureDocxViewerPageSurfaceRegistry(editor) {
     registry = {
       pageElements: /* @__PURE__ */ new Map(),
       pageContentKeys: /* @__PURE__ */ new Map(),
+      pageSizes: /* @__PURE__ */ new Map(),
       listeners: /* @__PURE__ */ new Set()
     };
     docxViewerPageSurfaceRegistryByEditor.set(owner, registry);
   }
   return registry;
 }
-function syncDocxViewerPageSurfaceContentKeys(editor, contentKeysByPage) {
+function syncDocxViewerPageSurfaceContentKeys(editor, contentKeysByPage, pageSizesByPage = []) {
   const registry = ensureDocxViewerPageSurfaceRegistry(editor);
   let changed = false;
   contentKeysByPage.forEach((contentKey, pageIndex) => {
@@ -22450,12 +22455,27 @@ function syncDocxViewerPageSurfaceContentKeys(editor, contentKeysByPage) {
       changed = true;
     }
   });
+  pageSizesByPage.forEach((pageSize, pageIndex) => {
+    const widthPx = Math.max(1, Math.round(pageSize.widthPx));
+    const heightPx = Math.max(1, Math.round(pageSize.heightPx));
+    const previous = registry.pageSizes.get(pageIndex);
+    if (previous?.widthPx !== widthPx || previous?.heightPx !== heightPx) {
+      registry.pageSizes.set(pageIndex, { widthPx, heightPx });
+      changed = true;
+    }
+  });
   registry.pageContentKeys.forEach((_, pageIndex) => {
     if (pageIndex >= contentKeysByPage.length) {
       registry.pageContentKeys.delete(pageIndex);
       changed = true;
     }
   });
+  registry.pageSizes.forEach((_, pageIndex) => {
+    if (pageIndex >= pageSizesByPage.length) {
+      registry.pageSizes.delete(pageIndex);
+      changed = true;
+    }
+  });
   if (changed) {
     notifyDocxViewerPageSurfaceSubscribers(registry);
   }
@@ -22472,7 +22492,7 @@ function notifyDocxViewerPageSurfaceSubscribers(registry) {
     listener();
   });
 }
-function registerDocxViewerPageSurface(editor, pageIndex, element) {
+function registerDocxViewerPageSurface(editor, pageIndex, element, previousElement) {
   const registry = ensureDocxViewerPageSurfaceRegistry(editor);
   const normalizedPageIndex = Math.max(0, Math.round(pageIndex));
   const currentElement = registry.pageElements.get(normalizedPageIndex);
@@ -22487,9 +22507,22 @@ function registerDocxViewerPageSurface(editor, pageIndex, element) {
   if (!currentElement) {
     return;
   }
+  if (previousElement && currentElement !== previousElement) {
+    return;
+  }
   registry.pageElements.delete(normalizedPageIndex);
   notifyDocxViewerPageSurfaceSubscribers(registry);
 }
+function resolveDocxViewerRegisteredPageSurfaceSize(registry, pageIndex, fallbackWidthPx, fallbackHeightPx) {
+  const registeredSize = registry.pageSizes.get(pageIndex);
+  if (registeredSize) {
+    return registeredSize;
+  }
+  return {
+    widthPx: Math.max(1, Math.round(fallbackWidthPx)),
+    heightPx: Math.max(1, Math.round(fallbackHeightPx))
+  };
+}
 function resolveDocxViewerPageSurfaceSize(element, fallbackWidthPx, fallbackHeightPx) {
   if (element) {
     const rect = element.getBoundingClientRect();
@@ -22523,6 +22556,104 @@ function resolveDocxViewerPageSurfaceSize(element, fallbackWidthPx, fallbackHeig
     heightPx: Math.max(1, Math.round(fallbackHeightPx))
   };
 }
+function DocxDetachedThumbnailPageSurface({
+  editor,
+  pageIndex
+}) {
+  return /* @__PURE__ */ jsx(
+    DocxEditorViewer,
+    {
+      editor,
+      mode: "read-only",
+      visiblePageRange: { startPageIndex: pageIndex, endPageIndex: pageIndex },
+      pageVirtualization: { enabled: false },
+      showTrackedChanges: editor.showTrackedChanges,
+      showComments: editor.showComments,
+      style: {
+        background: "transparent",
+        padding: 0,
+        margin: 0
+      }
+    }
+  );
+}
+var DocxDetachedThumbnailSurfaceRenderer = class {
+  host;
+  root;
+  activePageIndex;
+  async renderPageSurface(params) {
+    if (typeof document === "undefined" || typeof window === "undefined") {
+      return void 0;
+    }
+    const { editor, registry, pageIndex } = params;
+    await this.ensureRoot();
+    if (!this.root) {
+      return void 0;
+    }
+    if (this.activePageIndex !== pageIndex) {
+      this.activePageIndex = pageIndex;
+      this.root.render(
+        /* @__PURE__ */ jsx(
+          DocxDetachedThumbnailPageSurface,
+          {
+            editor,
+            pageIndex
+          }
+        )
+      );
+    }
+    return this.waitForPageSurface(registry, pageIndex);
+  }
+  clear() {
+    if (this.root) {
+      this.root.unmount();
+      this.root = void 0;
+    }
+    if (this.host?.parentNode) {
+      this.host.parentNode.removeChild(this.host);
+    }
+    this.host = void 0;
+    this.activePageIndex = void 0;
+  }
+  async ensureRoot() {
+    if (this.root) {
+      return;
+    }
+    if (typeof document === "undefined") {
+      return;
+    }
+    const host = document.createElement("div");
+    host.setAttribute("data-docx-thumbnail-detached-renderer", "true");
+    Object.assign(host.style, {
+      position: "fixed",
+      left: "-100000px",
+      top: "0",
+      width: "1px",
+      height: "1px",
+      overflow: "visible",
+      opacity: "0",
+      pointerEvents: "none",
+      zIndex: "-1"
+    });
+    document.body.appendChild(host);
+    this.host = host;
+    const { createRoot } = await import("react-dom/client");
+    this.root = createRoot(host);
+  }
+  async waitForPageSurface(registry, pageIndex) {
+    for (let attempt = 0; attempt < 8; attempt += 1) {
+      const pageElement2 = registry.pageElements.get(pageIndex);
+      if (pageElement2?.isConnected) {
+        return pageElement2;
+      }
+      await new Promise((resolve) => {
+        window.requestAnimationFrame(() => resolve());
+      });
+    }
+    const pageElement = registry.pageElements.get(pageIndex);
+    return pageElement?.isConnected ? pageElement : void 0;
+  }
+};
 var DOCX_THUMBNAIL_SURFACE_CACHE_MAX_ENTRIES = 32;
 var DOCX_THUMBNAIL_MIN_RASTER_INTERVAL_MS = 200;
 function resolveDocxPageThumbnailResolution(options) {
@@ -22600,6 +22731,7 @@ function useDocxPageThumbnails(editor, options = {}) {
   );
   const thumbnailSurfaceCacheRef = React.useRef(void 0);
   const thumbnailRasterQueueRef = React.useRef(void 0);
+  const detachedThumbnailSurfaceRendererRef = React.useRef(void 0);
   const lastPaintedThumbnailKeyByCanvasRef = React.useRef(
     /* @__PURE__ */ new WeakMap()
   );
@@ -22622,8 +22754,17 @@ function useDocxPageThumbnails(editor, options = {}) {
   React.useEffect(() => {
     thumbnailSurfaceCacheRef.current?.clear();
     thumbnailRasterQueueRef.current?.clear();
+    detachedThumbnailSurfaceRendererRef.current?.clear();
+    detachedThumbnailSurfaceRendererRef.current = void 0;
     lastPaintedThumbnailKeyByCanvasRef.current = /* @__PURE__ */ new WeakMap();
   }, [editor.documentLoadNonce, pageSurfaceRegistryOwner]);
+  React.useEffect(
+    () => () => {
+      detachedThumbnailSurfaceRendererRef.current?.clear();
+      detachedThumbnailSurfaceRendererRef.current = void 0;
+    },
+    []
+  );
   const thumbnailResolutionOptionsKey = React.useMemo(() => {
     const bounds = options.resolution;
     const boundsKey = typeof bounds === "number" ? `n${bounds}` : bounds ? `b${bounds.maxWidth ?? ""}x${bounds.maxHeight ?? ""}` : "";
@@ -22651,11 +22792,6 @@ function useDocxPageThumbnails(editor, options = {}) {
         return;
       }
       const requiresAttachedTarget = canvas === void 0;
-      const pageElement = pageSurfaceRegistry.pageElements.get(pageIndex);
-      if (!pageElement || !pageElement.isConnected) {
-        updatePageThumbnailState(pageIndex, "unavailable");
-        return;
-      }
       const force = renderOptions?.force === true;
       const lastPaintedKey = lastPaintedThumbnailKeyByCanvasRef.current.get(targetCanvas);
       if (!force && lastPaintedKey !== void 0 && lastPaintedKey === thumbnailSkipKeyForPage(pageIndex)) {
@@ -22667,41 +22803,67 @@ function useDocxPageThumbnails(editor, options = {}) {
         if (requiresAttachedTarget && attachedCanvasByPageRef.current.get(pageIndex) !== targetCanvas) {
           return;
         }
-        const livePageElement = pageSurfaceRegistry.pageElements.get(pageIndex);
-        if (!livePageElement || !livePageElement.isConnected) {
-          updatePageThumbnailState(pageIndex, "unavailable");
-          return;
-        }
         const runSkipKey = thumbnailSkipKeyForPage(pageIndex);
-        const sourceSize = resolveDocxViewerPageSurfaceSize(
-          livePageElement,
+        const fallbackSourceSize = resolveDocxViewerRegisteredPageSurfaceSize(
+          pageSurfaceRegistry,
+          pageIndex,
           fallbackLayout.pageWidthPx,
           fallbackLayout.pageHeightPx
         );
         const resolution = resolveDocxPageThumbnailResolution({
-          sourceWidthPx: sourceSize.widthPx,
-          sourceHeightPx: sourceSize.heightPx,
+          sourceWidthPx: fallbackSourceSize.widthPx,
+          sourceHeightPx: fallbackSourceSize.heightPx,
           resolution: options.resolution,
           maxWidthPx: options.maxWidthPx,
           maxHeightPx: options.maxHeightPx,
           pixelRatio: options.pixelRatio
         });
-        const surfaceKey = runSkipKey === void 0 ? void 0 : `${runSkipKey}|${sourceSize.widthPx}x${sourceSize.heightPx}|${resolution.pixelWidthPx}x${resolution.pixelHeightPx}`;
+        const surfaceKey = runSkipKey === void 0 ? void 0 : `${runSkipKey}|${fallbackSourceSize.widthPx}x${fallbackSourceSize.heightPx}|${resolution.pixelWidthPx}x${resolution.pixelHeightPx}`;
         const surfaceCache = ensureThumbnailSurfaceCache();
         try {
           let surface = !force && surfaceKey !== void 0 ? surfaceCache.get(surfaceKey) : void 0;
           if (!surface) {
-            surface = await rasterizeDocxThumbnailSurface({
-              pageElement: livePageElement,
-              sourceWidthPx: sourceSize.widthPx,
-              sourceHeightPx: sourceSize.heightPx,
-              widthPx: resolution.widthPx,
-              heightPx: resolution.heightPx,
-              pixelWidthPx: resolution.pixelWidthPx,
-              pixelHeightPx: resolution.pixelHeightPx
-            });
-            if (surfaceKey !== void 0) {
-              surfaceCache.set(surfaceKey, surface);
+            let livePageElement = pageSurfaceRegistry.pageElements.get(pageIndex);
+            let renderedDetachedSurface = false;
+            try {
+              if (!livePageElement || !livePageElement.isConnected) {
+                if (!detachedThumbnailSurfaceRendererRef.current) {
+                  detachedThumbnailSurfaceRendererRef.current = new DocxDetachedThumbnailSurfaceRenderer();
+                }
+                livePageElement = await detachedThumbnailSurfaceRendererRef.current.renderPageSurface(
+                  {
+                    editor,
+                    registry: pageSurfaceRegistry,
+                    pageIndex
+                  }
+                );
+                renderedDetachedSurface = true;
+              }
+              if (!livePageElement || !livePageElement.isConnected) {
+                updatePageThumbnailState(pageIndex, "unavailable");
+                return;
+              }
+              const sourceSize = resolveDocxViewerPageSurfaceSize(
+                livePageElement,
+                fallbackSourceSize.widthPx,
+                fallbackSourceSize.heightPx
+              );
+              surface = await rasterizeDocxThumbnailSurface({
+                pageElement: livePageElement,
+                sourceWidthPx: sourceSize.widthPx,
+                sourceHeightPx: sourceSize.heightPx,
+                widthPx: resolution.widthPx,
+                heightPx: resolution.heightPx,
+                pixelWidthPx: resolution.pixelWidthPx,
+                pixelHeightPx: resolution.pixelHeightPx
+              });
+              if (surfaceKey !== void 0) {
+                surfaceCache.set(surfaceKey, surface);
+              }
+            } finally {
+              if (renderedDetachedSurface) {
+                detachedThumbnailSurfaceRendererRef.current?.clear();
+              }
             }
           }
           blitDocxThumbnailSurface(surface, targetCanvas, resolution);
@@ -22733,7 +22895,8 @@ function useDocxPageThumbnails(editor, options = {}) {
       options.pixelRatio,
       pageSurfaceRegistry,
       thumbnailSkipKeyForPage,
-      updatePageThumbnailState
+      updatePageThumbnailState,
+      editor
     ]
   );
   const requestAttachedThumbnailRenders = React.useCallback(
@@ -22777,10 +22940,15 @@ function useDocxPageThumbnails(editor, options = {}) {
     const totalPages = Math.max(1, editor.totalPages);
     return Array.from({ length: totalPages }, (_, pageIndex) => {
       const pageElement = mountedPageElements.get(pageIndex);
-      const sourceSize = resolveDocxViewerPageSurfaceSize(
+      const sourceSize = pageElement && pageElement.isConnected ? resolveDocxViewerPageSurfaceSize(
         pageElement,
         fallbackLayout.pageWidthPx,
         fallbackLayout.pageHeightPx
+      ) : resolveDocxViewerRegisteredPageSurfaceSize(
+        pageSurfaceRegistry,
+        pageIndex,
+        fallbackLayout.pageWidthPx,
+        fallbackLayout.pageHeightPx
       );
       const resolution = resolveDocxPageThumbnailResolution({
         sourceWidthPx: sourceSize.widthPx,
@@ -22850,6 +23018,7 @@ function useDocxPageThumbnails(editor, options = {}) {
     options.maxHeightPx,
     options.maxWidthPx,
     options.pixelRatio,
+    pageSurfaceRegistry,
     pageThumbnailStates
   ]);
   const paintThumbnail = React.useCallback(
@@ -24146,13 +24315,23 @@ function DocxEditorViewer({
       if (cached) {
         return cached;
       }
+      let registeredElement = null;
       const nextRef = (element) => {
         if (element) {
+          registeredElement = element;
           pageElementsRef.current.set(normalizedPageIndex, element);
         } else {
           pageElementsRef.current.delete(normalizedPageIndex);
         }
-        registerDocxViewerPageSurface(editor, normalizedPageIndex, element);
+        registerDocxViewerPageSurface(
+          editor,
+          normalizedPageIndex,
+          element,
+          registeredElement
+        );
+        if (!element) {
+          registeredElement = null;
+        }
       };
       pageSurfaceRefCallbacksRef.current.set(normalizedPageIndex, nextRef);
       return nextRef;
@@ -25215,12 +25394,27 @@ function DocxEditorViewer({
     pageSectionInfoByIndex,
     trackedChangesEnabled
   ]);
+  const pageThumbnailSurfaceSizesByPage = React.useMemo(
+    () => pageNodeSegmentsByPage.map((_, pageIndex) => {
+      const pageLayout = pageSectionInfoByIndex[pageIndex]?.layout ?? documentLayout;
+      return {
+        widthPx: pageLayout.pageWidthPx,
+        heightPx: pageLayout.pageHeightPx
+      };
+    }),
+    [documentLayout, pageNodeSegmentsByPage, pageSectionInfoByIndex]
+  );
   React.useEffect(() => {
     syncDocxViewerPageSurfaceContentKeys(
       editor,
-      pageThumbnailContentKeysByPage
+      pageThumbnailContentKeysByPage,
+      pageThumbnailSurfaceSizesByPage
     );
-  }, [pageSurfaceRegistryOwner, pageThumbnailContentKeysByPage]);
+  }, [
+    pageSurfaceRegistryOwner,
+    pageThumbnailContentKeysByPage,
+    pageThumbnailSurfaceSizesByPage
+  ]);
   const resolveStyleRefFieldValueForPage = React.useMemo(() => {
     const valueCache = /* @__PURE__ */ new Map();
     const nodes = editor.model.nodes;
@@ -25400,6 +25594,17 @@ function DocxEditorViewer({
   const pageVirtualizationOverscan = hasLargeTableLayoutSurface && !Number.isFinite(pageVirtualization?.overscan) ? LARGE_TABLE_PAGE_VIRTUALIZATION_OVERSCAN : rawPageVirtualizationOverscan;
   const webdriverActive = typeof navigator !== "undefined" && navigator.webdriver === true;
   const internalPageVirtualizationRequested = pageVirtualization?.enabled !== false && !hasExternalVisiblePageRange && !hideDocumentUntilPaginationSettled && isInitialPaginationSettled && !deferInternalPageVirtualization && !webdriverActive && pageCount > 1;
+  const explicitPageVirtualizationScrollElement = pageVirtualization?.scrollElement ?? null;
+  const explicitPageVirtualizationZoomScale = normalizePageVirtualizationZoomScale(pageVirtualization?.zoomScale);
+  const resolveViewerMeasurementZoomScale = React.useCallback(
+    (rootElement, fallback = 1) => {
+      if (explicitPageVirtualizationZoomScale !== void 0) {
+        return explicitPageVirtualizationZoomScale;
+      }
+      return rootElement ? resolveEffectiveZoomScale(rootElement) : fallback;
+    },
+    [explicitPageVirtualizationZoomScale]
+  );
   React.useEffect(() => {
     setDeferInternalPageVirtualization(!hasLargeTableLayoutSurface);
   }, [editor.documentLoadNonce, hasLargeTableLayoutSurface]);
@@ -25430,9 +25635,14 @@ function DocxEditorViewer({
       return;
     }
     setInternalVirtualScrollElement(
-      nearestScrollableAncestor(viewerRootRef.current)
+      explicitPageVirtualizationScrollElement instanceof HTMLElement ? explicitPageVirtualizationScrollElement : nearestScrollableAncestor(viewerRootRef.current)
     );
-  }, [editor.documentLoadNonce, pageCount, trackedChangesEnabled]);
+  }, [
+    editor.documentLoadNonce,
+    explicitPageVirtualizationScrollElement,
+    pageCount,
+    trackedChangesEnabled
+  ]);
   const [zoomProbeNonce, setZoomProbeNonce] = React.useState(0);
   React.useEffect(() => {
     if (typeof window === "undefined") {
@@ -25461,11 +25671,22 @@ function DocxEditorViewer({
     if (!rootElement) {
       return;
     }
-    const nextScale = Math.round(resolveEffectiveZoomScale(rootElement) * 100) / 100;
+    const nextScale = Math.round(
+      resolveViewerMeasurementZoomScale(
+        rootElement,
+        virtualizerMeasurementScale
+      ) * 100
+    ) / 100;
     setVirtualizerMeasurementScale(
       (current) => Math.abs(current - nextScale) < 5e-3 ? current : nextScale
     );
-  }, [editor.documentLoadNonce, pageCount, zoomProbeNonce]);
+  }, [
+    editor.documentLoadNonce,
+    pageCount,
+    resolveViewerMeasurementZoomScale,
+    virtualizerMeasurementScale,
+    zoomProbeNonce
+  ]);
   const internalPageVirtualizationEnabled = internalPageVirtualizationRequested && internalVirtualScrollElement !== null;
   const internalPageVirtualizationPending = typeof window !== "undefined" && internalPageVirtualizationRequested && internalVirtualScrollElement === null;
   const internalVirtualScrollUsesWindow = typeof document !== "undefined" && internalVirtualScrollElement !== null && (internalVirtualScrollElement === document.scrollingElement || internalVirtualScrollElement === document.documentElement || internalVirtualScrollElement === document.body);
@@ -25867,7 +26088,7 @@ function DocxEditorViewer({
       const next = new Map(current);
       let changed = false;
       const rootElement = viewerRootRef.current;
-      const zoomScale = rootElement ? resolveEffectiveZoomScale(rootElement) : 1;
+      const zoomScale = resolveViewerMeasurementZoomScale(rootElement, 1);
       paragraphElementsRef.current.forEach((element, nodeIndex) => {
         if (!element.isConnected || element.dataset.docxParagraphPartialLineRange === "true" || element.closest('[data-docx-header-footer-region="footer"]') || element.closest('[data-docx-header-footer-region="header"]')) {
           return;
@@ -25896,6 +26117,7 @@ function DocxEditorViewer({
   }, [
     editor.documentLoadNonce,
     pageNodeSegmentIdentityKeysByPage,
+    resolveViewerMeasurementZoomScale,
     visiblePageEndIndex,
     visiblePageStartIndex
   ]);
@@ -26417,7 +26639,7 @@ function DocxEditorViewer({
       );
       return;
     }
-    const zoomScale = resolveEffectiveZoomScale(rootElement);
+    const zoomScale = resolveViewerMeasurementZoomScale(rootElement, 1);
     const next = {};
     for (let pageIndex = 0; pageIndex < pageCount; pageIndex += 1) {
       if (!isPageVisible(pageIndex)) {
@@ -26504,6 +26726,7 @@ function DocxEditorViewer({
     pageCount,
     pageHeaderAndFooterNodes,
     pageSectionInfoByIndex,
+    resolveViewerMeasurementZoomScale,
     visiblePageEndIndex,
     visiblePageStartIndex
   ]);
@@ -26533,7 +26756,7 @@ function DocxEditorViewer({
     if (Date.now() < paginationMeasurementSuspendUntilRef.current) {
       return;
     }
-    const zoomScale = resolveEffectiveZoomScale(rootElement);
+    const zoomScale = resolveViewerMeasurementZoomScale(rootElement, 1);
     const nextMeasuredPageIdentityKeys = pageNodeSegmentIdentityKeysByPage;
     const nextMeasuredPageDiagnostics = pageNodeSegmentsByPage.map(
       (_, pageIndex) => {
@@ -26748,6 +26971,7 @@ function DocxEditorViewer({
     pageNodeSegmentIdentityKeysByPage,
     pageSectionInfoByIndex,
     pageHeaderAndFooterNodes,
+    resolveViewerMeasurementZoomScale,
     visiblePageEndIndex,
     visiblePageStartIndex
   ]);
@@ -31182,7 +31406,10 @@ function DocxEditorViewer({
       return;
     }
     const rootElement = viewerRootRef.current;
-    const zoomScale = rootElement ? resolveEffectiveZoomScale(rootElement) : virtualizerMeasurementScale;
+    const zoomScale = resolveViewerMeasurementZoomScale(
+      rootElement,
+      virtualizerMeasurementScale
+    );
     const nextMeasuredHeights = {};
     editor.model.nodes.forEach((node, nodeIndex) => {
       if (node.type !== "table") {
@@ -31324,6 +31551,7 @@ function DocxEditorViewer({
     pageContentWidthPxByNodeIndex,
     paginationMeasurementEnabled,
     paginationMeasurementEpoch,
+    resolveViewerMeasurementZoomScale,
     tableMeasuredRowHeights,
     tableColumnWidths,
     tableRowHeights,