@fluid-app/portal-sdk 0.1.245 → 0.1.246

package/dist/index.cjs

@@ -1867,6 +1867,68 @@ function SdkCompanySwitcher() {
 	});
 }
 //#endregion
+//#region ../core/src/navigation/slug-utils.ts
+/**
+* Extract all slugs from a navigation tree, sorted by segment count descending.
+* Longest slugs first enables greedy prefix matching (e.g. "share/playlists"
+* is checked before "share").
+*/
+function collectNavSlugs(items) {
+	const slugs = [];
+	for (const item of items) {
+		if (item.slug) slugs.push(normalizeSlug(item.slug));
+		for (const child of item.children ?? []) if (child.slug) slugs.push(normalizeSlug(child.slug));
+	}
+	return [...slugs].sort((a, b) => b.split("/").length - a.split("/").length);
+}
+/**
+* Find the longest registered nav slug that is a prefix of `fullSlug`.
+* Uses segment-boundary checking to prevent "shop" from matching "shopping".
+*/
+function matchSlugPrefix(fullSlug, navSlugs) {
+	const normalized = normalizeSlug(fullSlug);
+	if (!normalized) return void 0;
+	for (const navSlug of navSlugs) {
+		if (normalized === navSlug) return {
+			matchedSlug: navSlug,
+			rest: ""
+		};
+		if (normalized.startsWith(navSlug + "/")) return {
+			matchedSlug: navSlug,
+			rest: normalized.slice(navSlug.length + 1)
+		};
+	}
+}
+/**
+* Extract the slug portion from a full pathname by stripping the basePath prefix.
+* Returns an empty string when the pathname equals the basePath exactly.
+*
+* Examples:
+*   extractSlugFromPathname("/contacts/123", "/")        → "contacts/123"
+*   extractSlugFromPathname("/portal/contacts", "/portal") → "contacts"
+*   extractSlugFromPathname("/portal", "/portal")          → ""
+*   extractSlugFromPathname("/", "/")                      → ""
+*/
+function extractSlugFromPathname(pathname, basePath) {
+	if (basePath === "/") return pathname.replace(/^\//, "");
+	if (pathname.startsWith(basePath)) return pathname.slice(basePath.length).replace(/^\//, "");
+	return pathname.replace(/^\//, "");
+}
+/**
+* Generate a URL-safe slug from a human-readable name. Mirrors the admin
+* builder's `generateSlugFromName` so a navigation item authored as
+* `slugifyName(screen.name)` can be matched back to the screen at runtime
+* even when the screen's own `slug` is opaque (e.g. `screen-{uuid}`).
+*/
+function slugifyName(name) {
+	return name.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "");
+}
+function isSlugInSection(item, currentSlug, navSlugs) {
+	const baseSlug = matchSlugPrefix(currentSlug, navSlugs)?.matchedSlug ?? normalizeSlug(currentSlug);
+	if (normalizeSlug(item.slug) === baseSlug) return true;
+	return item.children?.some((child) => normalizeSlug(child.slug) === baseSlug) ?? false;
+}
+//#endregion
 //#region src/shell/go-back-or-home.ts
 /**
 * Navigate one step back in the browser history if anything is on the stack;
@@ -2082,7 +2144,14 @@ function PageRouter({ currentSlug, currentNavItem, customPages, screens, baseSlu
 	}, [screens]);
 	const screenBySlug = (0, react.useMemo)(() => {
 		if (!screens || screens.length === 0) return void 0;
-		return new Map(screens.filter((s) => s.slug).map((s) => [s.slug, s]));
+		const map = /* @__PURE__ */ new Map();
+		for (const s of screens) if (s.slug) map.set(s.slug, s);
+		for (const s of screens) {
+			if (!s.name) continue;
+			const nameSlug = slugifyName(s.name);
+			if (nameSlug && !map.has(nameSlug)) map.set(nameSlug, s);
+		}
+		return map;
 	}, [screens]);
 	const builderScreen = (0, react.useMemo)(() => {
 		if (currentNavItem?.screen_id && screenById) {
@@ -2124,59 +2193,6 @@ function PageRouter({ currentSlug, currentNavItem, customPages, screens, baseSlu
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ScreenNotFound, { name: currentNavItem?.label ?? currentSlug });
 }
 //#endregion
-//#region ../core/src/navigation/slug-utils.ts
-/**
-* Extract all slugs from a navigation tree, sorted by segment count descending.
-* Longest slugs first enables greedy prefix matching (e.g. "share/playlists"
-* is checked before "share").
-*/
-function collectNavSlugs(items) {
-	const slugs = [];
-	for (const item of items) {
-		if (item.slug) slugs.push(normalizeSlug(item.slug));
-		for (const child of item.children ?? []) if (child.slug) slugs.push(normalizeSlug(child.slug));
-	}
-	return [...slugs].sort((a, b) => b.split("/").length - a.split("/").length);
-}
-/**
-* Find the longest registered nav slug that is a prefix of `fullSlug`.
-* Uses segment-boundary checking to prevent "shop" from matching "shopping".
-*/
-function matchSlugPrefix(fullSlug, navSlugs) {
-	const normalized = normalizeSlug(fullSlug);
-	if (!normalized) return void 0;
-	for (const navSlug of navSlugs) {
-		if (normalized === navSlug) return {
-			matchedSlug: navSlug,
-			rest: ""
-		};
-		if (normalized.startsWith(navSlug + "/")) return {
-			matchedSlug: navSlug,
-			rest: normalized.slice(navSlug.length + 1)
-		};
-	}
-}
-/**
-* Extract the slug portion from a full pathname by stripping the basePath prefix.
-* Returns an empty string when the pathname equals the basePath exactly.
-*
-* Examples:
-*   extractSlugFromPathname("/contacts/123", "/")        → "contacts/123"
-*   extractSlugFromPathname("/portal/contacts", "/portal") → "contacts"
-*   extractSlugFromPathname("/portal", "/portal")          → ""
-*   extractSlugFromPathname("/", "/")                      → ""
-*/
-function extractSlugFromPathname(pathname, basePath) {
-	if (basePath === "/") return pathname.replace(/^\//, "");
-	if (pathname.startsWith(basePath)) return pathname.slice(basePath.length).replace(/^\//, "");
-	return pathname.replace(/^\//, "");
-}
-function isSlugInSection(item, currentSlug, navSlugs) {
-	const baseSlug = matchSlugPrefix(currentSlug, navSlugs)?.matchedSlug ?? normalizeSlug(currentSlug);
-	if (normalizeSlug(item.slug) === baseSlug) return true;
-	return item.children?.some((child) => normalizeSlug(child.slug) === baseSlug) ?? false;
-}
-//#endregion
 //#region src/shell/AppShellErrorBoundary.tsx
 var AppShellErrorBoundary = class extends react.Component {
 	state = { error: null };
@@ -2430,7 +2446,7 @@ function AppShell({ appData: appDataProp, navigation: navigationProp, customPage
 	const navSlugs = (0, react.useMemo)(() => collectNavSlugs(filteredNavItems), [filteredNavItems]);
 	const allNavSlugs = (0, react.useMemo)(() => {
 		const mobileSlugs = collectNavSlugs(filteredMobileNavItems);
-		return Array.from(new Set([...navSlugs, ...mobileSlugs]));
+		return Array.from(new Set([...navSlugs, ...mobileSlugs])).sort((a, b) => b.split("/").length - a.split("/").length);
 	}, [navSlugs, filteredMobileNavItems]);
 	const [themeMode, setThemeMode] = (0, react.useState)(getInitialThemeMode);
 	const handleThemeModeChange = (0, react.useCallback)((mode) => {
@@ -2536,11 +2552,11 @@ function AppShell({ appData: appDataProp, navigation: navigationProp, customPage
 		if (typeof orderToken === "string" && orderToken) handleNavigate(`orders/${orderToken}`);
 	}, [handleNavigate]);
 	const resolvedSidebarFooter = (0, react.useMemo)(() => sidebarFooter !== void 0 ? sidebarFooter : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SdkLogoutButton, { onLogout: logout }), [sidebarFooter, logout]);
-	const slugMatch = (0, react.useMemo)(() => matchSlugPrefix(activeSlug, navSlugs), [activeSlug, navSlugs]);
+	const slugMatch = (0, react.useMemo)(() => matchSlugPrefix(activeSlug, allNavSlugs), [activeSlug, allNavSlugs]);
 	const baseSlug = slugMatch?.matchedSlug ?? normalizeSlug(activeSlug);
 	const restParams = slugMatch?.rest ?? "";
 	const mobileSecondLevelTabs = findCurrentSection(filteredMobileNavItems, baseSlug)?.children ?? [];
-	const currentNavItem = findNavItem(filteredNavItems, baseSlug);
+	const currentNavItem = findNavItem(filteredNavItems, baseSlug) ?? findNavItem(filteredMobileNavItems, baseSlug);
 	const screenTitle = currentNavItem?.label || screens?.find((s) => s.id === currentNavItem?.screen_id)?.name || void 0;
 	const content = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AppShellErrorBoundary, { children: typeof children === "function" ? children({
 		currentSlug: activeSlug,