@parhelia/core 0.3.12767 → 0.3.12769

package/dist/editor/page-viewer/PageViewerFrame.js

@@ -10,6 +10,7 @@ import { useBridgeInlineEditing, } from "../page-editor-chrome/useBridgeInlineEd
 import { createBridgeInlineEditSessionCoordinator, } from "./bridgeInlineEditSession";
 import { getInlineAiAnchorFromBridgeToolbar, getVisibleBridgeToolbarRect, waitForVisibleBridgeToolbarRect, } from "../page-editor-chrome/bridgeInlineFormatToolbarLayout";
 import { IFRAME_OVERLAY_BRIDGE_DRAG_GESTURE_EVENT, IFRAME_OVERLAY_BRIDGE_GEOMETRY_EVENT, IFRAME_OVERLAY_BRIDGE_SCROLL_EVENT, IframeOverlayProvider, } from "../page-editor-chrome/overlay/IframeOverlayProvider";
+import { projectBridgeGeometryToScroll } from "../page-editor-chrome/overlay/geometry";
 import { CANVAS_REFRESH_COMPLETED_EVENT, DEVICE_CHANGE_EVENT, useViewportChangeSignal, } from "./pageViewContext";
 import uuid from "react-uuid";
 import { cn } from "../../lib/utils";
@@ -30,7 +31,7 @@ import { toSitecoreDate } from "../utils/sitecoreDate";
 import { pickVersionAtDate } from "../utils/versionAtDate";
 import { BridgeClient } from "../bridge/BridgeClient";
 import { beginPerfTrace, isPerfTraceActive, isPerfTraceEnabled, perfTraceStep, } from "../perfTrace";
-import { getPendingFieldSuggestions, getSuggestionDisplayValue, } from "../reviews/suggestionDisplayValue";
+import { getPendingFieldSuggestions, getSuggestionSelectionKey, getSuggestionDisplayValue, } from "../reviews/suggestionDisplayValue";
 import { buildBridgeFieldPatchPayload, buildBridgeFieldPatchSignature, buildRemoteCaretFieldPatches, getBridgeFieldPatchValue, hasRemoteCaretDraftForField, isBridgePatchableTextField, isSuggestionPreviewPatchSignature, } from "./bridgeFieldPatch";
 import { bridgeSelectionMatchesInteraction, resolveBridgeTextCompletionInput, } from "./bridgeTextCompletion";
 import { logFieldValueDiagnostic, summarizeField, summarizeFieldDescriptor, summarizeFieldValue, } from "../fieldValueDiagnostics";
@@ -658,6 +659,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
     // skipped entirely: the bridge learns the mode via setEditorMode, and a
     // needless refresh would drop scroll position and inline-edit state.
     const lastRenderSignatureRef = useRef(undefined);
+    const lastRenderModeRef = useRef(editContext.mode);
     // Set when a canvas refresh (bridge patch or full reload) has been requested
     // and its result has not landed yet. While in flight, bridgeGeometry still
     // describes the PRE-refresh DOM — a moved component is still measured at its
@@ -810,6 +812,19 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
             setBridgeGeometryRevision((revision) => revision + 1);
         });
     }, []);
+    const projectCurrentBridgeGeometryToScroll = useCallback((scroll) => {
+        const activeContext = pageViewContextRef.current;
+        const currentGeometry = activeContext?.bridgeGeometry;
+        const projectedGeometry = projectBridgeGeometryToScroll(currentGeometry, scroll);
+        if (!activeContext ||
+            !projectedGeometry ||
+            projectedGeometry === currentGeometry) {
+            return;
+        }
+        activeContext.bridgeGeometry = projectedGeometry;
+        activeContext.setBridgeGeometry(projectedGeometry);
+        scheduleBridgeGeometryRevision();
+    }, [scheduleBridgeGeometryRevision]);
     const scheduleBridgeDomRevision = useCallback(() => {
         if (bridgeDomRevisionRafRef.current != null)
             return;
@@ -1014,8 +1029,13 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         fieldsContextRef,
     ]);
     const getBridgePatchDisplayValue = useCallback(({ field, structureField, itemDescriptor, preferRepositoryValue, }) => {
-        const showSuggestions = editContext.mode === "suggestions" || editContext.showSuggestedEdits;
+        const showSuggestions = editContext.mode === "suggestions";
         const repositoryValue = getBridgeFieldPatchValue(field);
+        const selectionKey = getSuggestionSelectionKey({
+            itemId: itemDescriptor.id,
+            language: itemDescriptor.language,
+            fieldId: field.id || structureField.fieldId,
+        });
         const display = getSuggestionDisplayValue({
             repositoryValue,
             modifiedFields: preferRepositoryValue
@@ -1028,12 +1048,14 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                 language: itemDescriptor.language,
                 version: itemDescriptor.version,
                 pageItemId: pageViewContext.pageItemDescriptor?.id,
+                pageItemLanguage: pageViewContext.pageItemDescriptor?.language,
                 pageItemVersion: pageViewContext.pageItemDescriptor?.version,
             },
             mode: showSuggestions ? "suggestions" : "baseline",
+            selectedVariantId: editContext.suggestionVariantSelection[selectionKey],
         });
         const result = {
-            value: showSuggestions ? display.mergedValue : display.baselineValue,
+            value: showSuggestions ? display.selectedValue : display.baselineValue,
             source: showSuggestions && display.hasSuggestions
                 ? "suggestion-preview"
                 : "real",
@@ -1061,8 +1083,8 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         return result;
     }, [
         editContext.mode,
-        editContext.showSuggestedEdits,
         editContext.suggestedEdits,
+        editContext.suggestionVariantSelection,
         fieldsContext?.modifiedFields,
         pageViewContext.pageItemDescriptor,
     ]);
@@ -1821,9 +1843,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
             let items = [];
             try {
                 const field = await resolveBridgeFieldDescriptor(effectiveInteraction);
-                const canLoadFieldButtons = !!field &&
-                    !editor.readonly &&
-                    !editor.user?.isLimitedPreviewUser;
+                const canLoadFieldButtons = !!field && !editor.readonly && !editor.user?.isLimitedPreviewUser;
                 const fieldButtons = canLoadFieldButtons
                     ? await loadFieldButtons(field)
                     : [];
@@ -1970,6 +1990,8 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                     return;
                 lastX = scroll.x;
                 lastY = scroll.y;
+                latestBridgeScrollRef.current = scroll;
+                projectCurrentBridgeGeometryToScroll(scroll);
                 dispatchBridgeOverlayScroll(iframe, scroll, getBridgeGeometryScrollScale(pageViewContextRef.current?.bridgeGeometry));
             };
             iframeDocument.addEventListener("scroll", handleScroll, {
@@ -1992,7 +2014,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
             detach?.();
             directOverlayScrollSyncRef.current = false;
         };
-    }, [iframeElement, loadedIframeSrc]);
+    }, [iframeElement, loadedIframeSrc, projectCurrentBridgeGeometryToScroll]);
     useEffect(() => {
         const iframe = iframeElement;
         if (!iframe)
@@ -2050,8 +2072,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                             mode: editContextRef.current?.mode ?? "edit",
                             readOnly: editContextRef.current?.readonly ?? true,
                             suggestionsCursorActive: !activeBridgeInlineEditRef.current &&
-                                (editContextRef.current?.mode === "suggestions" ||
-                                    !!editContextRef.current?.showSuggestedEdits),
+                                editContextRef.current?.mode === "suggestions",
                             selectedComponentIds: editContextRef.current?.getSelection() ?? [],
                             featureFlags: {
                                 crossOriginBridge: true,
@@ -2102,19 +2123,22 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                                 transportMs: Date.now() - event.timestamp,
                             });
                         }
-                        latestBridgeScrollRef.current = event.payload.geometry.scroll;
-                        pageViewContext.bridgeGeometry = event.payload.geometry;
-                        pageViewContext.setBridgeGeometry(event.payload.geometry);
-                        scheduleBridgeGeometryRevision();
-                        // The snapshot's scroll can be a frame older than what the direct
-                        // same-origin listener already applied; prefer the live position.
-                        const overlayScroll = (directOverlayScrollSyncRef.current
+                        // Geometry replies race the iframe's synchronous scroll event. A
+                        // reply measured before the scroll must not replace the projected
+                        // rects with a stale snapshot while the overlay layer is already
+                        // positioned at the live scroll offset.
+                        const liveScroll = (directOverlayScrollSyncRef.current
                             ? getIframeWindowScroll(iframe)
                             : undefined) ?? event.payload.geometry.scroll;
-                        dispatchBridgeOverlayScroll(iframe, overlayScroll, getBridgeGeometryScrollScale(event.payload.geometry));
-                        dispatchBridgeOverlayGeometry(iframe, event.payload.geometry, overlayScroll);
+                        const geometry = projectBridgeGeometryToScroll(event.payload.geometry, liveScroll) ?? event.payload.geometry;
+                        latestBridgeScrollRef.current = geometry.scroll;
+                        pageViewContext.bridgeGeometry = geometry;
+                        pageViewContext.setBridgeGeometry(geometry);
+                        scheduleBridgeGeometryRevision();
+                        dispatchBridgeOverlayScroll(iframe, geometry.scroll, getBridgeGeometryScrollScale(geometry));
+                        dispatchBridgeOverlayGeometry(iframe, geometry, geometry.scroll);
                         if (shouldTrackMinimapScroll()) {
-                            scrollHandlerRef.current(event.payload.geometry.scroll.y);
+                            scrollHandlerRef.current(geometry.scroll.y);
                         }
                         break;
                     }
@@ -2160,20 +2184,25 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                             pageViewContext.setBridgeStructure(event.payload.structure);
                         }
                         if (event.payload.geometry) {
-                            latestBridgeScrollRef.current = event.payload.geometry.scroll;
-                            pageViewContext.bridgeGeometry = event.payload.geometry;
-                            pageViewContext.setBridgeGeometry(event.payload.geometry);
-                            scheduleBridgeGeometryRevision();
-                            const overlayScroll = (directOverlayScrollSyncRef.current
+                            const liveScroll = (directOverlayScrollSyncRef.current
                                 ? getIframeWindowScroll(iframe)
                                 : undefined) ?? event.payload.geometry.scroll;
-                            dispatchBridgeOverlayScroll(iframe, overlayScroll, getBridgeGeometryScrollScale(event.payload.geometry));
-                            dispatchBridgeOverlayGeometry(iframe, event.payload.geometry, overlayScroll);
+                            const geometry = projectBridgeGeometryToScroll(event.payload.geometry, liveScroll) ?? event.payload.geometry;
+                            latestBridgeScrollRef.current = geometry.scroll;
+                            pageViewContext.bridgeGeometry = geometry;
+                            pageViewContext.setBridgeGeometry(geometry);
+                            scheduleBridgeGeometryRevision();
+                            dispatchBridgeOverlayScroll(iframe, geometry.scroll, getBridgeGeometryScrollScale(geometry));
+                            dispatchBridgeOverlayGeometry(iframe, geometry, geometry.scroll);
                             if (shouldTrackMinimapScroll()) {
-                                scrollHandlerRef.current(event.payload.geometry.scroll.y);
+                                scrollHandlerRef.current(geometry.scroll.y);
                             }
                         }
-                        if (event.payload.scrollIntentApplied) {
+                        const replayedScrollIsNewerThanCapture = event.payload.scrollIntentApplied &&
+                            (typeof event.payload.scrollIntentTimestamp !== "number" ||
+                                event.payload.scrollIntentTimestamp >=
+                                    pendingRefreshScrollCapturedAtRef.current);
+                        if (replayedScrollIsNewerThanCapture) {
                             // The host already replayed a scroll issued during the refresh
                             // (e.g. a minimap navigation) — restoring the pre-refresh
                             // position now would clobber that newer intent.
@@ -2299,6 +2328,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                         break;
                     case "scrollChanged":
                         latestBridgeScrollRef.current = event.payload.scroll;
+                        projectCurrentBridgeGeometryToScroll(event.payload.scroll);
                         // With the direct same-origin listener active, this message is a
                         // late echo of a scroll the overlay already applied; re-dispatching
                         // it would briefly drag the overlay back to a stale position.
@@ -2502,7 +2532,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                 const field = loadedItem.fields.find((candidate) => fieldIdentifierMatches(candidate, structureField.fieldId));
                 if (!field)
                     continue;
-                const showSuggestions = editContext.mode === "suggestions" || editContext.showSuggestedEdits;
+                const showSuggestions = editContext.mode === "suggestions";
                 const dirtyModifiedField = findModifiedBridgeField({
                     modifiedFields: fieldsContext?.modifiedFields,
                     structureField,
@@ -2523,9 +2553,12 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                             language: itemDescriptor.language,
                             version: itemDescriptor.version,
                             pageItemId: pageViewContextRef.current?.pageItemDescriptor?.id,
+                            pageItemLanguage: pageViewContextRef.current?.pageItemDescriptor?.language,
                             pageItemVersion: pageViewContextRef.current?.pageItemDescriptor?.version,
                         }).length > 0);
-                if (!showSuggestions && !dirtyModifiedField && !needsSuggestionRestore) {
+                if (!showSuggestions &&
+                    !dirtyModifiedField &&
+                    !needsSuggestionRestore) {
                     continue;
                 }
                 const patch = buildBridgeFieldPatch({
@@ -2551,7 +2584,6 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         editContext.itemsRepository,
         editContext.itemsRepository.revision,
         editContext.mode,
-        editContext.showSuggestedEdits,
         editContext.suggestedEdits,
         fieldsContext?.modifiedFields,
         bridgeDomRevision,
@@ -2792,14 +2824,18 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         const signatureUrl = new URL(renderUrl.toString());
         signatureUrl.searchParams.delete("edit_rev");
         const renderSignature = `${signatureUrl.toString()}|rev:${editContext.revision}`;
+        const modeChanged = lastRenderModeRef.current !== editContext.mode;
+        lastRenderModeRef.current = editContext.mode;
         // Only skip when a live bridge confirms the last refresh actually reached
-        // the host. Before the bridge is connected, re-runs must keep going: the
-        // retry/fallback-reload path below is what recovers a canvas whose first
-        // load raced the bridge injection.
+        // the host, or when the only meaningful trigger is an edit/suggestions
+        // mode change. Mode is delivered by setEditorMode and cannot change the
+        // server-rendered URL/revision; reloading during a transient bridge
+        // disconnect would needlessly reset iframe scroll. Before the first bridge
+        // connection, identical non-mode re-runs still use the recovery path.
         if (!shouldUseIframeSrcReload &&
             !versionChanged &&
             lastRenderSignatureRef.current === renderSignature &&
-            bridgeClientRef.current?.supportsCapability("refresh")) {
+            (modeChanged || bridgeClientRef.current?.supportsCapability("refresh"))) {
             setCurrentItemDescriptor(pageItemDescriptor);
             return;
         }
@@ -3101,15 +3137,9 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         bridge?.sendCommand("setEditorMode", {
             mode: editContext.mode,
             readOnly: editContext.readonly,
-            suggestionsCursorActive: !isBridgeInlineEditing &&
-                (editContext.mode === "suggestions" || editContext.showSuggestedEdits),
+            suggestionsCursorActive: !isBridgeInlineEditing && editContext.mode === "suggestions",
         });
-    }, [
-        editContext.mode,
-        editContext.readonly,
-        editContext.showSuggestedEdits,
-        isBridgeInlineEditing,
-    ]);
+    }, [editContext.mode, editContext.readonly, isBridgeInlineEditing]);
     useEffect(() => {
         const previousMode = previousBridgeInlineEditModeRef.current;
         previousBridgeInlineEditModeRef.current = editContext.mode;
@@ -3187,8 +3217,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
     const fullscreenPageTitle = pageViewContext.page?.item?.displayName?.trim() ||
         pageViewContext.page?.item?.name?.trim() ||
         "Page";
-    const showSuggestionsCursor = !isBridgeInlineEditing &&
-        (editContext.mode === "suggestions" || editContext.showSuggestedEdits);
+    const showSuggestionsCursor = !isBridgeInlineEditing && editContext.mode === "suggestions";
     return (_jsxs("div", { className: cn("relative flex h-full w-full flex-col items-center select-none", className, editContext.showAgentsPanel && !editContext.currentWizardId && "pr-0"), children: [!pageViewContext.fullscreen && (_jsx(EditorWarnings, { item: pageViewContext.page?.item })), slotCloseButton && (_jsx("div", { className: "absolute top-3 right-3 z-50", children: slotCloseButton })), pageViewContext.fullscreen && (_jsxs("div", { className: "border-neutral-grey-15 relative z-40 flex h-11 w-full shrink-0 items-center justify-center border-b bg-white px-28 text-center shadow-sm", "data-testid": "fullscreen-page-title-bar", children: [_jsx("div", { className: "text-neutral-grey-100 max-w-full truncate text-sm font-medium", title: fullscreenPageTitle, "data-testid": "fullscreen-page-title", children: fullscreenPageTitle }), _jsx("div", { className: "absolute top-1/2 right-3 -translate-y-1/2", children: _jsx(FullscreenControls, { device: pageViewContext.device, setDevice: (device) => pageViewContext.setDevice(device), canExit: !editContext.configuration.forceFullscreen, onExit: () => editContext.setFullscreen(false) }) })] })), pageViewContext.device !== "desktop" && (_jsx(DeviceToolbar, { pageViewContext: pageViewContext, configuration: editContext.configuration })), _jsxs("div", { className: "relative flex min-h-0 flex-1 transition-[width] duration-300 ease-in-out select-none motion-reduce:transition-none", "data-testid": "page-viewer-viewport", style: {
                     width: deviceWidth,
                 }, children: [_jsxs("div", { className: "relative h-full w-full overflow-visible", onMouseLeave: () => {