@dloizides/ui-nav 1.9.0 → 1.10.1

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { StyleSheet, Platform, TouchableOpacity, View, Text, useWindowDimensions, ActivityIndicator, ScrollView, Pressable } from 'react-native';
 import { useUi, UiProvider } from '@dloizides/ui-feedback';
-import React5, { useState, useCallback, useMemo, useEffect, useRef } from 'react';
+import React2, { useState, useCallback, useMemo, useEffect, useRef } from 'react';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { ModalDropdown } from '@dloizides/ui-layout';
 import { resolveAccessibleRoutes } from '@dloizides/auth-web';
@@ -378,6 +378,17 @@ var NavExpandableItem = ({
     )) }) : null
   ] });
 };
+function isBareText(node) {
+  return typeof node === "string" || typeof node === "number";
+}
+function renderTextSlot(node, style) {
+  if (node === void 0 || node === null) return node;
+  if (isBareText(node)) return /* @__PURE__ */ jsx(Text, { style, children: node });
+  return React2.Children.map(
+    node,
+    (child) => isBareText(child) ? /* @__PURE__ */ jsx(Text, { style, children: child }) : child
+  );
+}
 var Sidebar = ({
   items,
   pathname,
@@ -407,7 +418,7 @@ var Sidebar = ({
       ],
       children: [
         /* @__PURE__ */ jsx(Text, { accessibilityRole: "header", style: [navStyles.sidebarTitle, { color: colors.text }], children: title }),
-        header,
+        renderTextSlot(header, { color: colors.text }),
         items.map((item) => /* @__PURE__ */ jsx(
           NavExpandableItem,
           {
@@ -422,7 +433,7 @@ var Sidebar = ({
           item.key
         )),
         /* @__PURE__ */ jsx(View, { style: navStyles.sidebarSpacer }),
-        footer
+        renderTextSlot(footer, { color: colors.text })
       ]
     }
   );
@@ -525,7 +536,7 @@ var Topbar = ({
         containerStyle
       ],
       children: [
-        /* @__PURE__ */ jsx(View, { style: navStyles.topbarLeft, children: left }),
+        /* @__PURE__ */ jsx(View, { style: navStyles.topbarLeft, children: renderTextSlot(left, { color: colors.text }) }),
         /* @__PURE__ */ jsxs(View, { style: navStyles.topbarRight, children: [
           language ? /* @__PURE__ */ jsx(
             FocusableTouchable,
@@ -534,11 +545,12 @@ var Topbar = ({
               accessibilityLabel: language.label,
               ringColor: primaryColor,
               style: navStyles.topbarRowItem,
+              testID: language.testID,
               onPress: language.onPress,
               children: /* @__PURE__ */ jsx(Text, { style: [navStyles.topbarLabel, { color: colors.text }], children: language.label })
             }
           ) : null,
-          notificationSlot,
+          renderTextSlot(notificationSlot, { color: colors.text }),
           user ? /* @__PURE__ */ jsxs(View, { style: navStyles.userBlock, children: [
             /* @__PURE__ */ jsx(Text, { style: [navStyles.userName, { color: colors.text }], children: user.name }),
             /* @__PURE__ */ jsx(Text, { style: [navStyles.userEmail, { color: colors.textSecondary }], children: user.email })
@@ -547,10 +559,10 @@ var Topbar = ({
             richAccount.onAccount ? /* @__PURE__ */ jsx(
               FocusableTouchable,
               {
-                accessibilityHint: richAccount.displayName,
+                accessibilityHint: richAccount.accountHint ?? richAccount.displayName,
                 accessibilityLabel: richAccount.displayName,
                 ringColor: primaryColor,
-                testID: NAV_TEST_IDS.accountName,
+                testID: richAccount.accountTestID ?? NAV_TEST_IDS.accountName,
                 onPress: richAccount.onAccount,
                 children: /* @__PURE__ */ jsx(Text, { style: [navStyles.userName, { color: colors.text }], children: richAccount.displayName })
               }
@@ -847,7 +859,7 @@ var NavBarInner = ({
         containerStyle
       ],
       children: /* @__PURE__ */ jsxs(View, { style: [navBarStyles.inner, collapsed ? null : navBarStyles.innerNoWrap, innerCapStyle], children: [
-        brand !== void 0 ? /* @__PURE__ */ jsx(View, { style: navBarStyles.brand, children: brand }) : null,
+        brand !== void 0 ? /* @__PURE__ */ jsx(View, { style: navBarStyles.brand, children: renderTextSlot(brand, { color: colors.text }) }) : null,
         collapsed ? /* @__PURE__ */ jsx(
           Pressable,
           {
@@ -880,7 +892,7 @@ var NavBarInner = ({
             }
           );
           if (collapsed) {
-            return /* @__PURE__ */ jsx(View, { nativeID: LINKS_REGION_ID, style: navBarStyles.linksStacked, testID: NAV_TEST_IDS.navBarLinks, children: items.map((item) => /* @__PURE__ */ jsx(React5.Fragment, { children: renderLink(item) }, item.key)) });
+            return /* @__PURE__ */ jsx(View, { nativeID: LINKS_REGION_ID, style: navBarStyles.linksStacked, testID: NAV_TEST_IDS.navBarLinks, children: items.map((item) => /* @__PURE__ */ jsx(React2.Fragment, { children: renderLink(item) }, item.key)) });
           }
           const visibleItems = items.slice(0, visibleCount);
           const overflowItems = items.slice(visibleCount);
@@ -924,7 +936,7 @@ var NavBarInner = ({
             }
           );
         })() : null,
-        showLinks && right !== void 0 ? /* @__PURE__ */ jsx(View, { style: collapsed ? navBarStyles.rightStacked : navBarStyles.right, children: right }) : null
+        showLinks && right !== void 0 ? /* @__PURE__ */ jsx(View, { style: collapsed ? navBarStyles.rightStacked : navBarStyles.right, children: renderTextSlot(right, { color: colors.text }) }) : null
       ] })
     }
   );
@@ -1028,6 +1040,7 @@ var MobileDrawer = ({
   drawerTestID,
   scrimTestID
 }) => {
+  const { theme } = useUi();
   const panelRef = useRef(null);
   useEffect(() => {
     const node = panelRef.current;
@@ -1052,7 +1065,7 @@ var MobileDrawer = ({
         onPress: onClose
       }
     ),
-    /* @__PURE__ */ jsx(View, { ref: panelRef, "aria-modal": true, role: "dialog", style: styles2.panel, testID: drawerTestID, children: sidebar })
+    /* @__PURE__ */ jsx(View, { ref: panelRef, "aria-modal": true, role: "dialog", style: styles2.panel, testID: drawerTestID, children: renderTextSlot(sidebar, { color: theme.colors.text }) })
   ] });
 };
 
@@ -1159,13 +1172,13 @@ var AppShell = ({
         onOpen: openDrawer
       }
     ),
-    /* @__PURE__ */ jsx(View, { style: styles3.headerFill, children: header })
-  ] }) : /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.header}`, children: header });
-  const railRegion = railMode === "full" ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.sidebar}`, children: sidebar }) : railMode === "collapsed" ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.collapsedSidebar}`, children: collapsedSidebar }) : null;
+    /* @__PURE__ */ jsx(View, { style: styles3.headerFill, children: renderTextSlot(header, { color: theme.colors.text }) })
+  ] }) : /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.header}`, children: renderTextSlot(header, { color: theme.colors.text }) });
+  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: [styles3.root, { backgroundColor: theme.colors.background }], testID, children: [
     headerRegion,
-    nav !== void 0 ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.nav}`, children: navInnerStyle !== void 0 ? /* @__PURE__ */ jsx(View, { style: navInnerStyle, children: nav }) : nav }) : null,
-    banner !== void 0 ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.banner}`, children: banner }) : null,
+    nav !== void 0 ? /* @__PURE__ */ jsx(View, { testID: `${testID}${APP_SHELL_SUFFIX.nav}`, children: navInnerStyle !== void 0 ? /* @__PURE__ */ jsx(View, { style: navInnerStyle, children: renderTextSlot(nav, { color: theme.colors.text }) }) : renderTextSlot(nav, { color: theme.colors.text }) }) : 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: styles3.bodyRow, children: [
       railRegion,
       scroller
@@ -1211,7 +1224,7 @@ var CollapsedRail = ({
         containerStyle
       ],
       children: [
-        header !== void 0 ? /* @__PURE__ */ jsx(View, { style: collapsedRailStyles.slot, children: header }) : null,
+        header !== void 0 ? /* @__PURE__ */ jsx(View, { style: collapsedRailStyles.slot, children: renderTextSlot(header, { color: colors.text }) }) : null,
         items.map((item) => {
           const active = isRouteActive(pathname, item.route);
           const iconColor = active ? primaryColor : colors.textSecondary;
@@ -1230,13 +1243,13 @@ var CollapsedRail = ({
           );
         }),
         /* @__PURE__ */ jsx(View, { style: collapsedRailStyles.spacer }),
-        footer !== void 0 ? /* @__PURE__ */ jsx(View, { style: collapsedRailStyles.slot, children: footer }) : null
+        footer !== void 0 ? /* @__PURE__ */ jsx(View, { style: collapsedRailStyles.slot, children: renderTextSlot(footer, { color: colors.text }) }) : null
       ]
     }
   );
 };
-function wantsTopBar(layout, hasHeader, hasTopBar) {
-  return layout === "top" || layout === "both" || hasHeader || layout === "side" && hasTopBar;
+function wantsTopBar(layout, hasHeader) {
+  return layout === "top" || layout === "both" || hasHeader;
 }
 function wantsSideRail(layout, hasSideRail) {
   return (layout === "side" || layout === "both") && hasSideRail;
@@ -1255,7 +1268,7 @@ var NavShell = ({
   collapsedRailRange: collapsedRailRangeProp,
   ...shellProps
 }) => {
-  const showTopBar = wantsTopBar(layout, header !== void 0, topBar !== void 0);
+  const showTopBar = wantsTopBar(layout, header !== void 0);
   const showSideRail = wantsSideRail(layout, sideRail !== void 0);
   const headerNode = header !== void 0 ? header : showTopBar && topBar !== void 0 ? /* @__PURE__ */ jsx(
     NavBar,