@parhelia/core 0.2.12766 → 0.2.12768

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

@@ -7,6 +7,7 @@ import { useSlotContext } from "../views/editorSlotContext";
 import { useDebouncedCallback, useThrottledCallback } from "use-debounce";
 import { PageEditorChrome } from "../page-editor-chrome/PageEditorChrome";
 import { useBridgeInlineEditing, } from "../page-editor-chrome/useBridgeInlineEditing";
+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 { CANVAS_REFRESH_COMPLETED_EVENT, DEVICE_CHANGE_EVENT, useViewportChangeSignal, } from "./pageViewContext";
@@ -30,7 +31,7 @@ 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, reduceActiveBridgeInlineEditForRefreshEvent, } from "./bridgeFieldPatch";
+import { buildBridgeFieldPatchPayload, getBridgeFieldPatchValue, isBridgePatchableTextField, } from "./bridgeFieldPatch";
 import { bridgeSelectionMatchesInteraction, resolveBridgeTextCompletionInput, } from "./bridgeTextCompletion";
 import { logFieldValueDiagnostic, summarizeField, summarizeFieldDescriptor, summarizeFieldValue, } from "../fieldValueDiagnostics";
 import { createKeyboardEventFromBridgeInteraction } from "./bridgeKeyboardShortcuts";
@@ -618,18 +619,21 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
     const bridgeTextRangeSourcesRef = useRef(new Map());
     const activeBridgeInlineEditRef = useRef(null);
     const [isBridgeInlineEditing, setIsBridgeInlineEditing] = useState(false);
+    const bridgeInlineEditSessionRef = useRef(null);
+    if (!bridgeInlineEditSessionRef.current) {
+        bridgeInlineEditSessionRef.current =
+            createBridgeInlineEditSessionCoordinator({
+                stateRef: activeBridgeInlineEditRef,
+                onStateChange: (state) => setIsBridgeInlineEditing(!!state),
+            });
+    }
+    const bridgeInlineEditSession = bridgeInlineEditSessionRef.current;
     const clearActiveBridgeInlineEdit = useCallback(() => {
-        activeBridgeInlineEditRef.current = null;
-        setIsBridgeInlineEditing(false);
-    }, []);
+        bridgeInlineEditSession.clear();
+    }, [bridgeInlineEditSession]);
     const reconcileActiveBridgeInlineEdit = useCallback((event) => {
-        const current = activeBridgeInlineEditRef.current;
-        const reconciled = reduceActiveBridgeInlineEditForRefreshEvent(current, event);
-        if (reconciled === current)
-            return;
-        activeBridgeInlineEditRef.current = reconciled;
-        setIsBridgeInlineEditing(!!reconciled);
-    }, []);
+        bridgeInlineEditSession.reconcileForRefreshEvent(event);
+    }, [bridgeInlineEditSession]);
     const bridgeTextCompletionRef = useRef(null);
     const bridgeTextCompletionAbortRef = useRef(null);
     const bridgeTextCompletionRequestIdRef = useRef(0);
@@ -897,7 +901,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
     }, []);
     const { beginInlineEdit: beginBridgeInlineEdit, clearInlineDedupe: clearBridgeInlineDedupe, endFieldFocus: endBridgeFieldFocus, handleFieldValueChanged: handleBridgeFieldValueChanged, handleInlineEditEnded: handleBridgeInlineEditEnded, } = useBridgeInlineEditing({
         pageViewContextRef,
-        activeBridgeInlineEditRef,
+        inlineEditSession: bridgeInlineEditSession,
         blockIframeBlurUntil,
         sendBeginInlineEdit,
         sendCancelInlineEdit,
@@ -916,30 +920,27 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                 selectionEndOffset: interaction.selectionEndOffset,
             },
         });
-        clearActiveBridgeInlineEdit();
-        const started = await beginBridgeInlineEdit(interaction);
-        if (started && interaction.elementKey && interaction.fieldId) {
-            const interactionItem = interaction.item?.id &&
-                interaction.item.language &&
-                typeof interaction.item.version === "number"
-                ? {
-                    id: interaction.item.id,
-                    language: interaction.item.language,
-                    version: interaction.item.version,
-                    name: interaction.item.name,
-                    displayName: interaction.item.displayName,
-                    path: interaction.item.path,
-                    database: interaction.item.database,
-                }
-                : undefined;
-            activeBridgeInlineEditRef.current = {
-                elementKey: interaction.elementKey,
-                fieldId: interaction.fieldId,
-                item: interactionItem,
-                modeAtStart: editContextRef.current?.mode ?? editContext.mode,
-            };
-            setIsBridgeInlineEditing(true);
-        }
+        if (!interaction.elementKey || !interaction.fieldId)
+            return false;
+        const interactionItem = interaction.item?.id &&
+            interaction.item.language &&
+            typeof interaction.item.version === "number"
+            ? {
+                id: interaction.item.id,
+                language: interaction.item.language,
+                version: interaction.item.version,
+                name: interaction.item.name,
+                displayName: interaction.item.displayName,
+                path: interaction.item.path,
+                database: interaction.item.database,
+            }
+            : undefined;
+        const started = await bridgeInlineEditSession.beginSession({
+            elementKey: interaction.elementKey,
+            fieldId: interaction.fieldId,
+            item: interactionItem,
+            modeAtStart: editContextRef.current?.mode ?? editContext.mode,
+        }, ({ isCurrent, sessionId }) => beginBridgeInlineEdit(interaction, { isCurrent, sessionId }));
         logFieldValueDiagnostic("bridge-frame", "tracked inline edit result", {
             started,
             nextActiveInlineEdit: activeBridgeInlineEditRef.current,
@@ -947,7 +948,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         return started;
     }, [
         beginBridgeInlineEdit,
-        clearActiveBridgeInlineEdit,
+        bridgeInlineEditSession,
         editContext.mode,
         editContextRef,
     ]);
@@ -2184,9 +2185,6 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                         handleBridgeSelection(event.payload.selection, iframe);
                         break;
                     case "fieldValueChanged":
-                        if (event.payload.elementKey && event.payload.fieldId) {
-                            setIsBridgeInlineEditing(true);
-                        }
                         logFieldValueDiagnostic("bridge-frame", "fieldValueChanged event", {
                             elementKey: event.payload.elementKey,
                             fieldId: event.payload.fieldId,
@@ -2207,9 +2205,14 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
                             value: summarizeFieldValue(event.payload.value),
                             activeInlineEdit: activeBridgeInlineEditRef.current,
                         });
-                        handleBridgeInlineEditEnded(event.payload);
-                        clearActiveBridgeInlineEdit();
-                        logFieldValueDiagnostic("bridge-frame", "active inline edit cleared after end", {
+                        const inlineEditEnd = bridgeInlineEditSession.end(event.payload);
+                        handleBridgeInlineEditEnded(event.payload, {
+                            recordSession: false,
+                            releaseFocus: inlineEditEnd.matched,
+                        });
+                        logFieldValueDiagnostic("bridge-frame", inlineEditEnd.matched
+                            ? "active inline edit cleared after end"
+                            : "non-current inline edit end persisted", {
                             fieldId: event.payload.fieldId,
                             reason: event.payload.reason,
                         });
@@ -2309,6 +2312,7 @@ function PageViewerFrameContent({ compareView, pageViewContext, editContext, cla
         clearBridgeTextCompletion,
         clearBridgePatchSignatures,
         clearActiveBridgeInlineEdit,
+        bridgeInlineEditSession,
         reconcileActiveBridgeInlineEdit,
         pageViewContext.editUrl,
         pageViewContext.previewUrl,