@parhelia/core 0.1.12565 → 0.1.12572

package/dist/editor/client/EditorShell.js

@@ -396,10 +396,15 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
     // When switchWorkspace already pushed a URL entry, the follow-up URL sync
     // effect should only *replace* that entry (not push a second one).
     const switchWorkspacePushedRef = useRef(false);
-    // Ref to track the last known URL for the popstate handler
-    // This is updated both when the popstate handler runs AND when the URL sync effect pushes a new URL
-    // Without this, the popstate handler would have a stale lastUrl value after pushState calls
-    const lastUrlRef = useRef(typeof window !== "undefined" ? window.location.href : "");
+    // Ref to track the last known URL for the popstate handler.
+    // Uses pathname+search (not full href) so comparisons are consistent with the
+    // relative URLs produced by the URL sync effect and updateUrl.
+    const lastUrlRef = useRef(typeof window !== "undefined"
+        ? `${window.location.pathname}${window.location.search}`
+        : "");
+    // The very first URL sync after initial load should replaceState (not pushState)
+    // so the initial bare URL isn't left as a dead-end history entry.
+    const isFirstUrlSyncRef = useRef(true);
     const [inlineEditingFieldElement, setInlineEditingFieldElement] = useState();
     const [lockedField, setLockedField] = useState();
     const [itemLanguages, setItemLanguages] = useState([]);
@@ -828,6 +833,39 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         }
         return window.history.state;
     }, []);
+    useEffect(() => {
+        if (isInitialLoad) {
+            return;
+        }
+        const itemid = searchParams.get("itemid");
+        const language = searchParams.get("lang") ?? searchParams.get("language");
+        const versionParam = searchParams.get("version");
+        const version = versionParam ? parseInt(versionParam, 10) : 0;
+        const itemId = cleanId(itemid ?? undefined);
+        if (!itemId || !language) {
+            return;
+        }
+        const currentDescriptor = currentItemDescriptorRef.current;
+        const matchesCurrentDescriptor = currentDescriptor?.id === itemId &&
+            currentDescriptor?.language === language &&
+            (!version || currentDescriptor?.version === version);
+        if (matchesCurrentDescriptor) {
+            return;
+        }
+        isHandlingPopStateRef.current = true;
+        loadItemRef
+            .current({
+            id: itemId,
+            language,
+            version,
+        }, {
+            addToBrowseHistory: false,
+            skipViewChange: true,
+        })
+            .finally(() => {
+            isHandlingPopStateRef.current = false;
+        });
+    }, [isInitialLoad, searchParams]);
     const startTour = useCallback(() => {
         setIsTourActive(true);
         // Persist tour state to URL so it survives navigation/remounts
@@ -1097,7 +1135,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         };
         // Listen for browser navigation events (back/forward buttons)
         const handlePopState = (event) => {
-            const newUrl = window.location.href;
+            const newUrl = `${window.location.pathname}${window.location.search}`;
             if (newUrl !== lastUrlRef.current) {
                 lastUrlRef.current = newUrl;
                 // Mark that we're handling a popstate to prevent URL sync from pushing to history
@@ -1108,20 +1146,18 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 if (urlWorkspace && urlWorkspace !== workspaceIdRef.current) {
                     setWorkspaceId(urlWorkspace);
                 }
-                // Handle sidebar changes
+                // Handle sidebar changes — clear when absent so state matches the URL
                 const sidebarParam = urlParams.get("sidebar");
-                if (sidebarParam !== null) {
-                    const newSidebars = sidebarParam.split(",").filter(Boolean);
-                    setOpenSidebars(newSidebars);
-                }
+                const newSidebars = sidebarParam
+                    ? sidebarParam.split(",").filter(Boolean)
+                    : [];
+                setOpenSidebars(newSidebars);
                 // Handle wizard ID changes
                 const wizardId = urlParams.get("wizardid");
                 setCurrentWizardId(wizardId);
-                // Handle compare mode changes
-                const compareValue = urlParams.get("compare") === "true";
-                if (compareValue !== compareMode) {
-                    setCompareMode(compareValue);
-                }
+                // Handle compare mode changes — always set to avoid stale-closure mismatch
+                // (React skips re-render when the value is unchanged)
+                setCompareMode(urlParams.get("compare") === "true");
                 // Handle help panel changes
                 const helpParam = urlParams.get("help");
                 if (helpParam) {
@@ -1134,9 +1170,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 else {
                     handleSetShowHelpTerminal(false);
                 }
-                // Handle mode changes
+                // Handle mode changes — always set to avoid stale-closure mismatch
                 const urlMode = urlParams.get("mode");
-                if (urlMode && urlMode !== mode) {
+                if (urlMode) {
                     setMode(urlMode);
                 }
                 // Handle fullscreen changes (shell-level state)
@@ -2003,8 +2039,11 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             return;
         }
         if (newUrl !== oldUrl) {
-            if (switchWorkspacePushedRef.current || isRestoringLastSyncedUrl) {
+            if (isFirstUrlSyncRef.current ||
+                switchWorkspacePushedRef.current ||
+                isRestoringLastSyncedUrl) {
                 window.history.replaceState(getCurrentHistoryState(), "", newUrl);
+                isFirstUrlSyncRef.current = false;
                 switchWorkspacePushedRef.current = false;
             }
             else {
@@ -2012,11 +2051,22 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             }
             lastUrlRef.current = newUrl;
         }
-        else if (switchWorkspacePushedRef.current) {
-            // A workspace change may already have pushed the exact target URL. If we leave
-            // this flag set, the next unrelated item navigation will incorrectly replace
-            // history instead of pushing a new entry, which breaks browser back/forward.
-            switchWorkspacePushedRef.current = false;
+        else {
+            // Even when the first sync is a no-op (URL already matches state), consume
+            // the first-sync flag. Otherwise the *next* real change (e.g. user selecting
+            // a different item) would hit the replaceState branch and overwrite the
+            // landing history entry — eating the "back" target and making browser back
+            // skip past the initial page.
+            if (isFirstUrlSyncRef.current) {
+                isFirstUrlSyncRef.current = false;
+                lastUrlRef.current = newUrl;
+            }
+            if (switchWorkspacePushedRef.current) {
+                // A workspace change may already have pushed the exact target URL. If we leave
+                // this flag set, the next unrelated item navigation will incorrectly replace
+                // history instead of pushing a new entry, which breaks browser back/forward.
+                switchWorkspacePushedRef.current = false;
+            }
         }
     }, [
         currentItemDescriptor,
@@ -2642,6 +2692,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             : browserPathname;
         if (typeof window !== "undefined") {
             window.history.pushState(getCurrentHistoryState(), "", newUrl);
+            lastUrlRef.current = newUrl;
         }
         else {
             router.push(newUrl, { scroll: false });