@beyondwork/docx-react-component 1.0.58 → 1.0.60

package/src/ui-tailwind/tw-review-workspace.tsx

@@ -17,6 +17,7 @@ import type {
   ActiveListContext,
   CommentSidebarThreadSnapshot,
   DocumentNavigationSnapshot,
+  EditorAnchorProjection,
   EditorStoryTarget,
   EditorViewStateSnapshot,
   FormattingStateSnapshot,
@@ -39,15 +40,8 @@ import type {
   WorkspaceMode,
   ZoomLevel,
 } from "../api/public-types";
-import { findPageForOffset } from "../runtime/document-navigation.ts";
 import { createCanvasBackend } from "../runtime/layout/index.ts";
-import {
-  DEFAULT_PAGE_ESTIMATE_PX_PER_TWIP,
-  estimateBlockHeight,
-  estimateParagraphLineCount,
-  estimateParagraphLineHeight,
-  getUsableColumnWidth,
-} from "../runtime/page-layout-estimation.ts";
+import { DEFAULT_PAGE_ESTIMATE_PX_PER_TWIP } from "../runtime/page-layout-estimation.ts";
 import {
   incrementInvalidationCounter,
   recordPerfSample,
@@ -96,7 +90,7 @@ import { resolveSelectionToolPlacement } from "./chrome/tw-selection-tool-placem
 import { TwReviewRail, type ReviewRailTab } from "./review/tw-review-rail";
 import { TwStatusBar } from "./status/tw-status-bar";
 import { type ToolbarInteractionPolicy } from "./toolbar/tw-toolbar";
-import { TwChromeOverlay } from "./chrome-overlay";
+import { TwChromeOverlay, TwPageStackOverlayLayer } from "./chrome-overlay";
 import {
   cycleScopeIndex,
   shouldHandleScopeNavKey,
@@ -423,6 +417,7 @@ export interface TwReviewWorkspaceProps {
    */
   onScopeAskAgent?: (payload: {
     scopeId: string;
+    anchor?: EditorAnchorProjection;
   }) => void;
   /**
    * P3 — optional scope-tag editor slot rendered inside the scope
@@ -538,9 +533,12 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
   const onScopeAskAgent = props.onScopeAskAgent;
   const handleScopeCardAskAgent = useCallback(
     (scopeId: string) => {
-      onScopeAskAgent?.({ scopeId });
+      const cardModel = props.layoutFacet
+        ?.getAllScopeCardModels?.()
+        ?.find((m) => m.scopeId === scopeId);
+      onScopeAskAgent?.({ scopeId, anchor: cardModel?.anchor });
     },
-    [onScopeAskAgent],
+    [onScopeAskAgent, props.layoutFacet],
   );
   const zoomLevel = props.zoomLevel ?? 100;
   // Numeric zooms resolve immediately; "pageWidth" / "onePage" need the
@@ -548,7 +546,7 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
   // `pageShellMetrics` has been computed (P2.c).
   const numericZoomScale = typeof zoomLevel === "number" ? zoomLevel / 100 : 1;
   const chromePreset = resolveChromePreset(props.chromePreset, props.reviewMode);
-  const chromeOptions = resolveChromePresetOptions(chromePreset, props.chromeOptions);
+  const chromeOptions = resolveChromePresetOptions(chromePreset, props.chromeOptions, viewState.editorRole);
   const preserveOnlyCount = caps?.preserveOnlyCount ??
     snapshot.compatibility.featureEntries.filter(
       (entry) => entry.featureClass === "preserve-only",
@@ -1606,12 +1604,12 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
                   style={
                     isPageWorkspace
                       ? {
-                          // Phase A (L8 page-native layout): the paper frame
-                          // owns paper width/height + browser-native CSS
-                          // `zoom` so layout measurement stays truthful
-                          // inside the card.  `pageShellMetrics.pageFrameStyle`
-                          // carries the paper chrome (bg + shadow + rounded +
-                          // border) — painted exactly once.
+                          // N1 (L8 Phase D): paper chrome (bg/border/shadow)
+                          // now lives on per-page overlay cards (z-0) painted
+                          // by TwPageStackOverlayLayer below.  This wrapper
+                          // keeps width/height/zoom so layout measurement stays
+                          // truthful but is visually transparent so the canvas
+                          // background shows through inter-page gaps.
                           ...(pageShellMetrics.frameWidthPx
                             ? { width: `${pageShellMetrics.frameWidthPx}px` }
                             : {}),
@@ -1619,11 +1617,23 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
                             ? { minHeight: `${pageShellMetrics.frameHeightPx}px` }
                             : {}),
                           ...(zoomScale !== 1 ? { zoom: zoomScale } : {}),
-                          ...pageShellMetrics.pageFrameStyle,
                         }
                       : undefined
                   }
                 >
+                  {/* N1 (L8 Phase D): per-page paper card backgrounds at z-0,
+                      painted before the z-10 PM wrapper so white card areas
+                      sit behind PM text.  Gaps between cards expose the gray
+                      workspace-canvas background, giving N discrete papers. */}
+                  {isPageWorkspace && chromeVisibility.pageChrome && props.layoutFacet ? (
+                    <TwPageStackOverlayLayer
+                      facet={props.layoutFacet}
+                      scrollRoot={pageStackScrollRoot}
+                      renderFrameRevision={renderFrameRevision}
+                      visiblePageIndexRange={visiblePageIndexRange}
+                      data-layer="page-card-backgrounds"
+                    />
+                  ) : null}
                   {isPageWorkspace && chromeVisibility.pageChrome && pageChromeModel.lineNumberingEnabled ? (
                     <div
                       aria-hidden="true"
@@ -1990,7 +2000,6 @@ const EMPTY_PAGE_CHROME_MODEL: PageChromeModel = {
   documentGridStyle: undefined,
 };
 
-const DOCUMENT_CONTENT_TOP_PADDING_PX = 40;
 
 // P2.a — real-dimension page frame.  Page frame width/height are
 // `pageLayout.pageWidth/pageHeight × FRAME_PX_PER_TWIP_AT_96DPI` so
@@ -2024,7 +2033,6 @@ function buildPageChromeModel(
     pageLayout,
     surfaceBlocks: surface.blocks,
     pages: navigation.pages,
-    buildLineNumberMarkers,
   });
   const lineNumberingEnabled =
     Boolean(pageLayout.lineNumbering) && lineMarkers.length > 0;
@@ -2124,72 +2132,6 @@ export function resolveZoomMultiplier(
   );
 }
 
-function buildLineNumberMarkers(
-  blocks: readonly SurfaceBlockSnapshot[],
-  pages: ReadonlyArray<DocumentNavigationSnapshot["pages"][number]>,
-): Array<{ id: string; label: string; topPx: number }> {
-  const markers: Array<{ id: string; label: string; topPx: number }> = [];
-  if (pages.length === 0) {
-    return markers;
-  }
-
-  let currentTopTwips = 0;
-  let lineNumber = 1;
-  let lastPageIndex = -1;
-  let lastSectionIndex = -1;
-
-  for (const block of blocks) {
-    const pageIndex = findPageForOffset(pages, block.from);
-    const page = pages[pageIndex];
-    if (!page) {
-      continue;
-    }
-
-    const lineNumbering = page.layout.lineNumbering;
-    const restartMode = lineNumbering?.restart ?? "newPage";
-    const restartStart = lineNumbering?.start ?? 1;
-    const countBy = Math.max(1, lineNumbering?.countBy ?? 1);
-    const columnWidth = getUsableColumnWidth(page.layout);
-
-    if (pageIndex !== lastPageIndex) {
-      if (restartMode === "newPage" || lastPageIndex === -1) {
-        lineNumber = restartStart;
-      }
-      lastPageIndex = pageIndex;
-    }
-    if (page.sectionIndex !== lastSectionIndex) {
-      if (restartMode === "newSection" || lastSectionIndex === -1) {
-        lineNumber = restartStart;
-      }
-      lastSectionIndex = page.sectionIndex;
-    }
-
-    if (block.kind === "paragraph" && lineNumbering) {
-      const lineCount = estimateParagraphLineCount(block, columnWidth);
-      const lineHeight = estimateParagraphLineHeight(block);
-      const suppress = block.suppressLineNumbers === true;
-      for (let lineIndex = 0; lineIndex < lineCount; lineIndex += 1) {
-        if (!suppress && (lineNumber - restartStart) % countBy === 0) {
-          markers.push({
-            id: `${block.blockId}-${lineIndex}`,
-            label: String(lineNumber),
-            topPx:
-              DOCUMENT_CONTENT_TOP_PADDING_PX +
-              (currentTopTwips + lineIndex * lineHeight) * DEFAULT_PAGE_ESTIMATE_PX_PER_TWIP,
-          });
-        }
-        if (!suppress) {
-          lineNumber += 1;
-        }
-      }
-    }
-
-    currentTopTwips += estimateBlockHeight(block, columnWidth);
-  }
-
-  return markers;
-}
-
 function shouldRenderPageBorder(
   pageLayout: RuntimeRenderSnapshot["pageLayout"],
   pages: ReadonlyArray<DocumentNavigationSnapshot["pages"][number]>,

package/src/validation/diagnostics.ts

@@ -17,6 +17,7 @@ export const EDITOR_WARNING_CODES = [
   "large_document_degraded",
   "font_substitution",
   "image_missing",
+  "review_target_not_found",
 ] as const;
 
 export type EditorWarningCode = (typeof EDITOR_WARNING_CODES)[number];