@dloizides/ui-nav 1.24.0 → 1.26.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.25.0
+
+- `PillNav` / `PillNavMenu` get an optional `menuHeading`: a visible, non-focusable heading at the top of the open `Menu` that also names it (needs `@dloizides/ui-layout` >= 1.30.0) (KEFI-EDITOR-HEADER-1 "Compact the landing editor header").
+
 ## 1.24.0
 
 - `Topbar` gets an optional `center` slot between `left` and the actions (testID `topbar-center`); callers that do not pass it render as before (KEFI-EDITOR-HEADER-1 "Compact the landing editor header").

package/dist/index.d.mts

@@ -941,6 +941,8 @@ interface PillNavProps {
     variant?: PillNavVariant;
     /** a11y hint for the `Menu` trigger. Defaults to `regionLabel`. */
     menuHint?: string;
+    /** Visible heading at the top of the open `Menu` (e.g. "Your dashboards"); also names the menu. */
+    menuHeading?: string;
     /** testID for the `Menu` trigger. Defaults to `NAV_TEST_IDS.pillNavMenu`. */
     menuTestID?: string;
     /** Forces the `Menu` dropdown variant (default: responsive). */
@@ -948,7 +950,7 @@ interface PillNavProps {
     /** Extra container style overrides. */
     containerStyle?: ViewStyle | ViewStyle[];
 }
-declare const PillNav: ({ items, pathname, onNavigate, regionLabel, navigateHint, minItems, variant, menuHint, menuTestID, dropdownVariant, containerStyle, }: PillNavProps) => React.ReactElement | null;
+declare const PillNav: ({ items, pathname, onNavigate, regionLabel, navigateHint, minItems, variant, menuHint, menuHeading, menuTestID, dropdownVariant, containerStyle, }: PillNavProps) => React.ReactElement | null;
 
 /** The label the compact menu trigger shows: the active item's label, else `fallback`. */
 declare function resolvePillMenuLabel(items: NavItem[], pathname: string, fallback: string): string;
@@ -1446,6 +1448,9 @@ declare const pillNavStyles: {
     menuTriggerText: {
         flexShrink: number;
     };
+    pillOutline: {
+        borderWidth: number;
+    };
 };
 declare const darkModeStyles: {
     segmentRow: {

package/dist/index.d.ts

@@ -941,6 +941,8 @@ interface PillNavProps {
     variant?: PillNavVariant;
     /** a11y hint for the `Menu` trigger. Defaults to `regionLabel`. */
     menuHint?: string;
+    /** Visible heading at the top of the open `Menu` (e.g. "Your dashboards"); also names the menu. */
+    menuHeading?: string;
     /** testID for the `Menu` trigger. Defaults to `NAV_TEST_IDS.pillNavMenu`. */
     menuTestID?: string;
     /** Forces the `Menu` dropdown variant (default: responsive). */
@@ -948,7 +950,7 @@ interface PillNavProps {
     /** Extra container style overrides. */
     containerStyle?: ViewStyle | ViewStyle[];
 }
-declare const PillNav: ({ items, pathname, onNavigate, regionLabel, navigateHint, minItems, variant, menuHint, menuTestID, dropdownVariant, containerStyle, }: PillNavProps) => React.ReactElement | null;
+declare const PillNav: ({ items, pathname, onNavigate, regionLabel, navigateHint, minItems, variant, menuHint, menuHeading, menuTestID, dropdownVariant, containerStyle, }: PillNavProps) => React.ReactElement | null;
 
 /** The label the compact menu trigger shows: the active item's label, else `fallback`. */
 declare function resolvePillMenuLabel(items: NavItem[], pathname: string, fallback: string): string;
@@ -1446,6 +1448,9 @@ declare const pillNavStyles: {
     menuTriggerText: {
         flexShrink: number;
     };
+    pillOutline: {
+        borderWidth: number;
+    };
 };
 declare const darkModeStyles: {
     segmentRow: {

package/dist/index.js

@@ -226,7 +226,8 @@ var pillNavStyles = reactNative.StyleSheet.create({
     justifyContent: "center"
   },
   pillText: { fontSize: 14, fontWeight: "600" },
-  menuTriggerText: { flexShrink: 1 }
+  menuTriggerText: { flexShrink: 1 },
+  pillOutline: { borderWidth: 2 }
 });
 var darkModeStyles = reactNative.StyleSheet.create({
   // Segmented Light / Dark / System control.
@@ -1874,7 +1875,6 @@ function resolvePillMenuLabel(items, pathname, fallback) {
   const active = items.find((item) => item.route === activeRoute);
   return active?.label ?? fallback;
 }
-var TEXT_ON_PRIMARY4 = "#ffffff";
 var NO_ACTIVE_ROUTE2 = "";
 var PILL_MENU_MIN_WIDTH = 200;
 var PillNavMenu = ({
@@ -1884,10 +1884,11 @@ var PillNavMenu = ({
   regionLabel,
   hint,
   testID = NAV_TEST_IDS.pillNavMenu,
-  dropdownVariant
+  dropdownVariant,
+  menuHeading
 }) => {
   const { theme } = uiFeedback.useUi();
-  const primaryColor = theme.palette.primary["500"];
+  const { colors } = theme;
   const options = React.useMemo(() => items.map((item) => ({ label: item.label, value: item.route })), [items]);
   const activeRoute = resolveActiveRoute(items, pathname) ?? NO_ACTIVE_ROUTE2;
   const label = resolvePillMenuLabel(items, pathname, regionLabel);
@@ -1900,16 +1901,18 @@ var PillNavMenu = ({
     {
       accessibilityHint: hint,
       accessibilityLabel: label,
+      menuHeading,
       menuMinWidth: PILL_MENU_MIN_WIDTH,
       optionTestID,
       options,
       testID,
       value: activeRoute,
-      variant: dropdownVariant,
+      selectedMarker: uiLayout.SelectedMarker.AccentCheck,
+      variant: dropdownVariant ?? uiLayout.DropdownVariant.Menu,
       onChange: onNavigate,
-      renderTrigger: ({ isOpen }) => /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: [pillNavStyles.pill, { backgroundColor: primaryColor }], children: [
-        /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { numberOfLines: 1, style: [pillNavStyles.pillText, pillNavStyles.menuTriggerText, { color: TEXT_ON_PRIMARY4 }], children: label }),
-        /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [pillNavStyles.pillText, { color: TEXT_ON_PRIMARY4 }], children: isOpen ? "\u25B4" : "\u25BE" })
+      renderTrigger: ({ isOpen }) => /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: [pillNavStyles.pill, pillNavStyles.pillOutline, { backgroundColor: colors.background, borderColor: colors.text }], children: [
+        /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { numberOfLines: 1, style: [pillNavStyles.pillText, pillNavStyles.menuTriggerText, { color: colors.text }], children: label }),
+        /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [pillNavStyles.pillText, { color: colors.text }], children: isOpen ? "\u25B4" : "\u25BE" })
       ] })
     }
   );
@@ -1921,7 +1924,7 @@ var PillNavVariant = /* @__PURE__ */ ((PillNavVariant2) => {
   PillNavVariant2["Menu"] = "menu";
   return PillNavVariant2;
 })(PillNavVariant || {});
-var TEXT_ON_PRIMARY5 = "#ffffff";
+var TEXT_ON_PRIMARY4 = "#ffffff";
 var DEFAULT_MIN_ITEMS = 1;
 var PillNav = ({
   items,
@@ -1932,6 +1935,7 @@ var PillNav = ({
   minItems = DEFAULT_MIN_ITEMS,
   variant = "pills" /* Pills */,
   menuHint,
+  menuHeading,
   menuTestID,
   dropdownVariant,
   containerStyle
@@ -1947,6 +1951,7 @@ var PillNav = ({
         dropdownVariant,
         hint: menuHint ?? regionLabel,
         items,
+        menuHeading,
         pathname,
         regionLabel,
         testID: menuTestID,
@@ -1963,7 +1968,7 @@ var PillNav = ({
       style: [pillNavStyles.container, containerStyle],
       children: items.map((item) => {
         const active = item.route === activeRoute;
-        const textColor = active ? TEXT_ON_PRIMARY5 : colors.textSecondary;
+        const textColor = active ? TEXT_ON_PRIMARY4 : colors.textSecondary;
         const pillStyle = active ? { backgroundColor: primaryColor } : { backgroundColor: colors.surfaceElevated };
         return /* @__PURE__ */ jsxRuntime.jsxs(
           FocusableTouchable,
@@ -1986,7 +1991,7 @@ var PillNav = ({
     }
   );
 };
-var TEXT_ON_PRIMARY6 = "#ffffff";
+var TEXT_ON_PRIMARY5 = "#ffffff";
 var DARK_MODE_ICON_SIZE = 16;
 var DarkModeControl = ({
   value,
@@ -2035,7 +2040,7 @@ var DarkModeControl = ({
       style: [darkModeStyles.segmentRow, { borderColor: colors.border }, containerStyle],
       children: options.map((option) => {
         const active = option.value === value;
-        const textColor = active ? TEXT_ON_PRIMARY6 : colors.textSecondary;
+        const textColor = active ? TEXT_ON_PRIMARY5 : colors.textSecondary;
         return /* @__PURE__ */ jsxRuntime.jsxs(
           FocusableTouchable,
           {