@beyondwork/docx-react-component 1.0.57 → 1.0.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (135) hide show
  1. package/README.md +1 -1
  2. package/package.json +2 -1
  3. package/src/api/awareness-identity-types.ts +4 -2
  4. package/src/api/comment-negotiation-types.ts +4 -1
  5. package/src/api/external-custody-types.ts +16 -0
  6. package/src/api/internal/build-ref-projections.ts +108 -0
  7. package/src/api/package-version.ts +1 -1
  8. package/src/api/participants-types.ts +11 -1
  9. package/src/api/public-types.ts +1149 -8
  10. package/src/api/scope-metadata-resolver-types.ts +6 -0
  11. package/src/compare/diff-engine.ts +3 -0
  12. package/src/core/commands/formatting-commands.ts +1 -0
  13. package/src/core/commands/index.ts +225 -16
  14. package/src/core/commands/legacy-form-field-commands.ts +181 -0
  15. package/src/core/commands/table-structure-commands.ts +149 -31
  16. package/src/core/selection/mapping.ts +20 -0
  17. package/src/core/state/editor-state.ts +2 -1
  18. package/src/index.ts +28 -0
  19. package/src/io/docx-session.ts +22 -3
  20. package/src/io/export/export-session.ts +11 -7
  21. package/src/io/export/ooxml-namespaces.ts +47 -0
  22. package/src/io/export/reattach-preserved-parts.ts +4 -16
  23. package/src/io/export/serialize-comments.ts +3 -131
  24. package/src/io/export/serialize-ffdata.ts +89 -0
  25. package/src/io/export/serialize-headers-footers.ts +5 -0
  26. package/src/io/export/serialize-main-document.ts +224 -34
  27. package/src/io/export/serialize-numbering.ts +22 -2
  28. package/src/io/export/serialize-revisions.ts +99 -0
  29. package/src/io/export/serialize-tables.ts +9 -0
  30. package/src/io/export/split-review-boundaries.ts +1 -0
  31. package/src/io/export/table-properties-xml.ts +14 -0
  32. package/src/io/load-scheduler.ts +70 -28
  33. package/src/io/normalize/normalize-text.ts +13 -0
  34. package/src/io/ooxml/_mini-xml.ts +198 -0
  35. package/src/io/ooxml/canonicalize-payload.ts +1 -4
  36. package/src/io/ooxml/chart/chart-style-table.ts +4 -3
  37. package/src/io/ooxml/chart/parse-chart-space.ts +2 -4
  38. package/src/io/ooxml/chart/parse-series.ts +2 -1
  39. package/src/io/ooxml/chart/resolve-color.ts +2 -2
  40. package/src/io/ooxml/chart/types.ts +6 -434
  41. package/src/io/ooxml/comment-presentation-payload.ts +6 -5
  42. package/src/io/ooxml/highlight-colors.ts +8 -5
  43. package/src/io/ooxml/parse-anchor.ts +68 -53
  44. package/src/io/ooxml/parse-comments.ts +14 -142
  45. package/src/io/ooxml/parse-complex-content.ts +3 -106
  46. package/src/io/ooxml/parse-drawing.ts +100 -195
  47. package/src/io/ooxml/parse-ffdata.ts +93 -0
  48. package/src/io/ooxml/parse-fields.ts +7 -146
  49. package/src/io/ooxml/parse-fill.ts +88 -8
  50. package/src/io/ooxml/parse-font-table.ts +5 -105
  51. package/src/io/ooxml/parse-footnotes.ts +28 -152
  52. package/src/io/ooxml/parse-headers-footers.ts +106 -212
  53. package/src/io/ooxml/parse-inline-media.ts +3 -200
  54. package/src/io/ooxml/parse-main-document.ts +180 -217
  55. package/src/io/ooxml/parse-numbering.ts +154 -335
  56. package/src/io/ooxml/parse-object.ts +147 -0
  57. package/src/io/ooxml/parse-ole-relationship.ts +82 -0
  58. package/src/io/ooxml/parse-paragraph-formatting.ts +7 -10
  59. package/src/io/ooxml/parse-picture-sdt.ts +85 -0
  60. package/src/io/ooxml/parse-picture.ts +120 -39
  61. package/src/io/ooxml/parse-revisions.ts +285 -51
  62. package/src/io/ooxml/parse-settings.ts +6 -99
  63. package/src/io/ooxml/parse-shapes.ts +25 -140
  64. package/src/io/ooxml/parse-styles.ts +3 -218
  65. package/src/io/ooxml/parse-tables.ts +76 -256
  66. package/src/io/ooxml/parse-theme.ts +1 -4
  67. package/src/io/ooxml/property-grab-bag.ts +5 -47
  68. package/src/io/ooxml/xml-element-serialize.ts +32 -0
  69. package/src/io/ooxml/xml-parser.ts +183 -0
  70. package/src/legal/bookmarks.ts +1 -1
  71. package/src/legal/cross-references.ts +1 -1
  72. package/src/legal/defined-terms.ts +1 -1
  73. package/src/legal/{_document-root.ts → document-root.ts} +8 -0
  74. package/src/legal/signature-blocks.ts +1 -1
  75. package/src/model/canonical-document.ts +165 -6
  76. package/src/model/chart-types.ts +439 -0
  77. package/src/model/snapshot.ts +3 -1
  78. package/src/review/store/comment-remapping.ts +24 -11
  79. package/src/review/store/revision-actions.ts +482 -2
  80. package/src/review/store/revision-store.ts +15 -0
  81. package/src/review/store/revision-types.ts +76 -0
  82. package/src/runtime/collab/remote-cursor-awareness.ts +24 -0
  83. package/src/runtime/collab/runtime-collab-sync.ts +33 -0
  84. package/src/runtime/diagnostics/build-diagnostic.ts +151 -0
  85. package/src/runtime/diagnostics/code-metadata-table.ts +221 -0
  86. package/src/runtime/document-runtime.ts +544 -35
  87. package/src/runtime/document-search.ts +176 -0
  88. package/src/runtime/edit-ops/index.ts +18 -2
  89. package/src/runtime/footnote-resolver.ts +130 -0
  90. package/src/runtime/layout/layout-engine-instance.ts +31 -4
  91. package/src/runtime/layout/layout-engine-version.ts +37 -1
  92. package/src/runtime/layout/page-graph.ts +14 -1
  93. package/src/runtime/layout/resolved-formatting-state.ts +21 -0
  94. package/src/runtime/numbering-prefix.ts +17 -0
  95. package/src/runtime/query-scopes.ts +183 -0
  96. package/src/runtime/resolved-numbering-geometry.ts +37 -6
  97. package/src/runtime/revision-runtime.ts +27 -1
  98. package/src/runtime/scope-resolver.ts +60 -0
  99. package/src/runtime/selection/post-edit-validator.ts +60 -6
  100. package/src/runtime/structure-ops/index.ts +20 -4
  101. package/src/runtime/surface-projection.ts +293 -18
  102. package/src/runtime/table-schema.ts +6 -0
  103. package/src/runtime/theme-color-resolver.ts +2 -2
  104. package/src/runtime/units.ts +9 -0
  105. package/src/runtime/workflow-rail-segments.ts +4 -0
  106. package/src/ui/WordReviewEditor.tsx +258 -44
  107. package/src/ui/editor-runtime-boundary.ts +13 -0
  108. package/src/ui/editor-shell-view.tsx +4 -1
  109. package/src/ui/headless/chrome-registry.ts +53 -0
  110. package/src/ui/headless/selection-tool-resolver.ts +11 -1
  111. package/src/ui-tailwind/chrome/chrome-preset-model.ts +13 -0
  112. package/src/ui-tailwind/chrome/tw-command-palette-mount.tsx +96 -0
  113. package/src/ui-tailwind/chrome/tw-context-menu.tsx +2 -1
  114. package/src/ui-tailwind/chrome/tw-image-context-toolbar.tsx +5 -4
  115. package/src/ui-tailwind/chrome/tw-mode-dock.tsx +6 -2
  116. package/src/ui-tailwind/chrome/use-container-breakpoint.ts +111 -0
  117. package/src/ui-tailwind/chrome-overlay/tw-chrome-overlay.tsx +23 -9
  118. package/src/ui-tailwind/chrome-overlay/tw-object-selection-overlay.tsx +158 -0
  119. package/src/ui-tailwind/chrome-overlay/tw-page-stack-overlay-layer.tsx +6 -7
  120. package/src/ui-tailwind/editor-surface/pm-schema.ts +105 -17
  121. package/src/ui-tailwind/editor-surface/pm-state-from-snapshot.ts +13 -0
  122. package/src/ui-tailwind/editor-surface/shape-renderer.ts +76 -14
  123. package/src/ui-tailwind/editor-surface/tw-page-block-view.helpers.ts +18 -1
  124. package/src/ui-tailwind/editor-surface/tw-page-block-view.tsx +2 -0
  125. package/src/ui-tailwind/editor-surface/tw-table-node-view.tsx +18 -2
  126. package/src/ui-tailwind/index.ts +9 -0
  127. package/src/ui-tailwind/page-chrome-model.ts +77 -5
  128. package/src/ui-tailwind/page-stack/tw-page-stack-chrome-layer.tsx +56 -1
  129. package/src/ui-tailwind/page-stack/tw-region-block-renderer.tsx +2 -0
  130. package/src/ui-tailwind/review/tw-comment-sidebar.tsx +116 -113
  131. package/src/ui-tailwind/review/tw-review-rail-footer.tsx +2 -2
  132. package/src/ui-tailwind/theme/tokens.ts +14 -0
  133. package/src/ui-tailwind/toolbar/tw-shell-header.tsx +5 -0
  134. package/src/ui-tailwind/tw-review-workspace.tsx +52 -87
  135. package/src/validation/diagnostics.ts +1 -0
@@ -147,7 +147,7 @@ export interface TwPageStackChromeLayerProps {
147
147
  "data-testid"?: string;
148
148
  }
149
149
 
150
- export const TwPageStackChromeLayer: React.FC<TwPageStackChromeLayerProps> = ({
150
+ const TwPageStackChromeLayerInner: React.FC<TwPageStackChromeLayerProps> = ({
151
151
  facet,
152
152
  scrollRoot,
153
153
  renderFrameRevision,
@@ -409,4 +409,59 @@ export const TwPageStackChromeLayer: React.FC<TwPageStackChromeLayerProps> = ({
409
409
  );
410
410
  };
411
411
 
412
+ function storyTargetEqual(
413
+ a: TwPageStackChromeLayerProps["activeStory"],
414
+ b: TwPageStackChromeLayerProps["activeStory"],
415
+ ): boolean {
416
+ if (a.kind !== b.kind) return false;
417
+ if (a.kind === "main") return true;
418
+ if (a.kind === "footnote" || a.kind === "endnote") {
419
+ // TS narrows a to { noteId: string }; b shares the same kind (guard above)
420
+ return a.noteId === (b as Extract<typeof b, { noteId: string }>).noteId;
421
+ }
422
+ if (a.kind === "header" || a.kind === "footer") {
423
+ const bh = b as Extract<typeof b, { kind: "header" | "footer" }>;
424
+ return (
425
+ a.relationshipId === bh.relationshipId &&
426
+ a.variant === bh.variant &&
427
+ a.sectionIndex === bh.sectionIndex
428
+ );
429
+ }
430
+ return false;
431
+ }
432
+
433
+ function rangeEqual(
434
+ a: { start: number; end: number } | null | undefined,
435
+ b: { start: number; end: number } | null | undefined,
436
+ ): boolean {
437
+ if (a == null && b == null) return true;
438
+ if (a == null || b == null) return false;
439
+ return a.start === b.start && a.end === b.end;
440
+ }
441
+
442
+ function propsAreEqual(
443
+ prev: TwPageStackChromeLayerProps,
444
+ next: TwPageStackChromeLayerProps,
445
+ ): boolean {
446
+ return (
447
+ prev.facet === next.facet &&
448
+ prev.scrollRoot === next.scrollRoot &&
449
+ prev.renderFrameRevision === next.renderFrameRevision &&
450
+ storyTargetEqual(prev.activeStory, next.activeStory) &&
451
+ prev.onOpenStory === next.onOpenStory &&
452
+ prev.pmSurfaceElement === next.pmSurfaceElement &&
453
+ prev.pmView === next.pmView &&
454
+ rangeEqual(prev.visiblePageIndexRange, next.visiblePageIndexRange) &&
455
+ prev["data-testid"] === next["data-testid"]
456
+ );
457
+ }
458
+
459
+ export const TwPageStackChromeLayer = React.memo(
460
+ TwPageStackChromeLayerInner,
461
+ propsAreEqual,
462
+ );
463
+
464
+ /** Exported for unit testing only. */
465
+ export { propsAreEqual as _propsAreEqualForTest };
466
+
412
467
  export default TwPageStackChromeLayer;
@@ -140,6 +140,7 @@ function RegionParagraph({
140
140
  const resolvedNumbering = block.resolvedNumbering;
141
141
  const markerRunProperties = resolvedNumbering?.markerRunProperties;
142
142
  const markerWidth = resolvedNumbering?.geometry?.markerLane?.width;
143
+ const markerStart = resolvedNumbering?.geometry?.markerLane?.start;
143
144
  const markerJustification = resolvedNumbering?.geometry?.markerJustification;
144
145
 
145
146
  const prefixSpan =
@@ -164,6 +165,7 @@ function RegionParagraph({
164
165
  numberingSuffix,
165
166
  markerRunProperties,
166
167
  markerWidth,
168
+ markerStart,
167
169
  markerJustification,
168
170
  )}
169
171
  >
@@ -157,6 +157,16 @@ function CommentThreadCard(props: {
157
157
  const canEdit = isOwnComment && thread.status === "open" && props.onEditBody != null;
158
158
  const hasNoBody = isEmptyCommentBody(leadEntry?.body);
159
159
  const showExcerpt = Boolean(thread.excerpt) && !isDraftThread && thread.excerpt !== "Empty thread";
160
+ const threadCardClassName = [
161
+ "rounded-lg bg-surface/90 transition-colors ring-1 ring-border",
162
+ isActive
163
+ ? "bg-accent-soft/40 ring-accent/25 shadow-[var(--shadow-soft)]"
164
+ : "hover:bg-surface",
165
+ thread.status === "detached"
166
+ ? "border-l-[3px] border-[var(--color-semantic-warning)] opacity-70"
167
+ : "",
168
+ ].join(" ");
169
+ const threadContentPaddingClass = thread.status === "detached" ? "pl-2.5 pr-3" : "px-3";
160
170
 
161
171
  const scrollRef = useCallback(
162
172
  (node: HTMLButtonElement | null) => {
@@ -168,130 +178,123 @@ function CommentThreadCard(props: {
168
178
  );
169
179
 
170
180
  return (
171
- <button
172
- type="button"
173
- ref={scrollRef}
174
- data-comment-thread-id={thread.commentId}
175
- data-comment-thread-status={thread.status}
176
- className={[
177
- "w-full text-left cursor-pointer rounded-lg bg-surface/90 px-3 py-2.5 transition-colors ring-1 ring-border",
178
- focusRingClass,
179
- isActive
180
- ? "bg-accent-soft/40 ring-accent/25 shadow-[var(--shadow-soft)]"
181
- : "hover:bg-surface",
182
- thread.status === "detached"
183
- ? "border-l-[3px] border-[var(--color-semantic-warning)] opacity-70 pl-2.5"
184
- : "",
185
- ].join(" ")}
186
- onClick={() => props.onOpenComment?.(thread)}
187
- >
188
- {/* Header row: avatar + author + date + status */}
189
- <div className="mb-1.5 flex items-center gap-1.5">
190
- <span className="inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full bg-subtle text-[8px] font-semibold text-secondary">
191
- {thread.createdBy.charAt(0).toUpperCase()}
192
- </span>
193
- <span className="truncate text-[10px] font-medium text-primary">{thread.createdBy}</span>
194
- {thread.status === "detached" && (
195
- <span
196
- data-comment-thread-detached-chip="true"
197
- className="inline-flex items-center rounded-full bg-[var(--color-semantic-warning-soft)] text-[var(--color-semantic-warning)] text-[9px] font-semibold uppercase tracking-[0.08em] px-1.5 py-0.5 ml-1.5"
198
- >
199
- Detached
181
+ <div data-comment-thread-card={thread.commentId} className={threadCardClassName}>
182
+ <button
183
+ type="button"
184
+ ref={scrollRef}
185
+ data-comment-thread-id={thread.commentId}
186
+ data-comment-thread-status={thread.status}
187
+ className={["w-full cursor-pointer pb-1 pt-2.5 text-left", threadContentPaddingClass, focusRingClass].join(" ")}
188
+ onClick={() => props.onOpenComment?.(thread)}
189
+ >
190
+ {/* Header row: avatar + author + date + status */}
191
+ <div className="mb-1.5 flex items-center gap-1.5">
192
+ <span className="inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full bg-subtle text-[8px] font-semibold text-secondary">
193
+ {thread.createdBy.charAt(0).toUpperCase()}
200
194
  </span>
201
- )}
202
- <span data-comment-thread-created-at="true" className="text-[9px] text-tertiary">
203
- {formatCommentDate(thread.createdAt)}
204
- </span>
205
- <span className="flex-1" />
206
- {isDraftThread ? <StatusBadge label="draft" tone="draft" /> : null}
207
- {thread.status === "resolved" ? <StatusBadge label="resolved" tone="resolved" /> : null}
208
- </div>
195
+ <span className="truncate text-[10px] font-medium text-primary">{thread.createdBy}</span>
196
+ {thread.status === "detached" && (
197
+ <span
198
+ data-comment-thread-detached-chip="true"
199
+ className="ml-1.5 inline-flex items-center rounded-full bg-[var(--color-semantic-warning-soft)] px-1.5 py-0.5 text-[9px] font-semibold uppercase tracking-[0.08em] text-[var(--color-semantic-warning)]"
200
+ >
201
+ Detached
202
+ </span>
203
+ )}
204
+ <span data-comment-thread-created-at="true" className="text-[9px] text-tertiary">
205
+ {formatCommentDate(thread.createdAt)}
206
+ </span>
207
+ <span className="flex-1" />
208
+ {isDraftThread ? <StatusBadge label="draft" tone="draft" /> : null}
209
+ {thread.status === "resolved" ? <StatusBadge label="resolved" tone="resolved" /> : null}
210
+ </div>
209
211
 
210
- {/* Excerpt — anchored text from document */}
211
- {showExcerpt ? (
212
- <p className="mb-1.5 rounded-md bg-comment-soft px-2 py-1 text-[9px] leading-4 text-secondary italic whitespace-pre-wrap break-words line-clamp-2">
213
- {thread.excerpt}
214
- </p>
215
- ) : null}
212
+ {/* Excerpt — anchored text from document */}
213
+ {showExcerpt ? (
214
+ <p className="mb-1.5 rounded-md bg-comment-soft px-2 py-1 text-[9px] italic leading-4 text-secondary whitespace-pre-wrap break-words line-clamp-2">
215
+ {thread.excerpt}
216
+ </p>
217
+ ) : null}
216
218
 
217
- {/* Comment body */}
218
- {canEdit && (isActive || hasNoBody) ? (
219
- <InlineEditableBody
220
- body={leadEntry?.body ?? ""}
221
- autoFocus={isActive && hasNoBody}
222
- onSave={(newBody) => props.onEditBody?.(thread.commentId, newBody)}
223
- label={isDraftThread ? "New comment" : undefined}
224
- />
225
- ) : presentation ? (
226
- <CommentMarkdownRenderer
227
- body={presentation.body}
228
- mentions={presentation.mentions}
229
- attachments={presentation.attachments}
230
- resolveAttachmentHref={resolveAttachmentHref}
231
- className="text-[10px] leading-[1.1rem] text-secondary break-words"
232
- />
233
- ) : leadEntry?.body ? (
234
- <p
235
- className="text-[10px] leading-[1.1rem] text-secondary whitespace-pre-wrap break-words line-clamp-4"
236
- data-comment-thread-body="true"
237
- >
238
- {leadEntry.body}
239
- </p>
240
- ) : canEdit ? (
241
- <p
242
- className="cursor-text text-[10px] italic text-tertiary"
243
- onClick={(e) => {
244
- e.stopPropagation();
245
- props.onOpenComment?.(thread);
246
- }}
247
- >
248
- New comment
249
- </p>
250
- ) : null}
219
+ {/* Comment body */}
220
+ {canEdit && (isActive || hasNoBody) ? (
221
+ <InlineEditableBody
222
+ body={leadEntry?.body ?? ""}
223
+ autoFocus={isActive && hasNoBody}
224
+ onSave={(newBody) => props.onEditBody?.(thread.commentId, newBody)}
225
+ label={isDraftThread ? "New comment" : undefined}
226
+ />
227
+ ) : presentation ? (
228
+ <CommentMarkdownRenderer
229
+ body={presentation.body}
230
+ mentions={presentation.mentions}
231
+ attachments={presentation.attachments}
232
+ resolveAttachmentHref={resolveAttachmentHref}
233
+ className="text-[10px] leading-[1.1rem] text-secondary break-words"
234
+ />
235
+ ) : leadEntry?.body ? (
236
+ <p
237
+ className="text-[10px] leading-[1.1rem] text-secondary whitespace-pre-wrap break-words line-clamp-4"
238
+ data-comment-thread-body="true"
239
+ >
240
+ {leadEntry.body}
241
+ </p>
242
+ ) : canEdit ? (
243
+ <p
244
+ className="cursor-text text-[10px] italic text-tertiary"
245
+ onClick={(e) => {
246
+ e.stopPropagation();
247
+ props.onOpenComment?.(thread);
248
+ }}
249
+ >
250
+ New comment
251
+ </p>
252
+ ) : null}
251
253
 
252
- {/* Reply entries (compact) */}
253
- {thread.entries.slice(1).map((entry) => {
254
- const replyPresentation = replyPresentationByEntryId.get(entry.entryId);
255
- return (
256
- <div key={entry.entryId} className="mt-2 ml-4 border-l border-border pl-2.5">
257
- <div className="mb-0.5 flex items-center gap-1">
258
- <span className="text-[9px] font-medium text-secondary">{entry.authorId}</span>
259
- <span className="text-[9px] text-tertiary">{formatCommentDate(entry.createdAt)}</span>
254
+ {/* Reply entries (compact) */}
255
+ {thread.entries.slice(1).map((entry) => {
256
+ const replyPresentation = replyPresentationByEntryId.get(entry.entryId);
257
+ return (
258
+ <div key={entry.entryId} className="mt-2 ml-4 border-l border-border pl-2.5">
259
+ <div className="mb-0.5 flex items-center gap-1">
260
+ <span className="text-[9px] font-medium text-secondary">{entry.authorId}</span>
261
+ <span className="text-[9px] text-tertiary">{formatCommentDate(entry.createdAt)}</span>
262
+ </div>
263
+ {replyPresentation ? (
264
+ <CommentMarkdownRenderer
265
+ body={replyPresentation.body}
266
+ mentions={presentation?.mentions}
267
+ attachments={presentation?.attachments}
268
+ resolveAttachmentHref={resolveAttachmentHref}
269
+ className="text-[10px] leading-4 text-secondary break-words"
270
+ />
271
+ ) : (
272
+ <p
273
+ className="text-[10px] leading-4 text-secondary whitespace-pre-wrap break-words line-clamp-3"
274
+ data-comment-reply-body="true"
275
+ >
276
+ {entry.body}
277
+ </p>
278
+ )}
260
279
  </div>
261
- {replyPresentation ? (
262
- <CommentMarkdownRenderer
263
- body={replyPresentation.body}
264
- mentions={presentation?.mentions}
265
- attachments={presentation?.attachments}
266
- resolveAttachmentHref={resolveAttachmentHref}
267
- className="text-[10px] leading-4 text-secondary break-words"
268
- />
269
- ) : (
270
- <p
271
- className="text-[10px] leading-4 text-secondary whitespace-pre-wrap break-words line-clamp-3"
272
- data-comment-reply-body="true"
273
- >
274
- {entry.body}
275
- </p>
276
- )}
277
- </div>
278
- );
279
- })}
280
+ );
281
+ })}
280
282
 
281
- {thread.entryCount > thread.entries.length ? (
282
- <p className="mt-1 text-[9px] text-tertiary">
283
- +{thread.entryCount - thread.entries.length} more
284
- </p>
285
- ) : null}
283
+ {thread.entryCount > thread.entries.length ? (
284
+ <p className="mt-1 text-[9px] text-tertiary">
285
+ +{thread.entryCount - thread.entries.length} more
286
+ </p>
287
+ ) : null}
288
+ </button>
286
289
 
287
290
  {/* Inline actions — compact, horizontal */}
288
- <div className="mt-2 flex items-center gap-1">
291
+ <div className={["mt-2 flex items-center gap-1 pb-2.5", threadContentPaddingClass].join(" ")}>
289
292
  {thread.status === "open" && (
290
293
  <>
291
294
  <button
292
295
  type="button"
293
296
  className="inline-flex items-center gap-0.5 rounded px-1 py-0.5 text-[9px] font-medium text-accent hover:bg-accent-soft transition-colors"
294
- onClick={(e) => { e.stopPropagation(); props.onResolveComment?.(thread.commentId); }}
297
+ onClick={() => props.onResolveComment?.(thread.commentId)}
295
298
  >
296
299
  <Check className="h-2 w-2" /> Resolve
297
300
  </button>
@@ -305,7 +308,7 @@ function CommentThreadCard(props: {
305
308
  type="button"
306
309
  className="inline-flex items-center gap-0.5 rounded px-1 py-0.5 text-[9px] font-medium text-secondary hover:bg-surface-hover transition-colors"
307
310
  data-comment-thread-action="reopen"
308
- onClick={(e) => { e.stopPropagation(); props.onReopenComment?.(thread.commentId); }}
311
+ onClick={() => props.onReopenComment?.(thread.commentId)}
309
312
  >
310
313
  <RotateCcw className="h-2 w-2" /> Reopen
311
314
  </button>
@@ -314,7 +317,7 @@ function CommentThreadCard(props: {
314
317
  <span className="text-[9px] text-comment">Detached</span>
315
318
  )}
316
319
  </div>
317
- </button>
320
+ </div>
318
321
  );
319
322
  }
320
323
 
@@ -1,5 +1,6 @@
1
1
  import React from "react";
2
2
  import { HelpCircle, Search } from "lucide-react";
3
+ import { FOCUS_RING_CLASSES } from "../theme/tokens";
3
4
 
4
5
  /**
5
6
  * Thin pinned footer rendered at the bottom of the review rail. The footer
@@ -14,8 +15,7 @@ export interface TwReviewRailFooterProps {
14
15
  searchLabel?: string;
15
16
  }
16
17
 
17
- const focusRingClass =
18
- "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-canvas";
18
+ const focusRingClass = FOCUS_RING_CLASSES;
19
19
 
20
20
  /**
21
21
  * Accept only http(s) and mailto help links. Rejects javascript:, data:,
@@ -273,6 +273,20 @@ export const HOST_LOCKED_TOKENS = [
273
273
  export type HostOverridableToken = (typeof HOST_OVERRIDABLE_TOKENS)[number];
274
274
  export type HostLockedToken = (typeof HOST_LOCKED_TOKENS)[number];
275
275
 
276
+ /**
277
+ * Canonical focus-visible ring class string (designsystem §4.7 / §7.2).
278
+ *
279
+ * Every interactive chrome surface that renders a custom focus indicator
280
+ * MUST import this constant rather than inline the Tailwind utilities.
281
+ * The invariant is enforced by `test/ui-tailwind/focus-ring-canonical.test.ts`.
282
+ *
283
+ * Exceptions: input / textarea elements that use a 1-px border ring as the
284
+ * idle-state affordance (e.g. `tw-comment-sidebar` reply composer) are
285
+ * a distinct pattern and not covered by this utility.
286
+ */
287
+ export const FOCUS_RING_CLASSES =
288
+ "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-canvas";
289
+
276
290
  /** Returns true if `path` is in the locked set (must not be overridden by hosts). */
277
291
  export function isTokenPathLocked(path: string): boolean {
278
292
  return (HOST_LOCKED_TOKENS as readonly string[]).includes(path);
@@ -131,6 +131,11 @@ export function TwShellHeader(props: TwShellHeaderProps): React.ReactElement {
131
131
  key={mode.id}
132
132
  value={mode.id}
133
133
  disabled={mode.disabled}
134
+ onClick={() => {
135
+ if (!mode.disabled) {
136
+ props.onModeChange?.(mode.id);
137
+ }
138
+ }}
134
139
  className={`wre-rail-tab ${focusRingClass}`}
135
140
  data-testid={`tw-shell-header__mode-${mode.id}`}
136
141
  >
@@ -17,6 +17,7 @@ import type {
17
17
  ActiveListContext,
18
18
  CommentSidebarThreadSnapshot,
19
19
  DocumentNavigationSnapshot,
20
+ EditorAnchorProjection,
20
21
  EditorStoryTarget,
21
22
  EditorViewStateSnapshot,
22
23
  FormattingStateSnapshot,
@@ -39,15 +40,8 @@ import type {
39
40
  WorkspaceMode,
40
41
  ZoomLevel,
41
42
  } from "../api/public-types";
42
- import { findPageForOffset } from "../runtime/document-navigation.ts";
43
43
  import { createCanvasBackend } from "../runtime/layout/index.ts";
44
- import {
45
- DEFAULT_PAGE_ESTIMATE_PX_PER_TWIP,
46
- estimateBlockHeight,
47
- estimateParagraphLineCount,
48
- estimateParagraphLineHeight,
49
- getUsableColumnWidth,
50
- } from "../runtime/page-layout-estimation.ts";
44
+ import { DEFAULT_PAGE_ESTIMATE_PX_PER_TWIP } from "../runtime/page-layout-estimation.ts";
51
45
  import {
52
46
  incrementInvalidationCounter,
53
47
  recordPerfSample,
@@ -96,7 +90,7 @@ import { resolveSelectionToolPlacement } from "./chrome/tw-selection-tool-placem
96
90
  import { TwReviewRail, type ReviewRailTab } from "./review/tw-review-rail";
97
91
  import { TwStatusBar } from "./status/tw-status-bar";
98
92
  import { type ToolbarInteractionPolicy } from "./toolbar/tw-toolbar";
99
- import { TwChromeOverlay } from "./chrome-overlay";
93
+ import { TwChromeOverlay, TwPageStackOverlayLayer } from "./chrome-overlay";
100
94
  import {
101
95
  cycleScopeIndex,
102
96
  shouldHandleScopeNavKey,
@@ -198,6 +192,8 @@ export interface TwReviewWorkspaceProps {
198
192
  selectionContextAnalytics?: RuntimeContextAnalyticsSnapshot | null;
199
193
  currentScopeContextAnalytics?: RuntimeContextAnalyticsSnapshot | null;
200
194
  commands: EditorCommandBag;
195
+ /** N6 — release the grabbed image/shape. Wired to `runtime.deselectObject()` by the host. */
196
+ onDeselectObject?: () => void;
201
197
  activeSelectionTool?: ActiveSelectionToolModel | null;
202
198
  selectionToolAnchor?: SelectionToolAnchor | null;
203
199
  documentNavigation?: DocumentNavigationSnapshot;
@@ -421,6 +417,7 @@ export interface TwReviewWorkspaceProps {
421
417
  */
422
418
  onScopeAskAgent?: (payload: {
423
419
  scopeId: string;
420
+ anchor?: EditorAnchorProjection;
424
421
  }) => void;
425
422
  /**
426
423
  * P3 — optional scope-tag editor slot rendered inside the scope
@@ -536,9 +533,12 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
536
533
  const onScopeAskAgent = props.onScopeAskAgent;
537
534
  const handleScopeCardAskAgent = useCallback(
538
535
  (scopeId: string) => {
539
- onScopeAskAgent?.({ scopeId });
536
+ const cardModel = props.layoutFacet
537
+ ?.getAllScopeCardModels?.()
538
+ ?.find((m) => m.scopeId === scopeId);
539
+ onScopeAskAgent?.({ scopeId, anchor: cardModel?.anchor });
540
540
  },
541
- [onScopeAskAgent],
541
+ [onScopeAskAgent, props.layoutFacet],
542
542
  );
543
543
  const zoomLevel = props.zoomLevel ?? 100;
544
544
  // Numeric zooms resolve immediately; "pageWidth" / "onePage" need the
@@ -546,7 +546,7 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
546
546
  // `pageShellMetrics` has been computed (P2.c).
547
547
  const numericZoomScale = typeof zoomLevel === "number" ? zoomLevel / 100 : 1;
548
548
  const chromePreset = resolveChromePreset(props.chromePreset, props.reviewMode);
549
- const chromeOptions = resolveChromePresetOptions(chromePreset, props.chromeOptions);
549
+ const chromeOptions = resolveChromePresetOptions(chromePreset, props.chromeOptions, viewState.editorRole);
550
550
  const preserveOnlyCount = caps?.preserveOnlyCount ??
551
551
  snapshot.compatibility.featureEntries.filter(
552
552
  (entry) => entry.featureClass === "preserve-only",
@@ -680,6 +680,23 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
680
680
  // above bumps `renderFrameRevision` on the same kinds; including it
681
681
  // in the dependency list re-runs this memo without a separate
682
682
  // subscription.
683
+ // N6 — resolve grabbed-object segment offsets from the surface so the
684
+ // selection overlay can query the anchor index without a full surface walk.
685
+ const grabbedSegmentOffsets = useMemo(() => {
686
+ const objectId = snapshot.grabbedObjectId ?? null;
687
+ if (!objectId || !snapshot.surface) return null;
688
+ for (const block of snapshot.surface.blocks) {
689
+ if (!("segments" in block)) continue;
690
+ for (const seg of (block as { segments?: unknown[] }).segments ?? []) {
691
+ const s = seg as { kind?: string; mediaId?: string; from?: number; to?: number };
692
+ if ((s.kind === "image" || s.kind === "shape") && s.mediaId === objectId && s.from != null) {
693
+ return { from: s.from, to: s.to ?? s.from + 1 };
694
+ }
695
+ }
696
+ }
697
+ return null;
698
+ }, [snapshot.grabbedObjectId, snapshot.surface]);
699
+
683
700
  const statusBarPageFacts = useMemo(() => {
684
701
  const facet = props.layoutFacet;
685
702
  if (!facet) {
@@ -1587,12 +1604,12 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
1587
1604
  style={
1588
1605
  isPageWorkspace
1589
1606
  ? {
1590
- // Phase A (L8 page-native layout): the paper frame
1591
- // owns paper width/height + browser-native CSS
1592
- // `zoom` so layout measurement stays truthful
1593
- // inside the card. `pageShellMetrics.pageFrameStyle`
1594
- // carries the paper chrome (bg + shadow + rounded +
1595
- // border) painted exactly once.
1607
+ // N1 (L8 Phase D): paper chrome (bg/border/shadow)
1608
+ // now lives on per-page overlay cards (z-0) painted
1609
+ // by TwPageStackOverlayLayer below. This wrapper
1610
+ // keeps width/height/zoom so layout measurement stays
1611
+ // truthful but is visually transparent so the canvas
1612
+ // background shows through inter-page gaps.
1596
1613
  ...(pageShellMetrics.frameWidthPx
1597
1614
  ? { width: `${pageShellMetrics.frameWidthPx}px` }
1598
1615
  : {}),
@@ -1600,11 +1617,23 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
1600
1617
  ? { minHeight: `${pageShellMetrics.frameHeightPx}px` }
1601
1618
  : {}),
1602
1619
  ...(zoomScale !== 1 ? { zoom: zoomScale } : {}),
1603
- ...pageShellMetrics.pageFrameStyle,
1604
1620
  }
1605
1621
  : undefined
1606
1622
  }
1607
1623
  >
1624
+ {/* N1 (L8 Phase D): per-page paper card backgrounds at z-0,
1625
+ painted before the z-10 PM wrapper so white card areas
1626
+ sit behind PM text. Gaps between cards expose the gray
1627
+ workspace-canvas background, giving N discrete papers. */}
1628
+ {isPageWorkspace && chromeVisibility.pageChrome && props.layoutFacet ? (
1629
+ <TwPageStackOverlayLayer
1630
+ facet={props.layoutFacet}
1631
+ scrollRoot={pageStackScrollRoot}
1632
+ renderFrameRevision={renderFrameRevision}
1633
+ visiblePageIndexRange={visiblePageIndexRange}
1634
+ data-layer="page-card-backgrounds"
1635
+ />
1636
+ ) : null}
1608
1637
  {isPageWorkspace && chromeVisibility.pageChrome && pageChromeModel.lineNumberingEnabled ? (
1609
1638
  <div
1610
1639
  aria-hidden="true"
@@ -1662,6 +1691,10 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
1662
1691
  {props.layoutFacet ? (
1663
1692
  <TwChromeOverlay
1664
1693
  facet={props.layoutFacet}
1694
+ grabbedObjectId={snapshot.grabbedObjectId ?? null}
1695
+ grabbedObjectFromOffset={grabbedSegmentOffsets?.from ?? null}
1696
+ grabbedObjectToOffset={grabbedSegmentOffsets?.to ?? null}
1697
+ onDeselectObject={props.onDeselectObject}
1665
1698
  tableContext={props.tableContext}
1666
1699
  onSetColumnWidth={props.onSetColumnWidth}
1667
1700
  onSetRowHeight={props.onSetRowHeight}
@@ -1967,7 +2000,6 @@ const EMPTY_PAGE_CHROME_MODEL: PageChromeModel = {
1967
2000
  documentGridStyle: undefined,
1968
2001
  };
1969
2002
 
1970
- const DOCUMENT_CONTENT_TOP_PADDING_PX = 40;
1971
2003
 
1972
2004
  // P2.a — real-dimension page frame. Page frame width/height are
1973
2005
  // `pageLayout.pageWidth/pageHeight × FRAME_PX_PER_TWIP_AT_96DPI` so
@@ -2001,7 +2033,6 @@ function buildPageChromeModel(
2001
2033
  pageLayout,
2002
2034
  surfaceBlocks: surface.blocks,
2003
2035
  pages: navigation.pages,
2004
- buildLineNumberMarkers,
2005
2036
  });
2006
2037
  const lineNumberingEnabled =
2007
2038
  Boolean(pageLayout.lineNumbering) && lineMarkers.length > 0;
@@ -2101,72 +2132,6 @@ export function resolveZoomMultiplier(
2101
2132
  );
2102
2133
  }
2103
2134
 
2104
- function buildLineNumberMarkers(
2105
- blocks: readonly SurfaceBlockSnapshot[],
2106
- pages: ReadonlyArray<DocumentNavigationSnapshot["pages"][number]>,
2107
- ): Array<{ id: string; label: string; topPx: number }> {
2108
- const markers: Array<{ id: string; label: string; topPx: number }> = [];
2109
- if (pages.length === 0) {
2110
- return markers;
2111
- }
2112
-
2113
- let currentTopTwips = 0;
2114
- let lineNumber = 1;
2115
- let lastPageIndex = -1;
2116
- let lastSectionIndex = -1;
2117
-
2118
- for (const block of blocks) {
2119
- const pageIndex = findPageForOffset(pages, block.from);
2120
- const page = pages[pageIndex];
2121
- if (!page) {
2122
- continue;
2123
- }
2124
-
2125
- const lineNumbering = page.layout.lineNumbering;
2126
- const restartMode = lineNumbering?.restart ?? "newPage";
2127
- const restartStart = lineNumbering?.start ?? 1;
2128
- const countBy = Math.max(1, lineNumbering?.countBy ?? 1);
2129
- const columnWidth = getUsableColumnWidth(page.layout);
2130
-
2131
- if (pageIndex !== lastPageIndex) {
2132
- if (restartMode === "newPage" || lastPageIndex === -1) {
2133
- lineNumber = restartStart;
2134
- }
2135
- lastPageIndex = pageIndex;
2136
- }
2137
- if (page.sectionIndex !== lastSectionIndex) {
2138
- if (restartMode === "newSection" || lastSectionIndex === -1) {
2139
- lineNumber = restartStart;
2140
- }
2141
- lastSectionIndex = page.sectionIndex;
2142
- }
2143
-
2144
- if (block.kind === "paragraph" && lineNumbering) {
2145
- const lineCount = estimateParagraphLineCount(block, columnWidth);
2146
- const lineHeight = estimateParagraphLineHeight(block);
2147
- const suppress = block.suppressLineNumbers === true;
2148
- for (let lineIndex = 0; lineIndex < lineCount; lineIndex += 1) {
2149
- if (!suppress && (lineNumber - restartStart) % countBy === 0) {
2150
- markers.push({
2151
- id: `${block.blockId}-${lineIndex}`,
2152
- label: String(lineNumber),
2153
- topPx:
2154
- DOCUMENT_CONTENT_TOP_PADDING_PX +
2155
- (currentTopTwips + lineIndex * lineHeight) * DEFAULT_PAGE_ESTIMATE_PX_PER_TWIP,
2156
- });
2157
- }
2158
- if (!suppress) {
2159
- lineNumber += 1;
2160
- }
2161
- }
2162
- }
2163
-
2164
- currentTopTwips += estimateBlockHeight(block, columnWidth);
2165
- }
2166
-
2167
- return markers;
2168
- }
2169
-
2170
2135
  function shouldRenderPageBorder(
2171
2136
  pageLayout: RuntimeRenderSnapshot["pageLayout"],
2172
2137
  pages: ReadonlyArray<DocumentNavigationSnapshot["pages"][number]>,
@@ -17,6 +17,7 @@ export const EDITOR_WARNING_CODES = [
17
17
  "large_document_degraded",
18
18
  "font_substitution",
19
19
  "image_missing",
20
+ "review_target_not_found",
20
21
  ] as const;
21
22
 
22
23
  export type EditorWarningCode = (typeof EDITOR_WARNING_CODES)[number];