@the-portland-company/shell 0.76.8 → 0.76.10

package/dist/app-chrome.js

@@ -1,11 +1,11 @@
 "use client";
 import { broadcastLogout, watchLogout } from './chunk-LL6LSJAH.js';
-import { clearBetaBannerDismissal, standardPolitogyNav, standardNavIcons, isNavItemActive, NavAppShell, NavChromeProvider, TopBarWidgetSlot, FuelAction, SpecOverlayAction, NotificationsAction, SupportAction, useChromeMe, useThemePreference, useNavChromeDedupedFetch, useChromeOrgs, useNavChromeFetcher } from './chunk-RBJGWQJX.js';
-export { standardNavIcons } from './chunk-RBJGWQJX.js';
+import { clearBetaBannerDismissal, standardPolitogyNav, standardNavIcons, isNavItemActive, NavAppShell, NavChromeProvider, TopBarWidgetSlot, FuelAction, SpecOverlayAction, NotificationsAction, SupportAction, useChromeMe, useThemePreference, useNavChromeDedupedFetch, useChromeOrgs, useNavChromeFetcher } from './chunk-ZWGCO2EP.js';
+export { standardNavIcons } from './chunk-ZWGCO2EP.js';
 import { warnDeprecated } from './chunk-MY6G3LMN.js';
 import './chunk-BHRVZPZ7.js';
 import { NAV_DISPLAY_DEFAULT, resolveNavDisplay, writeNavDisplayLocal, writeNavDisplayCookie, isNavDisplayPreference, NAV_DISPLAY_STORAGE_KEY, readNavDisplayCookie } from './chunk-7YVJ7HQG.js';
-import { readOrgSelectorFromUrl, matchOrgSelector, isOrgId, switchActiveOrg, ACTIVE_ORG_QUERY_PARAM, ORG_ID_QUERY_PARAM, orgIdTail, writeActiveOrgCookie, resolveActiveOrg, readActiveOrgCookie } from './chunk-BWV52AT6.js';
+import { readOrgSelectorFromUrl, matchOrgSelector, isOrgId, switchActiveOrg, ACTIVE_ORG_QUERY_PARAM, ORG_ID_QUERY_PARAM, orgIdTail, syncOrgIdInUrl, writeActiveOrgCookie, resolveActiveOrg, readActiveOrgCookie } from './chunk-FBUF7LUE.js';
 import { createContext, useMemo, useRef, useEffect, useState, useCallback, useContext } from 'react';
 import { DevNotesMenu, createDevNotesClient, DevNotesProvider, DevNotesTaskListModal, DevNotesOverlay } from '@the-portland-company/devnotes';
 import { LuNotebookPen, LuContactRound, LuMegaphone, LuFilePenLine } from 'react-icons/lu';
@@ -911,9 +911,15 @@ function TokenChromeStateProvider({
     })),
     [tokenOrg.orgs, fetchedOrgs]
   );
-  const [urlSelector] = useState(
+  const [urlSelector, setUrlSelector] = useState(
     () => typeof window === "undefined" ? null : readOrgSelectorFromUrl(window.location.search)
   );
+  useEffect(() => {
+    if (typeof window === "undefined") return;
+    const onLocationChange = () => setUrlSelector(readOrgSelectorFromUrl(window.location.search));
+    window.addEventListener("popstate", onLocationChange);
+    return () => window.removeEventListener("popstate", onLocationChange);
+  }, []);
   const overrideOrg = useMemo(
     () => urlSelector ? matchOrgSelector(urlSelector, orgs)?.id ?? null : null,
     [urlSelector, orgs]
@@ -939,6 +945,7 @@ function TokenChromeStateProvider({
     void (async () => {
       try {
         const claims = await switchActiveOrg(id, { authBaseUrl: current.authBaseUrl });
+        setUrlSelector(null);
         try {
           const url = new URL(window.location.href);
           url.searchParams.delete(ACTIVE_ORG_QUERY_PARAM);
@@ -959,15 +966,9 @@ function TokenChromeStateProvider({
     writeNavDisplayCookie(m);
   }, []);
   useEffect(() => {
-    if (!isOrgId(orgId)) return;
     try {
-      const url = new URL(window.location.href);
-      const tail = orgIdTail(orgId);
-      if (url.searchParams.has(ACTIVE_ORG_QUERY_PARAM) || url.searchParams.get(ORG_ID_QUERY_PARAM) !== tail) {
-        url.searchParams.delete(ACTIVE_ORG_QUERY_PARAM);
-        url.searchParams.set(ORG_ID_QUERY_PARAM, tail);
-        window.history.replaceState(window.history.state, "", url.toString());
-      }
+      const next = syncOrgIdInUrl(window.location.href, orgId);
+      if (next) window.history.replaceState(window.history.state, "", next);
     } catch {
     }
   }, [orgId]);