@flipdish/ui-library 0.20.0 → 0.20.1

package/dist/components/__internal__/navigation/nav.types.d.ts

@@ -0,0 +1,56 @@
+/**
+ * INTERNAL — shared base types for the two navigation organisms. Not a public
+ * subpath (no `index.tsx`, so the `components/*` entry globs and exports map never
+ * see this folder); each organism re-exports its public type names from here, so
+ * `NavItemType` / `NavSubItemType` / `NavItemDividerType` keep a single definition
+ * instead of the triplicated copies that previously drifted (audit finding H1).
+ *
+ * SidebarNavigation extends the base with its `toggle` capability; HeaderNavigation
+ * uses the base as-is. Genuinely organism-specific behaviour stays in the organisms.
+ */
+import type { FC, ReactNode } from 'react';
+export type NavSubItemType = {
+    /** Label text for the sub-item. */
+    label: string;
+    /** URL to navigate to when the sub-item is clicked. */
+    href: string;
+    /** Icon component to display. */
+    icon?: FC<{
+        className?: string;
+    }>;
+    /** Badge to display. */
+    badge?: ReactNode;
+    /** Stable id used to derive the sub-item's default `data-testid`. Falls back to a slug of `label`. */
+    id?: string;
+    /** Overrides the derived `data-testid`. */
+    'data-testid'?: string;
+};
+/** Common shape of a top-level nav item; organisms extend it with their own capabilities. */
+export type NavItemTypeBase = {
+    /** Label text for the nav item. */
+    label: string;
+    /** URL to navigate to when the nav item is clicked. */
+    href?: string;
+    /** Icon component to display. */
+    icon?: FC<{
+        className?: string;
+    }>;
+    /** Badge to display. */
+    badge?: ReactNode;
+    /** List of sub-items to display. */
+    items?: NavSubItemType[];
+    /** Whether this nav item is a divider. */
+    divider?: boolean;
+    /** Stable id used to derive the item's default `data-testid`. Falls back to a slug of `label`. */
+    id?: string;
+    /** Overrides the derived `data-testid`. */
+    'data-testid'?: string;
+};
+/** Divider variant of an organism's item type — label optional, `divider` required. */
+export type NavItemDividerOf<T extends NavItemTypeBase> = Omit<T, 'icon' | 'label' | 'divider'> & {
+    /** Label text for the divider. */
+    label?: string;
+    /** Whether this nav item is a divider. */
+    divider: true;
+};
+//# sourceMappingURL=nav.types.d.ts.map

package/dist/components/__internal__/navigation/nav.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nav.types.d.ts","sourceRoot":"","sources":["../../../../src/components/__internal__/navigation/nav.types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG;IAC3B,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,IAAI,CAAC,EAAE,EAAE,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClC,wBAAwB;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,sGAAsG;IACtG,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,6FAA6F;AAC7F,MAAM,MAAM,eAAe,GAAG;IAC5B,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iCAAiC;IACjC,IAAI,CAAC,EAAE,EAAE,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClC,wBAAwB;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,oCAAoC;IACpC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kGAAkG;IAClG,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,uFAAuF;AACvF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,eAAe,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAAG;IAChG,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,OAAO,EAAE,IAAI,CAAC;CACf,CAAC"}

package/dist/components/__internal__/navigation/nav.utils.cjs

@@ -0,0 +1,28 @@
+'use strict';
+
+var testIdUtils = require('@flipdish/ui-library/utilities/testIdUtils');
+
+/**
+ * INTERNAL — shared navigation utils: the nav-list logic where the Sidebar/Header fork historically drifted
+ * (audit finding H1): active-item resolution and testid derivation each shipped a
+ * one-sided bug fix. One implementation, used by both organisms' nav-lists; the JSX
+ * stays per-organism because the underlying NavItemBase designs genuinely differ.
+ */
+/**
+ * The item (or sub-item parent) matching `activeUrl`. Only matches a DEFINED
+ * `activeUrl` — parents may be hrefless, and `undefined === undefined` would
+ * otherwise "activate" the first of them by default.
+ */
+const findActiveItem = (items, activeUrl) => activeUrl === undefined ? undefined : items.find((item) => item.href === activeUrl || item.items?.some((subItem) => subItem.href === activeUrl));
+/** Whether `item` is the current page — guarded so hrefless items never match an omitted `activeUrl`. */
+const isCurrentItem = (item, activeUrl) => activeUrl !== undefined && activeUrl === item.href;
+/** Derived testid for a top-level item: explicit override wins; otherwise `<prefix>--nav-item-<id|label-slug>`. */
+const navItemTestId = (testIdPrefix, item) => item['data-testid'] ?? (testIdPrefix ? testIdUtils.joinTestId(testIdPrefix, `nav-item-${item.id ?? testIdUtils.slugifyTestId(item.label ?? '')}`) : undefined);
+/** Derived testid for a sub-item, rooted at its parent's resolved testid. */
+const navSubItemTestId = (parentTestId, subItem) => subItem['data-testid'] ?? (parentTestId ? testIdUtils.joinTestId(parentTestId, `sub-item-${subItem.id ?? testIdUtils.slugifyTestId(subItem.label)}`) : undefined);
+
+exports.findActiveItem = findActiveItem;
+exports.isCurrentItem = isCurrentItem;
+exports.navItemTestId = navItemTestId;
+exports.navSubItemTestId = navSubItemTestId;
+//# sourceMappingURL=nav.utils.cjs.map

package/dist/components/__internal__/navigation/nav.utils.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"nav.utils.cjs","sources":["../../../../src/components/__internal__/navigation/nav.utils.ts"],"sourcesContent":[null],"names":["joinTestId","slugifyTestId"],"mappings":";;;;AAAA;;;;;AAKG;AAaH;;;;AAIG;AACI,MAAM,cAAc,GAAG,CAAwB,KAAmB,EAAE,SAA6B,KACtG,SAAS,KAAK,SAAS,GAAG,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;AAEjJ;MACa,aAAa,GAAG,CAAC,IAA+B,EAAE,SAA6B,KAC1F,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC;AAEhD;MACa,aAAa,GAAG,CAAC,YAAgC,EAAE,IAAuD,KACrH,IAAI,CAAC,aAAa,CAAC,KAAK,YAAY,GAAGA,sBAAU,CAAC,YAAY,EAAE,YAAY,IAAI,CAAC,EAAE,IAAIC,yBAAa,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA,CAAE,CAAC,GAAG,SAAS;AAEvI;AACO,MAAM,gBAAgB,GAAG,CAAC,YAAgC,EAAE,OAAuB,KACxF,OAAO,CAAC,aAAa,CAAC,KAAK,YAAY,GAAGD,sBAAU,CAAC,YAAY,EAAE,CAAA,SAAA,EAAY,OAAO,CAAC,EAAE,IAAIC,yBAAa,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,SAAS;;;;;;;"}

package/dist/components/__internal__/navigation/nav.utils.d.ts

@@ -0,0 +1,23 @@
+import type { NavSubItemType } from './nav.types';
+/** Structural minimum the helpers need — covers both item and divider variants. */
+type NavItemLike = {
+    label?: string;
+    href?: string;
+    id?: string;
+    'data-testid'?: string;
+    items?: NavSubItemType[];
+};
+/**
+ * The item (or sub-item parent) matching `activeUrl`. Only matches a DEFINED
+ * `activeUrl` — parents may be hrefless, and `undefined === undefined` would
+ * otherwise "activate" the first of them by default.
+ */
+export declare const findActiveItem: <T extends NavItemLike>(items: readonly T[], activeUrl: string | undefined) => T | undefined;
+/** Whether `item` is the current page — guarded so hrefless items never match an omitted `activeUrl`. */
+export declare const isCurrentItem: (item: Pick<NavItemLike, "href">, activeUrl: string | undefined) => boolean;
+/** Derived testid for a top-level item: explicit override wins; otherwise `<prefix>--nav-item-<id|label-slug>`. */
+export declare const navItemTestId: (testIdPrefix: string | undefined, item: Pick<NavItemLike, "label" | "id" | "data-testid">) => string | undefined;
+/** Derived testid for a sub-item, rooted at its parent's resolved testid. */
+export declare const navSubItemTestId: (parentTestId: string | undefined, subItem: NavSubItemType) => string | undefined;
+export {};
+//# sourceMappingURL=nav.utils.d.ts.map

package/dist/components/__internal__/navigation/nav.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nav.utils.d.ts","sourceRoot":"","sources":["../../../../src/components/__internal__/navigation/nav.utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,mFAAmF;AACnF,KAAK,WAAW,GAAG;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,WAAW,EAAE,OAAO,SAAS,CAAC,EAAE,EAAE,WAAW,MAAM,GAAG,SAAS,KAAG,CAAC,GAAG,SACmC,CAAC;AAEnJ,yGAAyG;AACzG,eAAO,MAAM,aAAa,GAAI,MAAM,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,MAAM,GAAG,SAAS,KAAG,OAC3C,CAAC;AAErD,mHAAmH;AACnH,eAAO,MAAM,aAAa,GAAI,cAAc,MAAM,GAAG,SAAS,EAAE,MAAM,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI,GAAG,aAAa,CAAC,KAAG,MAAM,GAAG,SACK,CAAC;AAEzI,6EAA6E;AAC7E,eAAO,MAAM,gBAAgB,GAAI,cAAc,MAAM,GAAG,SAAS,EAAE,SAAS,cAAc,KAAG,MAAM,GAAG,SACqC,CAAC"}

package/dist/components/__internal__/navigation/nav.utils.js

@@ -0,0 +1,23 @@
+import { joinTestId, slugifyTestId } from '@flipdish/ui-library/utilities/testIdUtils';
+
+/**
+ * INTERNAL — shared navigation utils: the nav-list logic where the Sidebar/Header fork historically drifted
+ * (audit finding H1): active-item resolution and testid derivation each shipped a
+ * one-sided bug fix. One implementation, used by both organisms' nav-lists; the JSX
+ * stays per-organism because the underlying NavItemBase designs genuinely differ.
+ */
+/**
+ * The item (or sub-item parent) matching `activeUrl`. Only matches a DEFINED
+ * `activeUrl` — parents may be hrefless, and `undefined === undefined` would
+ * otherwise "activate" the first of them by default.
+ */
+const findActiveItem = (items, activeUrl) => activeUrl === undefined ? undefined : items.find((item) => item.href === activeUrl || item.items?.some((subItem) => subItem.href === activeUrl));
+/** Whether `item` is the current page — guarded so hrefless items never match an omitted `activeUrl`. */
+const isCurrentItem = (item, activeUrl) => activeUrl !== undefined && activeUrl === item.href;
+/** Derived testid for a top-level item: explicit override wins; otherwise `<prefix>--nav-item-<id|label-slug>`. */
+const navItemTestId = (testIdPrefix, item) => item['data-testid'] ?? (testIdPrefix ? joinTestId(testIdPrefix, `nav-item-${item.id ?? slugifyTestId(item.label ?? '')}`) : undefined);
+/** Derived testid for a sub-item, rooted at its parent's resolved testid. */
+const navSubItemTestId = (parentTestId, subItem) => subItem['data-testid'] ?? (parentTestId ? joinTestId(parentTestId, `sub-item-${subItem.id ?? slugifyTestId(subItem.label)}`) : undefined);
+
+export { findActiveItem, isCurrentItem, navItemTestId, navSubItemTestId };
+//# sourceMappingURL=nav.utils.js.map

package/dist/components/__internal__/navigation/nav.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nav.utils.js","sources":["../../../../src/components/__internal__/navigation/nav.utils.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAA;;;;;AAKG;AAaH;;;;AAIG;AACI,MAAM,cAAc,GAAG,CAAwB,KAAmB,EAAE,SAA6B,KACtG,SAAS,KAAK,SAAS,GAAG,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;AAEjJ;MACa,aAAa,GAAG,CAAC,IAA+B,EAAE,SAA6B,KAC1F,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC;AAEhD;MACa,aAAa,GAAG,CAAC,YAAgC,EAAE,IAAuD,KACrH,IAAI,CAAC,aAAa,CAAC,KAAK,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,YAAY,IAAI,CAAC,EAAE,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA,CAAE,CAAC,GAAG,SAAS;AAEvI;AACO,MAAM,gBAAgB,GAAG,CAAC,YAAgC,EAAE,OAAuB,KACxF,OAAO,CAAC,aAAa,CAAC,KAAK,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,CAAA,SAAA,EAAY,OAAO,CAAC,EAAE,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,SAAS;;;;"}

package/dist/components/organisms/HeaderNavigation/components/nav-list.cjs

@@ -2,18 +2,13 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var cx = require('@flipdish/ui-library/utilities/cx');
-var testIdUtils = require('@flipdish/ui-library/utilities/testIdUtils');
+var nav_utils = require('../../../__internal__/navigation/nav.utils.cjs');
 var navItem = require('./nav-item.cjs');
 
 const NavList = ({ activeUrl, items, className, testIdPrefix }) => {
-    // Only match a defined `activeUrl` — parents may be hrefless, and `undefined === undefined`
-    // would open the first of them by default. (Mirrors SidebarNavigation's nav-list guard.)
-    const activeItem = activeUrl === undefined ? undefined : items.find((item) => item.href === activeUrl || item.items?.some((subItem) => subItem.href === activeUrl));
-    const itemTestId = (item) => item['data-testid'] ?? (testIdPrefix ? testIdUtils.joinTestId(testIdPrefix, `nav-item-${item.id ?? testIdUtils.slugifyTestId(item.label ?? '')}`) : undefined);
-    const subItemTestId = (parent, sub) => {
-        const parentId = itemTestId(parent);
-        return sub['data-testid'] ?? (parentId ? testIdUtils.joinTestId(parentId, `sub-item-${sub.id ?? testIdUtils.slugifyTestId(sub.label)}`) : undefined);
-    };
+    const activeItem = nav_utils.findActiveItem(items, activeUrl);
+    const itemTestId = (item) => nav_utils.navItemTestId(testIdPrefix, item);
+    const subItemTestId = (parent, sub) => nav_utils.navSubItemTestId(itemTestId(parent), sub);
     return (jsxRuntime.jsx("ul", { className: cx.cx('flex flex-col px-4 pt-5', className), children: items.map((item, index) => {
             if (item.divider) {
                 return (
@@ -21,9 +16,10 @@ const NavList = ({ activeUrl, items, className, testIdPrefix }) => {
                 jsxRuntime.jsx("li", { className: "w-full px-0.5 py-2", children: jsxRuntime.jsx("hr", { className: "h-px w-full border-none bg-border-secondary" }) }, index));
             }
             if (item.items?.length) {
-                return (jsxRuntime.jsxs("details", { open: activeItem?.href === item.href, className: "appearance-none py-0.25", children: [jsxRuntime.jsx(navItem.NavItemBase, { href: item.href, badge: item.badge, icon: item.icon, type: "collapsible", "data-testid": itemTestId(item), children: item.label }), jsxRuntime.jsx("dd", { children: jsxRuntime.jsx("ul", { className: "pb-1", children: item.items.map((childItem) => (jsxRuntime.jsx("li", { className: "py-0.25", children: jsxRuntime.jsx(navItem.NavItemBase, { href: childItem.href, badge: childItem.badge, type: "collapsible-child", current: activeUrl === childItem.href, "data-testid": subItemTestId(item, childItem), children: childItem.label }) }, childItem.label))) }) })] }, item.label));
+                // Reference compare, not href: hrefless parents all share `undefined` and would otherwise force-open together.
+                return (jsxRuntime.jsxs("details", { open: activeItem === item, className: "appearance-none py-0.25", children: [jsxRuntime.jsx(navItem.NavItemBase, { href: item.href, badge: item.badge, icon: item.icon, type: "collapsible", "data-testid": itemTestId(item), children: item.label }), jsxRuntime.jsx("dd", { children: jsxRuntime.jsx("ul", { className: "pb-1", children: item.items.map((childItem) => (jsxRuntime.jsx("li", { className: "py-0.25", children: jsxRuntime.jsx(navItem.NavItemBase, { href: childItem.href, badge: childItem.badge, type: "collapsible-child", current: activeUrl === childItem.href, "data-testid": subItemTestId(item, childItem), children: childItem.label }) }, childItem.label))) }) })] }, item.label));
             }
-            return (jsxRuntime.jsx("li", { className: "py-px", children: jsxRuntime.jsx(navItem.NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: activeUrl !== undefined && activeUrl === item.href, "data-testid": itemTestId(item), children: item.label }) }, item.label));
+            return (jsxRuntime.jsx("li", { className: "py-px", children: jsxRuntime.jsx(navItem.NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: nav_utils.isCurrentItem(item, activeUrl), "data-testid": itemTestId(item), children: item.label }) }, item.label));
         }) }));
 };
 

package/dist/components/organisms/HeaderNavigation/components/nav-list.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"nav-list.cjs","sources":["../../../../../src/components/organisms/HeaderNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["joinTestId","slugifyTestId","_jsx","cx","_jsxs","NavItemBase"],"mappings":"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"}
+{"version":3,"file":"nav-list.cjs","sources":["../../../../../src/components/organisms/HeaderNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["findActiveItem","navItemTestId","navSubItemTestId","_jsx","cx","_jsxs","NavItemBase","isCurrentItem"],"mappings":";;;;;;;AAkBO,MAAM,OAAO,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAgB,KAAI;IACrF,MAAM,UAAU,GAAGA,wBAAc,CAAC,KAAK,EAAE,SAAS,CAAC;AACnD,IAAA,MAAM,UAAU,GAAG,CAAC,IAAsC,KAAKC,uBAAa,CAAC,YAAY,EAAE,IAAI,CAAC;AAChG,IAAA,MAAM,aAAa,GAAG,CAAC,MAAwC,EAAE,GAAmB,KAAKC,0BAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAElI,QACEC,uBAAI,SAAS,EAAEC,KAAE,CAAC,yBAAyB,EAAE,SAAS,CAAC,YACpD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,KAAI;AACzB,YAAA,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB;;AAEE,gBAAAD,cAAA,CAAA,IAAA,EAAA,EAAgB,SAAS,EAAC,oBAAoB,EAAA,QAAA,EAC5CA,cAAA,CAAA,IAAA,EAAA,EAAI,SAAS,EAAC,6CAA6C,EAAA,CAAG,EAAA,EADvD,KAAK,CAET;YAET;AAEA,YAAA,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE;;gBAEtB,QACEE,eAAA,CAAA,SAAA,EAAA,EAA0B,IAAI,EAAE,UAAU,KAAK,IAAI,EAAE,SAAS,EAAC,yBAAyB,EAAA,QAAA,EAAA,CACtFF,cAAA,CAACG,mBAAW,EAAA,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAC,aAAa,EAAA,aAAA,EAAc,UAAU,CAAC,IAAI,CAAC,EAAA,QAAA,EAC/G,IAAI,CAAC,KAAK,EAAA,CACC,EAEdH,cAAA,CAAA,IAAA,EAAA,EAAA,QAAA,EACEA,cAAA,CAAA,IAAA,EAAA,EAAI,SAAS,EAAC,MAAM,EAAA,QAAA,EACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,MACxBA,cAAA,CAAA,IAAA,EAAA,EAA0B,SAAS,EAAC,SAAS,EAAA,QAAA,EAC3CA,cAAA,CAACG,mBAAW,EAAA,EACV,IAAI,EAAE,SAAS,CAAC,IAAI,EACpB,KAAK,EAAE,SAAS,CAAC,KAAK,EACtB,IAAI,EAAC,mBAAmB,EACxB,OAAO,EAAE,SAAS,KAAK,SAAS,CAAC,IAAI,EAAA,aAAA,EACxB,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA,QAAA,EAE1C,SAAS,CAAC,KAAK,EAAA,CACJ,EAAA,EATP,SAAS,CAAC,KAAK,CAUnB,CACN,CAAC,EAAA,CACC,EAAA,CACF,CAAA,EAAA,EArBO,IAAI,CAAC,KAAK,CAsBd;YAEd;YAEA,QACEH,cAAA,CAAA,IAAA,EAAA,EAAqB,SAAS,EAAC,OAAO,YACpCA,cAAA,CAACG,mBAAW,EAAA,EACV,IAAI,EAAC,MAAM,EACX,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,OAAO,EAAEC,uBAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA,aAAA,EAC1B,UAAU,CAAC,IAAI,CAAC,EAAA,QAAA,EAE5B,IAAI,CAAC,KAAK,EAAA,CACC,EAAA,EAVP,IAAI,CAAC,KAAK,CAWd;QAET,CAAC,CAAC,EAAA,CACC;AAET;;;;"}

package/dist/components/organisms/HeaderNavigation/components/nav-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nav-list.d.ts","sourceRoot":"","sources":["../../../../../src/components/organisms/HeaderNavigation/components/nav-list.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAkB,MAAM,2BAA2B,CAAC;AAGjG,UAAU,YAAY;IACpB,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,KAAK,EAAE,CAAC,WAAW,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAC5C,8EAA8E;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,OAAO,GAAI,+CAA+C,YAAY,gCAuElF,CAAC"}
+{"version":3,"file":"nav-list.d.ts","sourceRoot":"","sources":["../../../../../src/components/organisms/HeaderNavigation/components/nav-list.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAkB,MAAM,2BAA2B,CAAC;AAGjG,UAAU,YAAY;IACpB,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,KAAK,EAAE,CAAC,WAAW,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAC5C,8EAA8E;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,OAAO,GAAI,+CAA+C,YAAY,gCA+DlF,CAAC"}

package/dist/components/organisms/HeaderNavigation/components/nav-list.js

@@ -1,17 +1,12 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { cx } from '@flipdish/ui-library/utilities/cx';
-import { joinTestId, slugifyTestId } from '@flipdish/ui-library/utilities/testIdUtils';
+import { findActiveItem, isCurrentItem, navItemTestId, navSubItemTestId } from '../../../__internal__/navigation/nav.utils.js';
 import { NavItemBase } from './nav-item.js';
 
 const NavList = ({ activeUrl, items, className, testIdPrefix }) => {
-    // Only match a defined `activeUrl` — parents may be hrefless, and `undefined === undefined`
-    // would open the first of them by default. (Mirrors SidebarNavigation's nav-list guard.)
-    const activeItem = activeUrl === undefined ? undefined : items.find((item) => item.href === activeUrl || item.items?.some((subItem) => subItem.href === activeUrl));
-    const itemTestId = (item) => item['data-testid'] ?? (testIdPrefix ? joinTestId(testIdPrefix, `nav-item-${item.id ?? slugifyTestId(item.label ?? '')}`) : undefined);
-    const subItemTestId = (parent, sub) => {
-        const parentId = itemTestId(parent);
-        return sub['data-testid'] ?? (parentId ? joinTestId(parentId, `sub-item-${sub.id ?? slugifyTestId(sub.label)}`) : undefined);
-    };
+    const activeItem = findActiveItem(items, activeUrl);
+    const itemTestId = (item) => navItemTestId(testIdPrefix, item);
+    const subItemTestId = (parent, sub) => navSubItemTestId(itemTestId(parent), sub);
     return (jsx("ul", { className: cx('flex flex-col px-4 pt-5', className), children: items.map((item, index) => {
             if (item.divider) {
                 return (
@@ -19,9 +14,10 @@ const NavList = ({ activeUrl, items, className, testIdPrefix }) => {
                 jsx("li", { className: "w-full px-0.5 py-2", children: jsx("hr", { className: "h-px w-full border-none bg-border-secondary" }) }, index));
             }
             if (item.items?.length) {
-                return (jsxs("details", { open: activeItem?.href === item.href, className: "appearance-none py-0.25", children: [jsx(NavItemBase, { href: item.href, badge: item.badge, icon: item.icon, type: "collapsible", "data-testid": itemTestId(item), children: item.label }), jsx("dd", { children: jsx("ul", { className: "pb-1", children: item.items.map((childItem) => (jsx("li", { className: "py-0.25", children: jsx(NavItemBase, { href: childItem.href, badge: childItem.badge, type: "collapsible-child", current: activeUrl === childItem.href, "data-testid": subItemTestId(item, childItem), children: childItem.label }) }, childItem.label))) }) })] }, item.label));
+                // Reference compare, not href: hrefless parents all share `undefined` and would otherwise force-open together.
+                return (jsxs("details", { open: activeItem === item, className: "appearance-none py-0.25", children: [jsx(NavItemBase, { href: item.href, badge: item.badge, icon: item.icon, type: "collapsible", "data-testid": itemTestId(item), children: item.label }), jsx("dd", { children: jsx("ul", { className: "pb-1", children: item.items.map((childItem) => (jsx("li", { className: "py-0.25", children: jsx(NavItemBase, { href: childItem.href, badge: childItem.badge, type: "collapsible-child", current: activeUrl === childItem.href, "data-testid": subItemTestId(item, childItem), children: childItem.label }) }, childItem.label))) }) })] }, item.label));
             }
-            return (jsx("li", { className: "py-px", children: jsx(NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: activeUrl !== undefined && activeUrl === item.href, "data-testid": itemTestId(item), children: item.label }) }, item.label));
+            return (jsx("li", { className: "py-px", children: jsx(NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: isCurrentItem(item, activeUrl), "data-testid": itemTestId(item), children: item.label }) }, item.label));
         }) }));
 };
 

package/dist/components/organisms/HeaderNavigation/components/nav-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"nav-list.js","sources":["../../../../../src/components/organisms/HeaderNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}
+{"version":3,"file":"nav-list.js","sources":["../../../../../src/components/organisms/HeaderNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":";;;;;AAkBO,MAAM,OAAO,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAgB,KAAI;IACrF,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC;AACnD,IAAA,MAAM,UAAU,GAAG,CAAC,IAAsC,KAAK,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC;AAChG,IAAA,MAAM,aAAa,GAAG,CAAC,MAAwC,EAAE,GAAmB,KAAK,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAElI,QACEA,YAAI,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE,SAAS,CAAC,YACpD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,KAAI;AACzB,YAAA,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB;;AAEE,gBAAAA,GAAA,CAAA,IAAA,EAAA,EAAgB,SAAS,EAAC,oBAAoB,EAAA,QAAA,EAC5CA,GAAA,CAAA,IAAA,EAAA,EAAI,SAAS,EAAC,6CAA6C,EAAA,CAAG,EAAA,EADvD,KAAK,CAET;YAET;AAEA,YAAA,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE;;gBAEtB,QACEC,IAAA,CAAA,SAAA,EAAA,EAA0B,IAAI,EAAE,UAAU,KAAK,IAAI,EAAE,SAAS,EAAC,yBAAyB,EAAA,QAAA,EAAA,CACtFD,GAAA,CAAC,WAAW,EAAA,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAC,aAAa,EAAA,aAAA,EAAc,UAAU,CAAC,IAAI,CAAC,EAAA,QAAA,EAC/G,IAAI,CAAC,KAAK,EAAA,CACC,EAEdA,GAAA,CAAA,IAAA,EAAA,EAAA,QAAA,EACEA,GAAA,CAAA,IAAA,EAAA,EAAI,SAAS,EAAC,MAAM,EAAA,QAAA,EACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,MACxBA,GAAA,CAAA,IAAA,EAAA,EAA0B,SAAS,EAAC,SAAS,EAAA,QAAA,EAC3CA,GAAA,CAAC,WAAW,EAAA,EACV,IAAI,EAAE,SAAS,CAAC,IAAI,EACpB,KAAK,EAAE,SAAS,CAAC,KAAK,EACtB,IAAI,EAAC,mBAAmB,EACxB,OAAO,EAAE,SAAS,KAAK,SAAS,CAAC,IAAI,EAAA,aAAA,EACxB,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA,QAAA,EAE1C,SAAS,CAAC,KAAK,EAAA,CACJ,EAAA,EATP,SAAS,CAAC,KAAK,CAUnB,CACN,CAAC,EAAA,CACC,EAAA,CACF,CAAA,EAAA,EArBO,IAAI,CAAC,KAAK,CAsBd;YAEd;YAEA,QACEA,GAAA,CAAA,IAAA,EAAA,EAAqB,SAAS,EAAC,OAAO,YACpCA,GAAA,CAAC,WAAW,EAAA,EACV,IAAI,EAAC,MAAM,EACX,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA,aAAA,EAC1B,UAAU,CAAC,IAAI,CAAC,EAAA,QAAA,EAE5B,IAAI,CAAC,KAAK,EAAA,CACC,EAAA,EAVP,IAAI,CAAC,KAAK,CAWd;QAET,CAAC,CAAC,EAAA,CACC;AAET;;;;"}

package/dist/components/organisms/HeaderNavigation/headerNavigation.types.d.ts

@@ -1,40 +1,6 @@
-import type { FC, ReactNode } from 'react';
-export type NavSubItemType = {
-    label: string;
-    href: string;
-    icon?: FC<{
-        className?: string;
-    }>;
-    badge?: ReactNode;
-    /** Stable id used to derive this sub-item's `data-testid` (falls back to a slug of `label`). */
-    id?: string;
-    /** Overrides the derived `data-testid` for this sub-item. */
-    'data-testid'?: string;
-};
-export type NavItemType = {
-    /** Label text for the nav item. */
-    label: string;
-    /** URL to navigate to when the nav item is clicked. */
-    href?: string;
-    /** Icon component to display. */
-    icon?: FC<{
-        className?: string;
-    }>;
-    /** Badge to display. */
-    badge?: ReactNode;
-    /** List of sub-items to display. */
-    items?: NavSubItemType[];
-    /** Whether this nav item is a divider. */
-    divider?: boolean;
-    /** Stable id used to derive this item's `data-testid` (falls back to a slug of `label`). */
-    id?: string;
-    /** Overrides the derived `data-testid` for this item. */
-    'data-testid'?: string;
-};
-export type NavItemDividerType = Omit<NavItemType, 'icon' | 'label' | 'divider'> & {
-    /** Label text for the divider. */
-    label?: string;
-    /** Whether this nav item is a divider. */
-    divider: true;
-};
+import type { NavItemDividerOf, NavItemTypeBase, NavSubItemType } from '../../__internal__/navigation/nav.types';
+export type { NavSubItemType };
+/** Header nav item — the shared base shape. */
+export type NavItemType = NavItemTypeBase;
+export type NavItemDividerType = NavItemDividerOf<NavItemType>;
 //# sourceMappingURL=headerNavigation.types.d.ts.map

package/dist/components/organisms/HeaderNavigation/headerNavigation.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headerNavigation.types.d.ts","sourceRoot":"","sources":["../../../../src/components/organisms/HeaderNavigation/headerNavigation.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,EAAE,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,gGAAgG;IAChG,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,6DAA6D;IAC7D,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iCAAiC;IACjC,IAAI,CAAC,EAAE,EAAE,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClC,wBAAwB;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,oCAAoC;IACpC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,4FAA4F;IAC5F,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAAG;IACjF,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,OAAO,EAAE,IAAI,CAAC;CACf,CAAC"}
+{"version":3,"file":"headerNavigation.types.d.ts","sourceRoot":"","sources":["../../../../src/components/organisms/HeaderNavigation/headerNavigation.types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEjH,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,+CAA+C;AAC/C,MAAM,MAAM,WAAW,GAAG,eAAe,CAAC;AAE1C,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC"}

package/dist/components/organisms/SidebarNavigation/components/nav-list.cjs

@@ -2,18 +2,14 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var cx = require('@flipdish/ui-library/utilities/cx');
-var testIdUtils = require('@flipdish/ui-library/utilities/testIdUtils');
+var nav_utils = require('../../../__internal__/navigation/nav.utils.cjs');
 var navItem = require('./nav-item.cjs');
 var navSectionToggle = require('./nav-section-toggle.cjs');
 
 const NavList = ({ activeUrl, items, className, onNavigate, testIdPrefix }) => {
-    // Only match a defined `activeUrl` — parents may be hrefless, and `undefined === undefined`
-    // would open the first of them by default.
-    const activeItem = activeUrl === undefined ? undefined : items.find((item) => item.href === activeUrl || item.items?.some((subItem) => subItem.href === activeUrl));
-    const itemTestId = (item) => testIdPrefix ? (item['data-testid'] ?? testIdUtils.joinTestId(testIdPrefix, `nav-item-${item.id ?? testIdUtils.slugifyTestId(item.label ?? '')}`)) : item['data-testid'];
-    const subItemTestId = (parentTestId, subItem) => parentTestId
-        ? (subItem['data-testid'] ?? testIdUtils.joinTestId(parentTestId, `sub-item-${subItem.id ?? testIdUtils.slugifyTestId(subItem.label)}`))
-        : subItem['data-testid'];
+    const activeItem = nav_utils.findActiveItem(items, activeUrl);
+    const itemTestId = (item) => nav_utils.navItemTestId(testIdPrefix, item);
+    const subItemTestId = nav_utils.navSubItemTestId;
     return (jsxRuntime.jsx("ul", { className: cx.cx('flex flex-col px-4 pt-5', className), children: items.map((item, index) => {
             if (item.divider) {
                 return (
@@ -25,7 +21,7 @@ const NavList = ({ activeUrl, items, className, onNavigate, testIdPrefix }) => {
                 // Reference compare, not href: hrefless parents all share `undefined` and would otherwise force-open together.
                 return (jsxRuntime.jsxs("details", { open: activeItem === item, className: "appearance-none py-0.25", children: [jsxRuntime.jsx(navItem.NavItemBase, { badge: item.badge, icon: item.icon, type: "collapsible", "data-testid": parentTestId, children: item.label }), jsxRuntime.jsxs("dd", { children: [jsxRuntime.jsx("ul", { className: "pb-1", children: item.items.map((childItem) => (jsxRuntime.jsx("li", { className: "py-0.25", children: jsxRuntime.jsx(navItem.NavItemBase, { href: childItem.href, badge: childItem.badge, type: "collapsible-child", current: activeUrl === childItem.href, onClick: onNavigate, "data-testid": subItemTestId(parentTestId, childItem), children: childItem.label }) }, childItem.label))) }), item.toggle && jsxRuntime.jsx(navSectionToggle.NavSectionToggleRow, { toggle: item.toggle, testIdPrefix: parentTestId, className: "py-2 pr-3 pl-10" })] })] }, item.label));
             }
-            return (jsxRuntime.jsx("li", { className: "py-px", children: jsxRuntime.jsx(navItem.NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: activeUrl === item.href, onClick: onNavigate, "data-testid": itemTestId(item), children: item.label }) }, item.label));
+            return (jsxRuntime.jsx("li", { className: "py-px", children: jsxRuntime.jsx(navItem.NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: nav_utils.isCurrentItem(item, activeUrl), onClick: onNavigate, "data-testid": itemTestId(item), children: item.label }) }, item.label));
         }) }));
 };
 

package/dist/components/organisms/SidebarNavigation/components/nav-list.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"nav-list.cjs","sources":["../../../../../src/components/organisms/SidebarNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["joinTestId","slugifyTestId","_jsx","cx","_jsxs","NavItemBase","NavSectionToggleRow"],"mappings":"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"}
+{"version":3,"file":"nav-list.cjs","sources":["../../../../../src/components/organisms/SidebarNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["findActiveItem","navItemTestId","navSubItemTestId","_jsx","cx","_jsxs","NavItemBase","NavSectionToggleRow","isCurrentItem"],"mappings":"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"}

package/dist/components/organisms/SidebarNavigation/components/nav-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nav-list.d.ts","sourceRoot":"","sources":["../../../../../src/components/organisms/SidebarNavigation/components/nav-list.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAkB,MAAM,4BAA4B,CAAC;AAIlG,UAAU,YAAY;IACpB,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,KAAK,EAAE,CAAC,WAAW,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAC5C,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,OAAO,GAAI,2DAA2D,YAAY,gCA8E9F,CAAC"}
+{"version":3,"file":"nav-list.d.ts","sourceRoot":"","sources":["../../../../../src/components/organisms/SidebarNavigation/components/nav-list.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAkB,MAAM,4BAA4B,CAAC;AAIlG,UAAU,YAAY;IACpB,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,KAAK,EAAE,CAAC,WAAW,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAC5C,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,OAAO,GAAI,2DAA2D,YAAY,gCAqE9F,CAAC"}

package/dist/components/organisms/SidebarNavigation/components/nav-list.js

@@ -1,17 +1,13 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { cx } from '@flipdish/ui-library/utilities/cx';
-import { joinTestId, slugifyTestId } from '@flipdish/ui-library/utilities/testIdUtils';
+import { findActiveItem, isCurrentItem, navItemTestId, navSubItemTestId } from '../../../__internal__/navigation/nav.utils.js';
 import { NavItemBase } from './nav-item.js';
 import { NavSectionToggleRow } from './nav-section-toggle.js';
 
 const NavList = ({ activeUrl, items, className, onNavigate, testIdPrefix }) => {
-    // Only match a defined `activeUrl` — parents may be hrefless, and `undefined === undefined`
-    // would open the first of them by default.
-    const activeItem = activeUrl === undefined ? undefined : items.find((item) => item.href === activeUrl || item.items?.some((subItem) => subItem.href === activeUrl));
-    const itemTestId = (item) => testIdPrefix ? (item['data-testid'] ?? joinTestId(testIdPrefix, `nav-item-${item.id ?? slugifyTestId(item.label ?? '')}`)) : item['data-testid'];
-    const subItemTestId = (parentTestId, subItem) => parentTestId
-        ? (subItem['data-testid'] ?? joinTestId(parentTestId, `sub-item-${subItem.id ?? slugifyTestId(subItem.label)}`))
-        : subItem['data-testid'];
+    const activeItem = findActiveItem(items, activeUrl);
+    const itemTestId = (item) => navItemTestId(testIdPrefix, item);
+    const subItemTestId = navSubItemTestId;
     return (jsx("ul", { className: cx('flex flex-col px-4 pt-5', className), children: items.map((item, index) => {
             if (item.divider) {
                 return (
@@ -23,7 +19,7 @@ const NavList = ({ activeUrl, items, className, onNavigate, testIdPrefix }) => {
                 // Reference compare, not href: hrefless parents all share `undefined` and would otherwise force-open together.
                 return (jsxs("details", { open: activeItem === item, className: "appearance-none py-0.25", children: [jsx(NavItemBase, { badge: item.badge, icon: item.icon, type: "collapsible", "data-testid": parentTestId, children: item.label }), jsxs("dd", { children: [jsx("ul", { className: "pb-1", children: item.items.map((childItem) => (jsx("li", { className: "py-0.25", children: jsx(NavItemBase, { href: childItem.href, badge: childItem.badge, type: "collapsible-child", current: activeUrl === childItem.href, onClick: onNavigate, "data-testid": subItemTestId(parentTestId, childItem), children: childItem.label }) }, childItem.label))) }), item.toggle && jsx(NavSectionToggleRow, { toggle: item.toggle, testIdPrefix: parentTestId, className: "py-2 pr-3 pl-10" })] })] }, item.label));
             }
-            return (jsx("li", { className: "py-px", children: jsx(NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: activeUrl === item.href, onClick: onNavigate, "data-testid": itemTestId(item), children: item.label }) }, item.label));
+            return (jsx("li", { className: "py-px", children: jsx(NavItemBase, { type: "link", badge: item.badge, icon: item.icon, href: item.href, current: isCurrentItem(item, activeUrl), onClick: onNavigate, "data-testid": itemTestId(item), children: item.label }) }, item.label));
         }) }));
 };
 

package/dist/components/organisms/SidebarNavigation/components/nav-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"nav-list.js","sources":["../../../../../src/components/organisms/SidebarNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}
+{"version":3,"file":"nav-list.js","sources":["../../../../../src/components/organisms/SidebarNavigation/components/nav-list.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":";;;;;;AAqBO,MAAM,OAAO,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAgB,KAAI;IACjG,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC;AACnD,IAAA,MAAM,UAAU,GAAG,CAAC,IAAuD,KAAK,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC;IACjH,MAAM,aAAa,GAAG,gBAAgB;IAEtC,QACEA,YAAI,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE,SAAS,CAAC,YACpD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,KAAI;AACzB,YAAA,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB;;AAEE,gBAAAA,GAAA,CAAA,IAAA,EAAA,EAAgB,SAAS,EAAC,oBAAoB,EAAA,QAAA,EAC5CA,GAAA,CAAA,IAAA,EAAA,EAAI,SAAS,EAAC,6CAA6C,EAAA,CAAG,EAAA,EADvD,KAAK,CAET;YAET;AAEA,YAAA,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE;AACtB,gBAAA,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC;;AAErC,gBAAA,QACEC,IAAA,CAAA,SAAA,EAAA,EAA0B,IAAI,EAAE,UAAU,KAAK,IAAI,EAAE,SAAS,EAAC,yBAAyB,EAAA,QAAA,EAAA,CACtFD,GAAA,CAAC,WAAW,EAAA,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAC,aAAa,EAAA,aAAA,EAAc,YAAY,EAAA,QAAA,EAC1F,IAAI,CAAC,KAAK,EAAA,CACC,EAEdC,IAAA,CAAA,IAAA,EAAA,EAAA,QAAA,EAAA,CACED,GAAA,CAAA,IAAA,EAAA,EAAI,SAAS,EAAC,MAAM,EAAA,QAAA,EACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAyB,MACxCA,GAAA,CAAA,IAAA,EAAA,EAA0B,SAAS,EAAC,SAAS,EAAA,QAAA,EAC3CA,GAAA,CAAC,WAAW,EAAA,EACV,IAAI,EAAE,SAAS,CAAC,IAAI,EACpB,KAAK,EAAE,SAAS,CAAC,KAAK,EACtB,IAAI,EAAC,mBAAmB,EACxB,OAAO,EAAE,SAAS,KAAK,SAAS,CAAC,IAAI,EACrC,OAAO,EAAE,UAAU,EAAA,aAAA,EACN,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,EAAA,QAAA,EAElD,SAAS,CAAC,KAAK,EAAA,CACJ,IAVP,SAAS,CAAC,KAAK,CAWnB,CACN,CAAC,EAAA,CACC,EAGJ,IAAI,CAAC,MAAM,IAAIA,GAAA,CAAC,mBAAmB,EAAA,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAC,iBAAiB,EAAA,CAAG,CAAA,EAAA,CACjH,CAAA,EAAA,EAzBO,IAAI,CAAC,KAAK,CA0Bd;YAEd;YAEA,QACEA,GAAA,CAAA,IAAA,EAAA,EAAqB,SAAS,EAAC,OAAO,EAAA,QAAA,EACpCA,GAAA,CAAC,WAAW,EAAA,EACV,IAAI,EAAC,MAAM,EACX,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EACvC,OAAO,EAAE,UAAU,EAAA,aAAA,EACN,UAAU,CAAC,IAAI,CAAC,EAAA,QAAA,EAE5B,IAAI,CAAC,KAAK,EAAA,CACC,EAAA,EAXP,IAAI,CAAC,KAAK,CAYd;QAET,CAAC,CAAC,EAAA,CACC;AAET;;;;"}

package/dist/components/organisms/SidebarNavigation/sidebarNavigation.types.d.ts

@@ -1,4 +1,4 @@
-import type { FC, ReactNode } from 'react';
+import type { NavItemDividerOf, NavItemTypeBase, NavSubItemType } from '../../__internal__/navigation/nav.types';
 /**
  * Switch pinned to the bottom of a section's sub-navigation panel. The sidebar only renders
  * it — state and effect stay with the consumer.
@@ -17,48 +17,11 @@ export type NavSectionToggle = {
     /** Overrides the derived `data-testid`. */
     'data-testid'?: string;
 };
-export type NavSubItemType = {
-    /** Label text for the sub-item. */
-    label: string;
-    /** URL to navigate to when the sub-item is clicked. */
-    href: string;
-    /** Icon component to display. */
-    icon?: FC<{
-        className?: string;
-    }>;
-    /** Badge to display. */
-    badge?: ReactNode;
-    /** Stable id used to derive the sub-item's default `data-testid`. Falls back to a slug of `label`. */
-    id?: string;
-    /** Overrides the derived `data-testid`. */
-    'data-testid'?: string;
-};
-export type NavItemType = {
-    /** Label text for the nav item. */
-    label: string;
-    /** URL to navigate to when the nav item is clicked. */
-    href?: string;
-    /** Icon component to display. */
-    icon?: FC<{
-        className?: string;
-    }>;
-    /** Badge to display. */
-    badge?: ReactNode;
-    /** List of sub-items to display. */
-    items?: NavSubItemType[];
+export type { NavSubItemType };
+/** Sidebar nav item — the shared base plus the sidebar-only section `toggle`. */
+export type NavItemType = NavItemTypeBase & {
     /** Switch shown below this section's sub-items. Ignored on items without `items`. */
     toggle?: NavSectionToggle;
-    /** Whether this nav item is a divider. */
-    divider?: boolean;
-    /** Stable id used to derive the item's default `data-testid`. Falls back to a slug of `label`. */
-    id?: string;
-    /** Overrides the derived `data-testid`. */
-    'data-testid'?: string;
-};
-export type NavItemDividerType = Omit<NavItemType, 'icon' | 'label' | 'divider'> & {
-    /** Label text for the divider. */
-    label?: string;
-    /** Whether this nav item is a divider. */
-    divider: true;
 };
+export type NavItemDividerType = NavItemDividerOf<NavItemType>;
 //# sourceMappingURL=sidebarNavigation.types.d.ts.map

package/dist/components/organisms/SidebarNavigation/sidebarNavigation.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sidebarNavigation.types.d.ts","sourceRoot":"","sources":["../../../../src/components/organisms/SidebarNavigation/sidebarNavigation.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE3C;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd,iCAAiC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gDAAgD;IAChD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sCAAsC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,IAAI,CAAC,EAAE,EAAE,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClC,wBAAwB;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,sGAAsG;IACtG,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iCAAiC;IACjC,IAAI,CAAC,EAAE,EAAE,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClC,wBAAwB;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,oCAAoC;IACpC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,qFAAqF;IACrF,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,0CAA0C;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kGAAkG;IAClG,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAAG;IACjF,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,OAAO,EAAE,IAAI,CAAC;CACf,CAAC"}
+{"version":3,"file":"sidebarNavigation.types.d.ts","sourceRoot":"","sources":["../../../../src/components/organisms/SidebarNavigation/sidebarNavigation.types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEjH;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd,iCAAiC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gDAAgD;IAChD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sCAAsC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,iFAAiF;AACjF,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG;IAC1C,qFAAqF;IACrF,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC"}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@flipdish/ui-library",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "Flipdish Design System — atomic-design component library (Tailwind v4 + UntitledUI + React Aria).",
   "type": "module",
   "imports": {
+    "#internal/components/*": "./src/components/__internal__/*.ts",
     "#internal/hooks/*": "./src/hooks/__internal__/*.ts",
     "#internal/utilities/*": "./src/utilities/__internal__/*.ts"
   },