@parhelia/core 0.1.12937 → 0.1.12938

package/dist/editor/client/EditorShell.js

@@ -43,6 +43,7 @@ import { logFieldValueDiagnostic, summarizeFieldDescriptor, } from "../fieldValu
 import { Spinner } from "../ui/Spinner";
 import { createSettleRegistry } from "../ui/animationSettle";
 import { cleanId } from "../utils/id-helper";
+import { preserveSelectionBoundaryWhitespace, padInsertedTextWhitespace, } from "../utils/textInsertionWhitespace";
 import { useDebouncedCallback } from "use-debounce";
 import { useKeyboardNavigation } from "../utils/keyboardNavigation";
 import { Toaster } from "../../components/ui/sonner";
@@ -2876,6 +2877,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                         slotId: next[idx].slotId,
                         itemDescriptor: itemToLoad,
                         refreshToken: Date.now(),
+                        tag: next[idx].tag,
                     };
                     return next;
                 });
@@ -2921,19 +2923,28 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                     next[existingIdx] = {
                         slotId: next[existingIdx].slotId,
                         itemDescriptor: itemToLoad,
+                        tag: next[existingIdx].tag ?? options?.newSlotTag,
                     };
                     return next;
                 }
                 return [
                     ...prev,
-                    { slotId: targetSlotId, itemDescriptor: itemToLoad },
+                    {
+                        slotId: targetSlotId,
+                        itemDescriptor: itemToLoad,
+                        tag: options?.newSlotTag,
+                    },
                 ];
             }
             const idx = prev.findIndex((s) => s.slotId === targetSlotId);
             if (idx === -1)
                 return prev;
             const next = [...prev];
-            next[idx] = { slotId: next[idx].slotId, itemDescriptor: itemToLoad };
+            next[idx] = {
+                slotId: next[idx].slotId,
+                itemDescriptor: itemToLoad,
+                tag: next[idx].tag,
+            };
             return next;
         });
         // Decide whether this load should update the global "current item" state.
@@ -3273,9 +3284,27 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         onOperationExecuted,
     };
     // moved to useMediaSelector
+    // Workbox/validation scope spans every open slot (each slot's page tree plus
+    // its item), so opening a validation result in a second slot keeps the page's
+    // list intact regardless of which slot is active. The slot contexts are
+    // mutable refs; re-reads happen because notifyPageModelReady bumps the
+    // pageModelReadyToken state whenever a slot's page model finishes building.
+    const registeredSlotScopes = editorSlots.flatMap((slot) => {
+        const slotContext = slotContexts.get(slot.slotId);
+        if (!slotContext)
+            return [];
+        return [
+            {
+                page: slotContext.primaryPageViewContext.page,
+                itemDescriptor: slotContext.itemDescriptor,
+            },
+        ];
+    });
+    const workboxScopeSlots = registeredSlotScopes.length
+        ? registeredSlotScopes
+        : [{ page, itemDescriptor: currentItemDescriptor }];
     const { workboxItems, isWorkboxLoading, refreshWorkbox } = useWorkbox({
-        page,
-        currentItemDescriptor,
+        scopeSlots: workboxScopeSlots,
         validate,
     });
     // Refs for operations-context callbacks (needed because operationsContext is created later)
@@ -3906,7 +3935,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         try {
             // If we have selected text and a replaceText callback, use it
             if (rangeToReplace?.text && rangeToReplace.replaceText) {
-                rangeToReplace.replaceText(newText);
+                rangeToReplace.replaceText(preserveSelectionBoundaryWhitespace(rangeToReplace.text, newText));
                 setSelectedRange(undefined);
                 lastTextSelectionRangeRef.current = undefined;
                 return;
@@ -3914,7 +3943,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             // If no selection but we have a replaceText callback, try to use it for insertion
             // (some editors might support insertion via the same callback)
             if (!rangeToReplace?.text && rangeToReplace?.replaceText) {
-                rangeToReplace.replaceText(newText);
+                rangeToReplace.replaceText(padInsertedTextWhitespace(newText, rangeToReplace.contextBefore?.slice(-1) ?? "", rangeToReplace.contextAfter?.charAt(0) ?? ""));
                 setSelectedRange(undefined);
                 lastTextSelectionRangeRef.current = undefined;
                 return;
@@ -3953,7 +3982,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 }
                 newValue =
                     currentValue.slice(0, actualPosition) +
-                        newText +
+                        preserveSelectionBoundaryWhitespace(originalSelectedText, newText) +
                         currentValue.slice(actualPosition + originalSelectedText.length);
             }
             else {
@@ -3961,7 +3990,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 const insertPosition = rangeToReplace?.startOffset ?? currentValue.length;
                 newValue =
                     currentValue.slice(0, insertPosition) +
-                        newText +
+                        padInsertedTextWhitespace(newText, insertPosition > 0 ? currentValue[insertPosition - 1] : "", currentValue[insertPosition] ?? "") +
                         currentValue.slice(insertPosition);
             }
             // Update the field
@@ -4031,7 +4060,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                     "";
             insertPosition = insertPosition ?? currentValue.length;
             const newValue = currentValue.slice(0, insertPosition) +
-                newText +
+                padInsertedTextWhitespace(newText, insertPosition > 0 ? currentValue[insertPosition - 1] : "", currentValue[insertPosition] ?? "") +
                 currentValue.slice(insertPosition);
             // Update the field
             await operations.editField({
@@ -5093,6 +5122,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         commentsLoaded,
         availableCommentTags,
         loadComments,
+        loadSuggestedEdits,
         setComments,
         showComments,
         setShowComments,
@@ -5374,6 +5404,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         commentsLoaded,
         availableCommentTags,
         loadComments,
+        loadSuggestedEdits,
         showComments,
         showResolvedComments,
         reviews,