@dloizides/ui-nav 1.34.0 → 1.37.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useMemo, useEffect, useRef } from 'react';
+import React, { createContext, useState, useCallback, useMemo, useContext, useEffect, useRef } from 'react';
 import { StyleSheet, Platform, Pressable, Text, View, TextInput, useWindowDimensions, Image, ScrollView, ActivityIndicator, Animated } from 'react-native';
 import { useUi, UiProvider } from '@dloizides/ui-feedback';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
@@ -22,7 +22,6 @@ var NAV_LINK_GAP = 4;
 var navStyles = StyleSheet.create({
   // --- Sidebar ---
   sidebarContainer: {
-    width: 220,
     paddingTop: 24,
     paddingHorizontal: 12,
     borderRightWidth: 1,
@@ -480,6 +479,18 @@ function resolveActiveRoute(items, pathname) {
   }
   return winner;
 }
+var NavAccordionContext = createContext(false);
+function hasActiveDescendant(item, pathname) {
+  if (isRouteActive(pathname, item.route)) return true;
+  return (item.children ?? []).some((child) => hasActiveDescendant(child, pathname));
+}
+function initialOpenGroup(items, pathname) {
+  const hasChildren = (item) => (item.children ?? []).length > 0;
+  return items.find((item) => hasChildren(item) && hasActiveDescendant(item, pathname))?.key;
+}
+function nextOpenGroup(current, pressed) {
+  return current === pressed ? void 0 : pressed;
+}
 var REDUCED_MOTION_QUERY = "(prefers-reduced-motion: reduce)";
 function getReducedMotionQuery() {
   if (typeof window === "undefined" || typeof window.matchMedia !== "function") return void 0;
@@ -529,10 +540,6 @@ function ariaExpandedProps(expanded) {
 function hoverHandlerProps(onIn, onOut) {
   return IS_WEB ? { onHoverIn: onIn, onHoverOut: onOut } : {};
 }
-function hasActiveDescendant(item, pathname) {
-  if (isRouteActive(pathname, item.route)) return true;
-  return (item.children ?? []).some((child) => hasActiveDescendant(child, pathname));
-}
 function TintOverlay({
   opacity,
   color,
@@ -556,15 +563,21 @@ var NavExpandableItem = ({
   collapseHint,
   renderChevron,
   activeRoute,
-  depth = 0
+  depth = 0,
+  expanded: expandedProp,
+  onToggle
 }) => {
-  const [expanded, setExpanded] = useState(() => hasActiveDescendant(item, pathname));
+  const [internalExpanded, setExpanded] = useState(() => hasActiveDescendant(item, pathname));
+  const expanded = expandedProp ?? internalExpanded;
   const [focused, setFocused] = useState(false);
   const [hovered, setHovered] = useState(false);
   const { theme } = useUi();
   const colors = theme.colors;
   const primaryColor = theme.palette.primary["500"];
-  const toggle = useCallback(() => setExpanded((v) => !v), []);
+  const toggle = useCallback(() => {
+    if (onToggle !== void 0) onToggle(item.key);
+    else setExpanded((v) => !v);
+  }, [onToggle, item.key]);
   const onHoverIn = useCallback(() => setHovered(true), []);
   const onHoverOut = useCallback(() => setHovered(false), []);
   const indent = depth * BASE_INDENT;
@@ -675,9 +688,72 @@ var DEFAULT_SEARCH_BREAKPOINT = LAYOUT_COLLAPSE_BREAKPOINT;
 function resolveSearchAffordance(viewport, breakpoint = DEFAULT_SEARCH_BREAKPOINT) {
   return viewport >= breakpoint ? "inline" : "palette";
 }
+
+// src/sidebarEdgeFade.ts
+var EDGE_TOLERANCE = 1;
+function resolveEdgeFades({ offsetY, viewportHeight, contentHeight }) {
+  const hiddenBelow = contentHeight - (offsetY + viewportHeight);
+  return { top: offsetY > EDGE_TOLERANCE, bottom: hiddenBelow > EDGE_TOLERANCE };
+}
+var FADE_BAND_HEIGHT = 6;
+var FADE_BAND_OPACITIES = [0.9, 0.65, 0.4, 0.15];
+var SCROLL_EVENT_THROTTLE_MS = 16;
+var styles2 = StyleSheet.create({
+  area: { flex: 1, minHeight: 0 },
+  fade: { position: "absolute", left: 0, right: 0 },
+  fadeTop: { top: 0 },
+  fadeBottom: { bottom: 0, flexDirection: "column-reverse" },
+  band: { height: FADE_BAND_HEIGHT }
+});
+function EdgeFade({ edge, color }) {
+  return /* @__PURE__ */ jsx(
+    View,
+    {
+      pointerEvents: "none",
+      style: [styles2.fade, edge === "top" ? styles2.fadeTop : styles2.fadeBottom],
+      testID: `sidebar-fade-${edge}`,
+      children: FADE_BAND_OPACITIES.map((opacity) => /* @__PURE__ */ jsx(View, { style: [styles2.band, { backgroundColor: color, opacity }] }, opacity))
+    }
+  );
+}
+var SidebarScrollArea = ({ children }) => {
+  const { theme } = useUi();
+  const metrics = useRef({ offsetY: 0, viewportHeight: 0, contentHeight: 0 });
+  const [fades, setFades] = useState({ top: false, bottom: false });
+  const update = useCallback((next) => {
+    metrics.current = { ...metrics.current, ...next };
+    const resolved = resolveEdgeFades(metrics.current);
+    setFades((prev) => prev.top === resolved.top && prev.bottom === resolved.bottom ? prev : resolved);
+  }, []);
+  const onLayout = useCallback(
+    (e) => update({ viewportHeight: e.nativeEvent.layout.height }),
+    [update]
+  );
+  const onContentSizeChange = useCallback((_w, h) => update({ contentHeight: h }), [update]);
+  const onScroll = useCallback(
+    (e) => update({ offsetY: e.nativeEvent.contentOffset.y }),
+    [update]
+  );
+  return /* @__PURE__ */ jsxs(View, { style: styles2.area, children: [
+    /* @__PURE__ */ jsx(
+      ScrollView,
+      {
+        scrollEventThrottle: SCROLL_EVENT_THROTTLE_MS,
+        style: styles2.area,
+        testID: "sidebar-scroll",
+        onContentSizeChange,
+        onLayout,
+        onScroll,
+        children
+      }
+    ),
+    fades.top ? /* @__PURE__ */ jsx(EdgeFade, { color: theme.colors.surface, edge: "top" }) : null,
+    fades.bottom ? /* @__PURE__ */ jsx(EdgeFade, { color: theme.colors.surface, edge: "bottom" }) : null
+  ] });
+};
 var FIELD_MIN_HEIGHT = 38;
 var CLEAR_GLYPH = "\u2715";
-var styles2 = StyleSheet.create({
+var styles3 = StyleSheet.create({
   wrap: {
     flexDirection: "row",
     alignItems: "center",
@@ -718,7 +794,7 @@ var SidebarSearch = ({
     View,
     {
       style: [
-        styles2.wrap,
+        styles3.wrap,
         { backgroundColor: colors.surface, borderColor: focused ? primary : colors.border },
         focusRingStyle(focused, primary)
       ],
@@ -730,7 +806,7 @@ var SidebarSearch = ({
             accessibilityLabel: labels.placeholder,
             placeholder: labels.placeholder,
             placeholderTextColor: colors.textSecondary,
-            style: [styles2.input, { color: colors.text }],
+            style: [styles3.input, { color: colors.text }],
             testID,
             value,
             onBlur: () => setFocused(false),
@@ -744,16 +820,30 @@ var SidebarSearch = ({
             accessibilityHint: labels.clearHint,
             accessibilityLabel: labels.clearLabel,
             accessibilityRole: "button",
-            style: styles2.clear,
+            style: styles3.clear,
             testID: `${testID}-clear`,
             onPress: onClear,
-            children: /* @__PURE__ */ jsx(Text, { style: [styles2.clearGlyph, { color: colors.textSecondary }], children: CLEAR_GLYPH })
+            children: /* @__PURE__ */ jsx(Text, { style: [styles3.clearGlyph, { color: colors.textSecondary }], children: CLEAR_GLYPH })
           }
         ) : null
       ]
     }
   );
 };
+
+// src/types.ts
+var SIDEBAR_WIDTH_PX = {
+  default: 220,
+  sm: 240,
+  md: 264,
+  lg: 288
+};
+var NAV_BRAND_DEFAULTS = {
+  brandPlacement: "sidebar",
+  sidebarWidth: "default",
+  drawerHeader: "none",
+  drawerWidth: "default"
+};
 function isBareText(node) {
   return typeof node === "string" || typeof node === "number";
 }
@@ -771,6 +861,7 @@ var Sidebar = ({
   pathname,
   onNavigate,
   title,
+  width: railWidth = "default",
   regionLabel,
   navigateHint = (label) => label,
   expandHint = "",
@@ -806,6 +897,10 @@ var Sidebar = ({
   const visibleItems = showInlineSearch ? filterNavItems(items, query) : items;
   const showEmpty = showInlineSearch && isFilterActive(query) && visibleItems.length === 0;
   const activeRoute = resolveActiveRoute(items, pathname);
+  const accordion = useContext(NavAccordionContext);
+  const [openGroup, setOpenGroup] = useState(() => initialOpenGroup(items, pathname));
+  const toggleGroup = useCallback((key) => setOpenGroup((current) => nextOpenGroup(current, key)), []);
+  const accordionProps = (item) => accordion && (item.children ?? []).length > 0 ? { expanded: openGroup === item.key, onToggle: toggleGroup } : {};
   return /* @__PURE__ */ jsxs(
     View,
     {
@@ -814,11 +909,12 @@ var Sidebar = ({
       role: "navigation",
       style: [
         navStyles.sidebarContainer,
+        { width: SIDEBAR_WIDTH_PX[railWidth] },
         { backgroundColor: colors.surface, borderRightColor: colors.border },
         containerStyle
       ],
       children: [
-        typeof title === "string" ? /* @__PURE__ */ jsx(Text, { accessibilityRole: "header", style: [navStyles.sidebarTitle, { color: colors.text }], children: title }) : /* @__PURE__ */ jsx(View, { style: navStyles.sidebarBrand, children: title }),
+        title === null ? null : typeof title === "string" ? /* @__PURE__ */ jsx(Text, { accessibilityRole: "header", style: [navStyles.sidebarTitle, { color: colors.text }], children: title }) : /* @__PURE__ */ jsx(View, { style: navStyles.sidebarBrand, children: title }),
         showInlineSearch && search !== void 0 ? /* @__PURE__ */ jsx(
           SidebarSearch,
           {
@@ -839,22 +935,24 @@ var Sidebar = ({
             onPress: paletteTrigger.onOpen
           }
         ) }) : null,
-        renderTextSlot(header, { color: colors.text }),
-        showEmpty && search !== void 0 ? /* @__PURE__ */ jsx(Text, { style: [navStyles.sidebarEmpty, { color: colors.textSecondary }], testID: "sidebar-search-empty", children: search.emptyText }) : visibleItems.map((item) => /* @__PURE__ */ jsx(
-          NavExpandableItem,
-          {
-            activeRoute,
-            collapseHint,
-            expandHint,
-            item,
-            navigateHint,
-            pathname,
-            renderChevron,
-            onNavigate
-          },
-          item.key
-        )),
-        /* @__PURE__ */ jsx(View, { style: navStyles.sidebarSpacer }),
+        /* @__PURE__ */ jsxs(SidebarScrollArea, { children: [
+          renderTextSlot(header, { color: colors.text }),
+          showEmpty && search !== void 0 ? /* @__PURE__ */ jsx(Text, { style: [navStyles.sidebarEmpty, { color: colors.textSecondary }], testID: "sidebar-search-empty", children: search.emptyText }) : visibleItems.map((item) => /* @__PURE__ */ jsx(
+            NavExpandableItem,
+            {
+              activeRoute,
+              collapseHint,
+              expandHint,
+              item,
+              navigateHint,
+              pathname,
+              renderChevron,
+              onNavigate,
+              ...accordionProps(item)
+            },
+            item.key
+          ))
+        ] }),
         renderTextSlot(footer, { color: colors.text })
       ]
     }
@@ -1576,7 +1674,7 @@ var NavBar = ({ barTheme, ...props }) => {
   if (barTheme === void 0) return /* @__PURE__ */ jsx(NavBarInner, { ...props });
   return /* @__PURE__ */ jsx(UiProvider, { navigate, t, theme: barTheme, children: /* @__PURE__ */ jsx(NavBarInner, { ...props }) });
 };
-var styles3 = StyleSheet.create({
+var styles4 = StyleSheet.create({
   hitBox: { minHeight: MIN_TOUCH_TARGET, minWidth: MIN_TOUCH_TARGET, justifyContent: "center" }
 });
 function anchorProps(route) {
@@ -1599,7 +1697,7 @@ var BrandHomeLink = ({ route, label, onNavigate, children }) => {
     {
       accessibilityLabel: label,
       accessibilityRole: "link",
-      style: [styles3.hitBox, focusRingStyle(focused, theme.palette.primary["500"])],
+      style: [styles4.hitBox, focusRingStyle(focused, theme.palette.primary["500"])],
       testID: NAV_TEST_IDS.brandHome,
       onBlur: () => setFocused(false),
       onFocus: () => setFocused(true),
@@ -1612,7 +1710,7 @@ var BrandHomeLink = ({ route, label, onNavigate, children }) => {
 var DEFAULT_ICON_SIZE = 32;
 var NAME_FONT_SIZE = 16;
 var NAME_GAP = 8;
-var styles4 = StyleSheet.create({
+var styles5 = StyleSheet.create({
   name: { flexShrink: 1, fontSize: NAME_FONT_SIZE, fontWeight: "700" },
   row: { alignItems: "center", flexDirection: "row", gap: NAME_GAP }
 });
@@ -1626,7 +1724,7 @@ var BrandMark = ({
   iconOnly = false
 }) => {
   const { theme } = useUi();
-  return /* @__PURE__ */ jsx(BrandHomeLink, { label, route, onNavigate, children: /* @__PURE__ */ jsxs(View, { style: styles4.row, children: [
+  return /* @__PURE__ */ jsx(BrandHomeLink, { label, route, onNavigate, children: /* @__PURE__ */ jsxs(View, { style: styles5.row, children: [
     /* @__PURE__ */ jsx(
       Image,
       {
@@ -1640,7 +1738,7 @@ var BrandMark = ({
       Text,
       {
         numberOfLines: 1,
-        style: [styles4.name, { color: theme.colors.text }],
+        style: [styles5.name, { color: theme.colors.text }],
         testID: NAV_TEST_IDS.brandMarkName,
         children: name
       }
@@ -1653,7 +1751,7 @@ var Nav = (props) => {
   }
   return /* @__PURE__ */ jsx(NavBar, { ...props });
 };
-var styles5 = StyleSheet.create({
+var styles6 = StyleSheet.create({
   band: { left: 0, position: "absolute", right: 0, top: 0 }
 });
 function readBackdrop(theme) {
@@ -1676,7 +1774,7 @@ function resolveShellBackdrop(theme, viewport, contentPadding, testID) {
     View,
     {
       pointerEvents: "none",
-      style: [styles5.band, { backgroundColor: band.color, height: contentPadding + overlap }],
+      style: [styles6.band, { backgroundColor: band.color, height: contentPadding + overlap }],
       testID: `${testID}${APP_SHELL_SUFFIX.band}`
     }
   );
@@ -1688,7 +1786,7 @@ var CARD_BORDER_WIDTH = 1;
 var CARD_TITLE_FONT_SIZE = 16;
 var CARD_MESSAGE_FONT_SIZE = 14;
 var CARD_TITLE_MARGIN_BOTTOM = 8;
-var styles6 = StyleSheet.create({
+var styles7 = StyleSheet.create({
   // Loading is a TRANSITIONAL state: the spinner is an absolute overlay ON TOP of
   // stably-mounted children, never a replacement for them. Replacing children here
   // would unmount whatever they host (e.g. a navigator), and on remount React
@@ -1720,9 +1818,9 @@ function MessageCard({
 }) {
   const { theme } = useUi();
   const colors = theme.colors;
-  return /* @__PURE__ */ jsxs(View, { style: [styles6.card, { backgroundColor: colors.surface, borderColor: accentColor }], testID, children: [
-    /* @__PURE__ */ jsx(Text, { style: [styles6.cardTitle, { color: accentColor }], children: message.titleText }),
-    /* @__PURE__ */ jsx(Text, { style: [styles6.cardMessage, { color: colors.textSecondary }], children: message.messageText })
+  return /* @__PURE__ */ jsxs(View, { style: [styles7.card, { backgroundColor: colors.surface, borderColor: accentColor }], testID, children: [
+    /* @__PURE__ */ jsx(Text, { style: [styles7.cardTitle, { color: accentColor }], children: message.titleText }),
+    /* @__PURE__ */ jsx(Text, { style: [styles7.cardMessage, { color: colors.textSecondary }], children: message.messageText })
   ] });
 }
 function useContentBody(state, children, testID) {
@@ -1734,18 +1832,45 @@ function useContentBody(state, children, testID) {
     return /* @__PURE__ */ jsx(MessageCard, { accentColor: errorColor, message: state.forbidden, testID: `${testID}${APP_SHELL_SUFFIX.forbidden}` });
   if (state.error)
     return /* @__PURE__ */ jsx(MessageCard, { accentColor: errorColor, message: state.error, testID: `${testID}${APP_SHELL_SUFFIX.error}` });
-  return /* @__PURE__ */ jsxs(View, { style: styles6.loadingHost, children: [
+  return /* @__PURE__ */ jsxs(View, { style: styles7.loadingHost, children: [
     children,
     state.loading === true ? /* @__PURE__ */ jsx(
       View,
       {
-        style: [styles6.loadingOverlay, { backgroundColor: theme.colors.background }],
+        style: [styles7.loadingOverlay, { backgroundColor: theme.colors.background }],
         testID: `${testID}${APP_SHELL_SUFFIX.loading}`,
         children: /* @__PURE__ */ jsx(ActivityIndicator, { color: primary, size: "large" })
       }
     ) : null
   ] });
 }
+var CLOSE_GLYPH = "\u2715";
+var CLOSE_GLYPH_FONT_SIZE = 18;
+var BAR_PADDING = 12;
+var styles8 = StyleSheet.create({
+  bar: { flexDirection: "row", alignItems: "center", paddingLeft: BAR_PADDING, borderBottomWidth: 1 },
+  brand: { flex: 1 },
+  close: { minWidth: MIN_TOUCH_TARGET, minHeight: MIN_TOUCH_TARGET, alignItems: "center", justifyContent: "center" },
+  glyph: { fontSize: CLOSE_GLYPH_FONT_SIZE, fontWeight: "700" }
+});
+var DrawerHeaderBar = ({ brand, closeLabel, closeHint, onClose, testID }) => {
+  const { theme } = useUi();
+  return /* @__PURE__ */ jsxs(View, { style: [styles8.bar, { borderBottomColor: theme.colors.border }], testID, children: [
+    /* @__PURE__ */ jsx(View, { style: styles8.brand, children: brand }),
+    /* @__PURE__ */ jsx(
+      FocusableTouchable,
+      {
+        accessibilityHint: closeHint,
+        accessibilityLabel: closeLabel,
+        ringColor: theme.palette.primary["500"],
+        style: styles8.close,
+        testID: `${testID}-close`,
+        onPress: onClose,
+        children: /* @__PURE__ */ jsx(Text, { style: [styles8.glyph, { color: theme.colors.text }], children: CLOSE_GLYPH })
+      }
+    )
+  ] });
+};
 var SCRIM_COLOR = "rgba(0, 0, 0, 0.5)";
 var MENU_GLYPH2 = "\u2630";
 var MENU_GLYPH_FONT_SIZE = 20;
@@ -1766,7 +1891,7 @@ var DEFAULT_DRAWER_LABELS = {
   closeLabel: "Close menu",
   closeHint: "Close the navigation menu"
 };
-var styles7 = StyleSheet.create({
+var styles9 = StyleSheet.create({
   overlay: { ...StyleSheet.absoluteFillObject, zIndex: DRAWER_Z_INDEX },
   // The scrim's tap-to-close hit area is anchored to the RIGHT of the panel
   // (`left: DRAWER_WIDTH`), so it NEVER overlaps the panel: nav-item taps always
@@ -1784,6 +1909,8 @@ var styles7 = StyleSheet.create({
   // so on react-native-web it — and the nav leaves inside it — sit above the scrim
   // and receive presses instead of the scrim swallowing them.
   panel: { position: "absolute", top: 0, bottom: 0, left: 0, width: DRAWER_WIDTH, zIndex: PANEL_Z_INDEX },
+  panelFull: { width: "100%" },
+  panelBody: { flex: 1 },
   menuToggle: {
     minWidth: MIN_TOUCH_TARGET,
     minHeight: MIN_TOUCH_TARGET,
@@ -1801,10 +1928,10 @@ var MenuToggle = ({ label, hint, onOpen, testID }) => {
       accessibilityHint: hint,
       accessibilityLabel: label,
       ringColor: theme.palette.primary["500"],
-      style: styles7.menuToggle,
+      style: styles9.menuToggle,
       testID,
       onPress: onOpen,
-      children: /* @__PURE__ */ jsx(Text, { style: [styles7.menuToggleGlyph, { color: theme.colors.text }], children: MENU_GLYPH2 })
+      children: /* @__PURE__ */ jsx(Text, { style: [styles9.menuToggleGlyph, { color: theme.colors.text }], children: MENU_GLYPH2 })
     }
   );
 };
@@ -1813,10 +1940,14 @@ var MobileDrawer = ({
   labels,
   onClose,
   drawerTestID,
-  scrimTestID
+  scrimTestID,
+  header,
+  width = "default"
 }) => {
   const { theme } = useUi();
   const panelRef = useRef(null);
+  const isFull = width === "full";
+  const showHeaderBar = header !== void 0 || isFull;
   useEffect(() => {
     const node = panelRef.current;
     if (node === null || typeof node.addEventListener !== "function") return void 0;
@@ -1830,27 +1961,39 @@ var MobileDrawer = ({
     node.addEventListener("click", handleClick);
     return () => node.removeEventListener("click", handleClick);
   }, [onClose]);
-  return /* @__PURE__ */ jsxs(View, { style: styles7.overlay, children: [
-    /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsxs(View, { style: styles9.overlay, children: [
+    isFull ? null : /* @__PURE__ */ jsx(
       Pressable,
       {
         accessibilityHint: labels.closeHint,
         accessibilityLabel: labels.closeLabel,
         accessibilityRole: "button",
-        style: styles7.scrim,
+        style: styles9.scrim,
         testID: scrimTestID,
         onPress: onClose
       }
     ),
-    /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsxs(
       View,
       {
         ref: panelRef,
         "aria-modal": true,
         role: "dialog",
-        style: [styles7.panel, { backgroundColor: theme.colors.surface }],
+        style: [styles9.panel, isFull ? styles9.panelFull : null, { backgroundColor: theme.colors.surface }],
         testID: drawerTestID,
-        children: renderTextSlot(sidebar, { color: theme.colors.text })
+        children: [
+          showHeaderBar ? /* @__PURE__ */ jsx(
+            DrawerHeaderBar,
+            {
+              brand: header,
+              closeHint: labels.closeHint,
+              closeLabel: labels.closeLabel,
+              testID: `${drawerTestID}-header`,
+              onClose
+            }
+          ) : null,
+          /* @__PURE__ */ jsx(NavAccordionContext.Provider, { value: true, children: showHeaderBar ? /* @__PURE__ */ jsx(View, { style: styles9.panelBody, children: renderTextSlot(sidebar, { color: theme.colors.text }) }) : renderTextSlot(sidebar, { color: theme.colors.text }) })
+        ]
       }
     )
   ] });
@@ -1866,7 +2009,7 @@ function useContentMaxWidth(width) {
   return resolveContentMaxWidth(width, viewport);
 }
 var DEFAULT_CONTENT_PADDING = 24;
-var styles8 = StyleSheet.create({
+var styles10 = StyleSheet.create({
   root: { flex: 1 },
   // Auth-pending spinner: an opaque absolute overlay over the mounted shell, so
   // `children` (and any navigator they host) are never unmounted while the gate
@@ -1928,13 +2071,13 @@ var AppShell = ({
   }, [isUnauthenticated, gate]);
   const gatePending = gate?.pending === true;
   if (isUnauthenticated) return null;
-  const columnStyle = maxWidth === "full" ? styles8.columnFull : [styles8.columnCapped, { maxWidth }];
-  const navInnerStyle = chromeAlignment === "content" && maxWidth !== "full" ? [styles8.chromeCapped, { maxWidth, paddingHorizontal: contentPadding }] : void 0;
+  const columnStyle = maxWidth === "full" ? styles10.columnFull : [styles10.columnCapped, { maxWidth }];
+  const navInnerStyle = chromeAlignment === "content" && maxWidth !== "full" ? [styles10.chromeCapped, { maxWidth, paddingHorizontal: contentPadding }] : void 0;
   const scroller = /* @__PURE__ */ jsxs(
     ScrollView,
     {
-      contentContainerStyle: [styles8.scrollContent, { padding: contentPadding }],
-      style: styles8.scroll,
+      contentContainerStyle: [styles10.scrollContent, { padding: contentPadding }],
+      style: styles10.scroll,
       testID: `${testID}${APP_SHELL_SUFFIX.content}`,
       children: [
         look.band,
@@ -1942,7 +2085,7 @@ var AppShell = ({
       ]
     }
   );
-  const headerRegion = useDrawer ? /* @__PURE__ */ jsxs(View, { style: [styles8.headerRow, look.chrome], testID: `${testID}${APP_SHELL_SUFFIX.header}`, children: [
+  const headerRegion = useDrawer ? /* @__PURE__ */ jsxs(View, { style: [styles10.headerRow, look.chrome], testID: `${testID}${APP_SHELL_SUFFIX.header}`, children: [
     /* @__PURE__ */ jsx(
       MenuToggle,
       {
@@ -1952,14 +2095,14 @@ var AppShell = ({
         onOpen: openDrawer
       }
     ),
-    /* @__PURE__ */ jsx(View, { style: styles8.headerFill, children: renderTextSlot(header, { color: look.chromeText }) })
+    /* @__PURE__ */ jsx(View, { style: styles10.headerFill, children: renderTextSlot(header, { color: look.chromeText }) })
   ] }) : /* @__PURE__ */ jsx(View, { style: look.chrome, testID: `${testID}${APP_SHELL_SUFFIX.header}`, children: renderTextSlot(header, { color: look.chromeText }) });
   const railRegion = railMode === "full" ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.sidebar}`, children: renderTextSlot(sidebar, { color: theme.colors.text }) }) : railMode === "collapsed" ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.collapsedSidebar}`, children: renderTextSlot(collapsedSidebar, { color: theme.colors.text }) }) : null;
-  return /* @__PURE__ */ jsxs(View, { style: [styles8.root, look.root], testID, children: [
+  return /* @__PURE__ */ jsxs(View, { style: [styles10.root, look.root], testID, children: [
     headerRegion,
     nav !== void 0 ? /* @__PURE__ */ jsx(View, { style: look.chrome, testID: `${testID}${APP_SHELL_SUFFIX.nav}`, children: navInnerStyle !== void 0 ? /* @__PURE__ */ jsx(View, { style: navInnerStyle, children: renderTextSlot(nav, { color: look.chromeText }) }) : renderTextSlot(nav, { color: look.chromeText }) }) : null,
     banner !== void 0 ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.banner}`, children: renderTextSlot(banner, { color: theme.colors.text }) }) : null,
-    railRegion !== null ? /* @__PURE__ */ jsxs(View, { style: styles8.bodyRow, children: [
+    railRegion !== null ? /* @__PURE__ */ jsxs(View, { style: styles10.bodyRow, children: [
       railRegion,
       scroller
     ] }) : scroller,
@@ -1968,15 +2111,17 @@ var AppShell = ({
       {
         drawerTestID: `${testID}${APP_SHELL_SUFFIX.drawer}`,
         labels: drawerLabels,
+        header: mobileMenu?.header,
         scrimTestID: `${testID}${APP_SHELL_SUFFIX.scrim}`,
-        sidebar,
+        sidebar: mobileMenu?.sidebar ?? sidebar,
+        width: mobileMenu?.width,
         onClose: closeDrawer
       }
     ) : null,
     gatePending ? /* @__PURE__ */ jsx(
       View,
       {
-        style: [styles8.pendingOverlay, { backgroundColor: theme.colors.background }],
+        style: [styles10.pendingOverlay, { backgroundColor: theme.colors.background }],
         testID: `${testID}${APP_SHELL_SUFFIX.pending}`,
         children: /* @__PURE__ */ jsx(ActivityIndicator, { color: primary, size: "large" })
       }
@@ -2037,6 +2182,45 @@ var CollapsedRail = ({
     }
   );
 };
+function renderShellSidebar({ sideRail, nav, width, showBrand }) {
+  const brandSlot = sideRail.brand ?? sideRail.title;
+  return /* @__PURE__ */ jsx(
+    Sidebar,
+    {
+      collapseHint: sideRail.collapseHint,
+      containerStyle: sideRail.containerStyle,
+      enableInlineSearch: sideRail.enableInlineSearch,
+      expandHint: sideRail.expandHint,
+      footer: sideRail.footer,
+      header: sideRail.header,
+      items: sideRail.items,
+      navigateHint: nav.navigateHint,
+      paletteTrigger: sideRail.paletteTrigger,
+      pathname: nav.pathname,
+      regionLabel: nav.regionLabel,
+      renderChevron: sideRail.renderChevron,
+      search: sideRail.search,
+      searchQuery: sideRail.searchQuery,
+      title: showBrand ? brandSlot : null,
+      width,
+      onNavigate: nav.onNavigate,
+      onSearchChange: sideRail.onSearchChange
+    }
+  );
+}
+var styles11 = StyleSheet.create({
+  row: { flexDirection: "row", alignItems: "center" },
+  brand: { justifyContent: "center", paddingHorizontal: 12 },
+  fill: { flex: 1 }
+});
+var TopbarBrandRow = ({ brand, brandWidth, testID, children }) => {
+  const { width } = useWindowDimensions();
+  if (width < RAIL_FULL_BREAKPOINT) return /* @__PURE__ */ jsx(Fragment, { children });
+  return /* @__PURE__ */ jsxs(View, { style: styles11.row, testID, children: [
+    /* @__PURE__ */ jsx(View, { style: [styles11.brand, brandWidth !== void 0 ? { width: brandWidth } : null], testID: `${testID}-brand`, children: brand }),
+    /* @__PURE__ */ jsx(View, { style: styles11.fill, children })
+  ] });
+};
 function wantsTopBar(layout, hasHeader) {
   return layout === "top" || layout === "both" || hasHeader;
 }
@@ -2055,6 +2239,11 @@ var NavShell = ({
   children,
   collapsedSidebar: collapsedSidebarProp,
   collapsedRailRange: collapsedRailRangeProp,
+  brandPlacement = NAV_BRAND_DEFAULTS.brandPlacement,
+  sidebarWidth = NAV_BRAND_DEFAULTS.sidebarWidth,
+  drawerHeader = NAV_BRAND_DEFAULTS.drawerHeader,
+  drawerWidth = NAV_BRAND_DEFAULTS.drawerWidth,
+  mobileMenu,
   ...shellProps
 }) => {
   const showTopBar = wantsTopBar(layout, header !== void 0);
@@ -2080,28 +2269,13 @@ var NavShell = ({
       onNavigate
     }
   ) : null;
-  const sidebarNode = showSideRail && sideRail !== void 0 ? /* @__PURE__ */ jsx(
-    Sidebar,
-    {
-      collapseHint: sideRail.collapseHint,
-      containerStyle: sideRail.containerStyle,
-      enableInlineSearch: sideRail.enableInlineSearch,
-      expandHint: sideRail.expandHint,
-      footer: sideRail.footer,
-      header: sideRail.header,
-      items: sideRail.items,
-      navigateHint,
-      paletteTrigger: sideRail.paletteTrigger,
-      pathname,
-      regionLabel,
-      renderChevron: sideRail.renderChevron,
-      search: sideRail.search,
-      searchQuery: sideRail.searchQuery,
-      title: sideRail.brand ?? sideRail.title,
-      onNavigate,
-      onSearchChange: sideRail.onSearchChange
-    }
-  ) : void 0;
+  const nav = { pathname, onNavigate, regionLabel, navigateHint };
+  const rail = showSideRail ? sideRail : void 0;
+  const brandInBar = brandPlacement === "topbar" && rail?.brand !== void 0;
+  const brandInDrawer = drawerHeader === "brand" ? rail?.brand : void 0;
+  const sidebarNode = rail === void 0 ? void 0 : renderShellSidebar({ sideRail: rail, nav, width: sidebarWidth, showBrand: !brandInBar });
+  const drawerSidebar = rail !== void 0 && brandInDrawer !== void 0 && !brandInBar ? renderShellSidebar({ sideRail: rail, nav, width: sidebarWidth, showBrand: false }) : void 0;
+  const shellHeader = brandInBar ? /* @__PURE__ */ jsx(TopbarBrandRow, { brand: rail?.brand, brandWidth: SIDEBAR_WIDTH_PX[sidebarWidth], testID: `${shellProps.testID}-topbar-brand-row`, children: headerNode }) : headerNode;
   const collapsedCfg = showSideRail ? sideRail?.collapsed : void 0;
   const collapsedNode = collapsedCfg !== void 0 && sideRail !== void 0 ? /* @__PURE__ */ jsx(
     CollapsedRail,
@@ -2122,7 +2296,8 @@ var NavShell = ({
       ...shellProps,
       collapsedRailRange: collapsedRange,
       collapsedSidebar: collapsedNode,
-      header: headerNode,
+      header: shellHeader,
+      mobileMenu: { ...mobileMenu, header: brandInDrawer, width: drawerWidth, sidebar: drawerSidebar },
       sidebar: sidebarNode,
       children
     }
@@ -2345,7 +2520,7 @@ var KEY_DOWN = "ArrowDown";
 var KEY_UP = "ArrowUp";
 var KEY_ENTER = "Enter";
 var KEY_ESCAPE = "Escape";
-var styles9 = StyleSheet.create({
+var styles12 = StyleSheet.create({
   overlay: { ...StyleSheet.absoluteFillObject, zIndex: OVERLAY_Z_INDEX, alignItems: "center" },
   scrim: { ...StyleSheet.absoluteFillObject, backgroundColor: SCRIM_COLOR2 },
   panel: {
@@ -2374,14 +2549,14 @@ var PaletteRow = ({ item, selected, onChoose }) => {
       accessibilityLabel: item.label,
       accessibilityRole: "button",
       accessibilityState: { selected },
-      style: [styles9.row, selected ? { backgroundColor: colors.border } : void 0],
+      style: [styles12.row, selected ? { backgroundColor: colors.border } : void 0],
       testID: item.testID ?? item.key,
       onPress: () => onChoose(item),
       children: [
         typeof item.renderIcon === "function" ? item.renderIcon(colors.textSecondary, NAV_ICON_SIZE) : null,
-        /* @__PURE__ */ jsxs(View, { style: styles9.rowText, children: [
-          /* @__PURE__ */ jsx(Text, { style: [styles9.rowLabel, { color: colors.text }], children: item.label }),
-          item.hint ? /* @__PURE__ */ jsx(Text, { style: [styles9.rowHint, { color: colors.textSecondary }], children: item.hint }) : null
+        /* @__PURE__ */ jsxs(View, { style: styles12.rowText, children: [
+          /* @__PURE__ */ jsx(Text, { style: [styles12.rowLabel, { color: colors.text }], children: item.label }),
+          item.hint ? /* @__PURE__ */ jsx(Text, { style: [styles12.rowHint, { color: colors.textSecondary }], children: item.hint }) : null
         ] })
       ]
     }
@@ -2421,14 +2596,14 @@ var CommandPalette = ({ open, items, onClose, labels, testID }) => {
     [results, selected, choose, onClose]
   );
   if (!open) return null;
-  return /* @__PURE__ */ jsxs(View, { style: styles9.overlay, children: [
+  return /* @__PURE__ */ jsxs(View, { style: styles12.overlay, children: [
     /* @__PURE__ */ jsx(
       Pressable,
       {
         accessibilityHint: labels.closeHint,
         accessibilityLabel: labels.closeLabel,
         accessibilityRole: "button",
-        style: styles9.scrim,
+        style: styles12.scrim,
         testID: `${testID ?? "command-palette"}-scrim`,
         onPress: onClose
       }
@@ -2439,7 +2614,7 @@ var CommandPalette = ({ open, items, onClose, labels, testID }) => {
         "aria-modal": true,
         "aria-label": labels.regionLabel,
         role: "dialog",
-        style: [styles9.panel, { backgroundColor: colors.surface, borderColor: colors.border }],
+        style: [styles12.panel, { backgroundColor: colors.surface, borderColor: colors.border }],
         testID: testID ?? "command-palette",
         children: [
           /* @__PURE__ */ jsx(
@@ -2449,14 +2624,14 @@ var CommandPalette = ({ open, items, onClose, labels, testID }) => {
               accessibilityLabel: labels.placeholder,
               placeholder: labels.placeholder,
               placeholderTextColor: colors.textSecondary,
-              style: [styles9.input, { color: colors.text, borderBottomColor: colors.border }],
+              style: [styles12.input, { color: colors.text, borderBottomColor: colors.border }],
               testID: `${testID ?? "command-palette"}-input`,
               value: query,
               onChangeText: setQuery,
               onKeyPress
             }
           ),
-          results.length === 0 ? /* @__PURE__ */ jsx(Text, { style: [styles9.empty, { color: colors.textSecondary }], children: labels.emptyText }) : /* @__PURE__ */ jsx(ScrollView, { keyboardShouldPersistTaps: "handled", style: styles9.list, children: results.map((item, index) => /* @__PURE__ */ jsx(PaletteRow, { item, selected: index === selected, onChoose: choose }, item.key)) })
+          results.length === 0 ? /* @__PURE__ */ jsx(Text, { style: [styles12.empty, { color: colors.textSecondary }], children: labels.emptyText }) : /* @__PURE__ */ jsx(ScrollView, { keyboardShouldPersistTaps: "handled", style: styles12.list, children: results.map((item, index) => /* @__PURE__ */ jsx(PaletteRow, { item, selected: index === selected, onChoose: choose }, item.key)) })
         ]
       }
     )
@@ -2561,7 +2736,7 @@ var TAB_MIN_HEIGHT = 56;
 var LABEL_SIZE = 12;
 var LABEL_GAP = 2;
 var TAB_PADDING = 4;
-var styles10 = StyleSheet.create({
+var styles13 = StyleSheet.create({
   tab: {
     flex: 1,
     minHeight: TAB_MIN_HEIGHT,
@@ -2598,31 +2773,31 @@ var BottomTab = ({
       accessibilityLabel: item.label,
       accessibilityRole: "link",
       accessibilityState: { selected: isActive },
-      style: [styles10.tab, { opacity: feedback.opacity }],
+      style: [styles13.tab, { opacity: feedback.opacity }],
       testID: item.testID ?? item.key,
       onPress: () => onPress(item.route),
       onPressIn: () => setPressed(true),
       onPressOut: () => setPressed(false),
       ...ariaCurrentProps3(isActive),
       children: [
-        /* @__PURE__ */ jsxs(Animated.View, { style: [styles10.iconWrap, { transform: [{ scale }] }], children: [
+        /* @__PURE__ */ jsxs(Animated.View, { style: [styles13.iconWrap, { transform: [{ scale }] }], children: [
           feedback.pillScale === null ? null : /* @__PURE__ */ jsx(
             View,
             {
               pointerEvents: "none",
-              style: [styles10.pill, { backgroundColor: colors.pill, transform: [{ scale: feedback.pillScale }] }, motion]
+              style: [styles13.pill, { backgroundColor: colors.pill, transform: [{ scale: feedback.pillScale }] }, motion]
             }
           ),
           /* @__PURE__ */ jsx(View, { style: [{ transform: feedback.iconTransform }, motion], children: item.renderIcon?.(color, ICON_SIZE) })
         ] }),
-        /* @__PURE__ */ jsx(Text, { style: [styles10.label, { color }], children: item.label })
+        /* @__PURE__ */ jsx(Text, { style: [styles13.label, { color }], children: item.label })
       ]
     }
   );
 };
 var DEFAULT_TEST_ID = "bottom-tab-bar";
 var SLIDER_HEIGHT = 3;
-var styles11 = StyleSheet.create({
+var styles14 = StyleSheet.create({
   bar: { flexDirection: "row", borderTopWidth: StyleSheet.hairlineWidth },
   slider: { position: "absolute", top: 0, height: SLIDER_HEIGHT }
 });
@@ -2649,14 +2824,14 @@ var BottomTabBar = ({
     {
       "aria-label": regionLabel,
       role: "navigation",
-      style: [styles11.bar, { backgroundColor: theme.colors.surface, borderTopColor: theme.colors.border }, containerStyle],
+      style: [styles14.bar, { backgroundColor: theme.colors.surface, borderTopColor: theme.colors.border }, containerStyle],
       testID,
       children: [
         bar === null ? null : /* @__PURE__ */ jsx(
           View,
           {
             pointerEvents: "none",
-            style: [styles11.slider, { left: bar.left, width: bar.width, backgroundColor: primary }, webTransition("left", barMs, reducedMotion)]
+            style: [styles14.slider, { left: bar.left, width: bar.width, backgroundColor: primary }, webTransition("left", barMs, reducedMotion)]
           }
         ),
         items.map((item) => /* @__PURE__ */ jsx(
@@ -2677,6 +2852,6 @@ var BottomTabBar = ({
   );
 };
 
-export { ACTIVE_BORDER_RADIUS, ACTIVE_TINT_OPACITY, APP_SHELL_SUFFIX, AppShell, BASE_INDENT, BottomTabBar, BrandHomeLink, BrandMark, CHEVRON_ICON_SIZE, CollapsedRail, CommandPalette, CommandPaletteTrigger, DEFAULT_COLLAPSED_RAIL_MAX, DEFAULT_SEARCH_BREAKPOINT, DarkModeControl, HOVER_TINT_OPACITY, NAV_ICON_SIZE, NAV_LINK_GAP, NAV_ROW_RADIUS, NAV_TEST_IDS, Nav, NavBar, NavExpandableItem, NavHoverFeedback, NavOverflowMenu, NavShell, PillNav, PillNavVariant, RAIL_FULL_BREAKPOINT, Sidebar, SidebarChevron, SidebarSearch, TabFeedback, Topbar, accessibleNavItems, collapsedRailStyles, darkModeStyles, expandableStyles, filterCommands, filterNavItems, isFilterActive, isRouteActive, navStyles, pillNavStyles, resolveActiveRoute, resolveContentMaxWidth, resolvePillMenuLabel, resolveRailMode, resolveSearchAffordance, roleRoutesToNavItems, searchTokens, useCommandPaletteHotkey, useContentMaxWidth };
+export { ACTIVE_BORDER_RADIUS, ACTIVE_TINT_OPACITY, APP_SHELL_SUFFIX, AppShell, BASE_INDENT, BottomTabBar, BrandHomeLink, BrandMark, CHEVRON_ICON_SIZE, CollapsedRail, CommandPalette, CommandPaletteTrigger, DEFAULT_COLLAPSED_RAIL_MAX, DEFAULT_SEARCH_BREAKPOINT, DarkModeControl, HOVER_TINT_OPACITY, NAV_BRAND_DEFAULTS, NAV_ICON_SIZE, NAV_LINK_GAP, NAV_ROW_RADIUS, NAV_TEST_IDS, Nav, NavBar, NavExpandableItem, NavHoverFeedback, NavOverflowMenu, NavShell, PillNav, PillNavVariant, RAIL_FULL_BREAKPOINT, SIDEBAR_WIDTH_PX, Sidebar, SidebarChevron, SidebarSearch, TabFeedback, Topbar, accessibleNavItems, collapsedRailStyles, darkModeStyles, expandableStyles, filterCommands, filterNavItems, isFilterActive, isRouteActive, navStyles, pillNavStyles, resolveActiveRoute, resolveContentMaxWidth, resolvePillMenuLabel, resolveRailMode, resolveSearchAffordance, roleRoutesToNavItems, searchTokens, useCommandPaletteHotkey, useContentMaxWidth };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map