@parhelia/core 0.1.12939 → 0.1.12940

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useLayoutEffect, useRef, useState, } from "react";
 import { BRIDGE_DOM_UPDATED_EVENT, MiniMap } from "./MiniMap";
 import { resolveMiniMapVisibility, } from "./minimapVisibility";
 import { useCanvasSelection, useEditContext, useEditContextRef, useFieldsEditContext, useFieldsEditContextRef, } from "../client/editContext";
@@ -30,7 +30,8 @@ import { pickVersionAtDate } from "../utils/versionAtDate";
 import { BridgeClient } from "../bridge/BridgeClient";
 import { beginPerfTrace, isPerfTraceActive, isPerfTraceEnabled, perfTraceStep, } from "../perfTrace";
 import { getSuggestionDisplayValue } from "../reviews/suggestionDisplayValue";
-import { buildBridgeFieldPatchPayload, getBridgeFieldPatchValue, isBridgePatchableTextField, } from "./bridgeFieldPatch";
+import { buildBridgeFieldPatchPayload, getBridgeFieldPatchValue, isBridgePatchableTextField, reduceActiveBridgeInlineEditForRefreshEvent, } from "./bridgeFieldPatch";
+import { bridgeSelectionMatchesInteraction, resolveBridgeTextCompletionInput, } from "./bridgeTextCompletion";
 import { logFieldValueDiagnostic, summarizeField, summarizeFieldDescriptor, summarizeFieldValue, } from "../fieldValueDiagnostics";
 import { createKeyboardEventFromBridgeInteraction } from "./bridgeKeyboardShortcuts";
 import { formatParentBridgeInjectionDiagnostic, injectParheliaBridgeFromParent, } from "./parentBridgeInjection";
@@ -573,33 +574,10 @@ function isBridgeLinkShortcutRange(range, interaction) {
         ((interaction.elementKey && range.elementKey === interaction.elementKey) ||
             bridgeIdsMatch(range.fieldId, interaction.fieldId)));
 }
-function bridgeSelectionMatchesInteraction(selection, interaction) {
-    return !!(selection?.activeField &&
-        ((interaction.elementKey &&
-            selection.activeField.elementKey === interaction.elementKey) ||
-            bridgeIdsMatch(selection.activeField.fieldId, interaction.fieldId)));
-}
 function getBridgeSelectionMetadataString(selection, key) {
     const value = selection?.metadata?.[key];
     return typeof value === "string" ? value : undefined;
 }
-function clampTextOffset(value, length) {
-    if (typeof value !== "number" || !Number.isFinite(value)) {
-        return length;
-    }
-    return Math.min(length, Math.max(0, value));
-}
-function getPlainTextFromBridgeValue(value) {
-    if (!/[<&]/.test(value))
-        return value;
-    try {
-        const parser = new DOMParser();
-        return parser.parseFromString(value, "text/html").body.textContent ?? "";
-    }
-    catch {
-        return value.replace(/<[^>]*>/g, "");
-    }
-}
 export function PageViewerFrame(props) {
     const editContext = useEditContext();
     useViewportChangeSignal();
@@ -616,6 +594,13 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
     useEffect(() => {
         pageViewContextRef.current = pageViewContext;
     }, [pageViewContext]);
+    const latestBridgeSelectionRef = useRef(pageViewContext.bridgeSelection);
+    // Bridge events are ordered, but the context setter commits asynchronously.
+    // A layout synchronization cannot run later and clobber a newer event-time
+    // ref the way a pending passive effect could.
+    useLayoutEffect(() => {
+        latestBridgeSelectionRef.current = pageViewContext.bridgeSelection;
+    }, [pageViewContext.bridgeSelection]);
     const editContextRef = useEditContextRef();
     const fieldsContextRef = useFieldsEditContextRef();
     const iframeRef = useRef(null);
@@ -637,6 +622,14 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         activeBridgeInlineEditRef.current = null;
         setIsBridgeInlineEditing(false);
     }, []);
+    const reconcileActiveBridgeInlineEdit = useCallback((event) => {
+        const current = activeBridgeInlineEditRef.current;
+        const reconciled = reduceActiveBridgeInlineEditForRefreshEvent(current, event);
+        if (reconciled === current)
+            return;
+        activeBridgeInlineEditRef.current = reconciled;
+        setIsBridgeInlineEditing(!!reconciled);
+    }, []);
     const bridgeTextCompletionRef = useRef(null);
     const bridgeTextCompletionAbortRef = useRef(null);
     const bridgeTextCompletionRequestIdRef = useRef(0);
@@ -1352,7 +1345,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
             clearBridgeTextCompletion();
             return;
         }
-        const bridgeSelection = pageViewContextRef.current?.bridgeSelection;
+        const bridgeSelection = latestBridgeSelectionRef.current;
         const selectionMatches = bridgeSelectionMatchesInteraction(bridgeSelection, interaction);
         const activeField = selectionMatches
             ? bridgeSelection?.activeField
@@ -1384,11 +1377,13 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         const bridgeSelectionEndOffset = selectionMatches && typeof bridgeSelection?.endOffset === "number"
             ? bridgeSelection?.endOffset
             : undefined;
-        const selectedText = typeof interaction.selectedText === "string"
+        const liveSelectedText = typeof interaction.selectedText === "string"
             ? interaction.selectedText
-            : selectionMatches && typeof bridgeSelection?.text === "string"
+            : undefined;
+        const selectedText = liveSelectedText ??
+            (selectionMatches && typeof bridgeSelection?.text === "string"
                 ? bridgeSelection.text
-                : "";
+                : "");
         const selectionStartOffset = liveSelectionStartOffset ??
             (selectionMatches && typeof bridgeSelection?.startOffset === "number"
                 ? bridgeSelection.startOffset
@@ -1405,44 +1400,27 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         const rawValue = activeInlineEditMatches && activeInlineEdit.value !== undefined
             ? activeInlineEdit.value
             : getBridgeFieldPatchValue(field);
-        let completionValue = rawValue;
-        let completionSelectionStart = 0;
-        let completionSelectionEnd = 0;
-        if (isRichText) {
-            const contextBefore = selectionMatches
+        const completionInput = resolveBridgeTextCompletionInput({
+            rawValue,
+            isRichText,
+            selectedText,
+            liveSelectedText,
+            selectionStartOffset,
+            selectionEndOffset,
+            liveSelectionStartOffset,
+            liveSelectionEndOffset,
+            snapshotSelectionStartOffset: bridgeSelectionStartOffset,
+            snapshotSelectionEndOffset: bridgeSelectionEndOffset,
+            contextBefore: selectionMatches
                 ? getBridgeSelectionMetadataString(bridgeSelection, "contextBefore")
-                : undefined;
-            const contextAfter = selectionMatches
+                : undefined,
+            contextAfter: selectionMatches
                 ? getBridgeSelectionMetadataString(bridgeSelection, "contextAfter")
-                : undefined;
-            const hasLiveInteractionOffsets = liveSelectionStartOffset !== undefined &&
-                liveSelectionEndOffset !== undefined;
-            const selectionSnapshotMatchesLiveOffsets = bridgeSelectionStartOffset === undefined ||
-                bridgeSelectionEndOffset === undefined ||
-                !hasLiveInteractionOffsets ||
-                (bridgeSelectionStartOffset === liveSelectionStartOffset &&
-                    bridgeSelectionEndOffset === liveSelectionEndOffset);
-            const metadataMatchesLiveOffsets = selectionSnapshotMatchesLiveOffsets ||
-                ((contextBefore?.length ?? 0) === interaction.selectionStartOffset &&
-                    (contextBefore?.length ?? 0) + selectedText.length ===
-                        interaction.selectionEndOffset);
-            if (metadataMatchesLiveOffsets &&
-                (contextBefore !== undefined || contextAfter !== undefined)) {
-                completionValue = `${contextBefore ?? ""}${selectedText}${contextAfter ?? ""}`;
-                completionSelectionStart = contextBefore?.length ?? 0;
-                completionSelectionEnd =
-                    completionSelectionStart + selectedText.length;
-            }
-            else {
-                completionValue = getPlainTextFromBridgeValue(rawValue);
-                completionSelectionStart = clampTextOffset(selectionStartOffset, completionValue.length);
-                completionSelectionEnd = clampTextOffset(selectionEndOffset ?? selectionStartOffset, completionValue.length);
-            }
-        }
-        else {
-            completionSelectionStart = clampTextOffset(selectionStartOffset, completionValue.length);
-            completionSelectionEnd = clampTextOffset(selectionEndOffset ?? selectionStartOffset, completionValue.length);
-        }
+                : undefined,
+        });
+        const completionValue = completionInput.value;
+        const completionSelectionStart = completionInput.requestSelectionStart;
+        const completionSelectionEnd = completionInput.requestSelectionEnd;
         if (!force &&
             completionValue.slice(0, completionSelectionStart).trim().length < 3) {
             clearBridgeTextCompletion();
@@ -1480,13 +1458,9 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                 elementKey,
                 fieldId: hostFieldId,
                 completion,
-                selectedText,
-                selectionStartOffset: typeof selectionStartOffset === "number"
-                    ? selectionStartOffset
-                    : completionSelectionStart,
-                selectionEndOffset: typeof selectionEndOffset === "number"
-                    ? selectionEndOffset
-                    : completionSelectionEnd,
+                selectedText: completionInput.commandSelectedText,
+                selectionStartOffset: completionInput.commandSelectionStart,
+                selectionEndOffset: completionInput.commandSelectionEnd,
             };
             bridgeTextCompletionRef.current = commandPayload;
             sendTextCompletionCommand({
@@ -1556,7 +1530,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                 const editor = editContextRef.current;
                 let linkRange = editor?.selectedRange;
                 if (!isBridgeLinkShortcutRange(linkRange, interaction)) {
-                    const bridgeSelection = pageViewContextRef.current?.bridgeSelection;
+                    const bridgeSelection = latestBridgeSelectionRef.current;
                     const item = bridgeSelection?.activeField?.item ??
                         pageViewContextRef.current?.page?.item ??
                         pageViewContextRef.current?.pageItemDescriptor;
@@ -1620,7 +1594,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                     await editor.setFocusedField(field, editor.mode !== "suggestions");
                 }
                 const iframeRect = iframe.getBoundingClientRect();
-                const bridgeSelection = pageViewContextRef.current?.bridgeSelection;
+                const bridgeSelection = latestBridgeSelectionRef.current;
                 const fallbackCaretRect = !interaction.selectionRect &&
                     !interaction.caretRect &&
                     bridgeSelection?.collapsed &&
@@ -2010,6 +1984,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                             editorOrigin: window.location.origin,
                             sessionId: editContextRef.current?.sessionId,
                             mode: editContextRef.current?.mode ?? "edit",
+                            readOnly: editContextRef.current?.readonly ?? true,
                             suggestionsCursorActive: !activeBridgeInlineEditRef.current &&
                                 (editContextRef.current?.mode === "suggestions" ||
                                     !!editContextRef.current?.showSuggestedEdits),
@@ -2041,6 +2016,10 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                         pageViewContext.setBridgeStructure(event.payload.structure);
                         if (canvasRefreshInFlightSinceRef.current !== null) {
                             hostAppRefreshSawStructureUpdateRef.current = true;
+                            reconcileActiveBridgeInlineEdit({
+                                type: "structureUpdated",
+                                fields: event.payload.structure.fields,
+                            });
                         }
                         if (awaitingHostAppRefreshRenderRef.current) {
                             // First structure change after a host-app refresh: the page's
@@ -2090,9 +2069,18 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                         });
                         clearBridgeTextCompletion();
                         clearBridgePatchSignatures();
-                        clearActiveBridgeInlineEdit();
+                        // The host preserves the focused field, its live draft, and its
+                        // selection while it patches the refreshed DOM. Keep the matching
+                        // editor-side session as well so repository patch propagation does
+                        // not overwrite that restored DOM and move the caret.
+                        reconcileActiveBridgeInlineEdit({ type: "started" });
                         break;
                     case "refreshCompleted":
+                        reconcileActiveBridgeInlineEdit({
+                            type: "completed",
+                            applied: event.payload.applied,
+                            fields: event.payload.structure?.fields,
+                        });
                         logFieldValueDiagnostic("bridge-frame", "refresh completed", {
                             activeInlineEdit: activeBridgeInlineEditRef.current,
                             hasStructure: !!event.payload.structure,
@@ -2155,6 +2143,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                         setShowSpinner(false);
                         break;
                     case "selectionChanged":
+                        latestBridgeSelectionRef.current = event.payload.selection;
                         pageViewContext.setBridgeSelection(event.payload.selection);
                         handleBridgeSelection(event.payload.selection, iframe);
                         break;
@@ -2284,6 +2273,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         clearBridgeTextCompletion,
         clearBridgePatchSignatures,
         clearActiveBridgeInlineEdit,
+        reconcileActiveBridgeInlineEdit,
         pageViewContext.editUrl,
         pageViewContext.previewUrl,
         scheduleBridgeDomRevision,
@@ -3016,10 +3006,16 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         });
         bridge?.sendCommand("setEditorMode", {
             mode: editContext.mode,
+            readOnly: editContext.readonly,
             suggestionsCursorActive: !isBridgeInlineEditing &&
                 (editContext.mode === "suggestions" || editContext.showSuggestedEdits),
         });
-    }, [editContext.mode, editContext.showSuggestedEdits, isBridgeInlineEditing]);
+    }, [
+        editContext.mode,
+        editContext.readonly,
+        editContext.showSuggestedEdits,
+        isBridgeInlineEditing,
+    ]);
     useEffect(() => {
         const previousMode = previousBridgeInlineEditModeRef.current;
         previousBridgeInlineEditModeRef.current = editContext.mode;