@dloizides/ui-nav 1.31.0 → 1.33.0

package/dist/index.d.mts

@@ -1392,7 +1392,7 @@ declare const navStyles: {
         paddingHorizontal: number;
     };
     topbarContainer: {
-        height: number;
+        minHeight: number;
         paddingHorizontal: number;
         borderBottomWidth: number;
         flexDirection: "row";
@@ -1446,6 +1446,7 @@ declare const navStyles: {
     };
     userEmail: {
         fontSize: number;
+        maxWidth: "100%";
     };
     accountBtn: {
         marginLeft: number;

package/dist/index.d.ts

@@ -1392,7 +1392,7 @@ declare const navStyles: {
         paddingHorizontal: number;
     };
     topbarContainer: {
-        height: number;
+        minHeight: number;
         paddingHorizontal: number;
         borderBottomWidth: number;
         flexDirection: "row";
@@ -1446,6 +1446,7 @@ declare const navStyles: {
     };
     userEmail: {
         fontSize: number;
+        maxWidth: "100%";
     };
     accountBtn: {
         marginLeft: number;

package/dist/index.js

@@ -66,7 +66,7 @@ var navStyles = reactNative.StyleSheet.create({
   },
   // --- Topbar ---
   topbarContainer: {
-    height: 64,
+    minHeight: 64,
     paddingHorizontal: 12,
     borderBottomWidth: 1,
     flexDirection: "row",
@@ -87,7 +87,7 @@ var navStyles = reactNative.StyleSheet.create({
   userBlock: { marginHorizontal: 12, alignItems: "flex-end", flexShrink: 1, minWidth: 0 },
   userName: { fontWeight: "600", maxWidth: "100%" },
   accountNameBtn: { flexShrink: 1, maxWidth: "100%", minHeight: MIN_TOUCH_TARGET, minWidth: MIN_TOUCH_TARGET, justifyContent: "center", alignItems: "flex-end" },
-  userEmail: { fontSize: 12 },
+  userEmail: { fontSize: 12, maxWidth: "100%" },
   accountBtn: {
     marginLeft: 8,
     paddingHorizontal: 10,
@@ -938,7 +938,24 @@ var FocusableTouchable = ({
     }
   );
 };
+var RAIL_FULL_BREAKPOINT = uiLayout.LAYOUT_COLLAPSE_BREAKPOINT;
+var DEFAULT_COLLAPSED_RAIL_MAX = 1024;
+function resolveRailMode({ viewport, hasSidebar, hasCollapsed, range }) {
+  if (!hasSidebar) return "none";
+  if (hasCollapsed) {
+    if (viewport >= range.max) return "full";
+    if (viewport >= range.min) return "collapsed";
+    return "drawer";
+  }
+  return viewport >= RAIL_FULL_BREAKPOINT ? "full" : "drawer";
+}
 var TEXT_ON_PRIMARY = "#ffffff";
+var ON_BRAND_SCALE = "onBrand";
+var USER_BLOCK_COMPACT = { marginHorizontal: 4 };
+var CONTAINER_STACKED = { flexWrap: "wrap" };
+var USER_ROW_STACKED = { flexBasis: "100%", alignItems: "flex-end", paddingBottom: 8 };
+var MAIN_STEP = "500";
+var WRAP_ANYWHERE = reactNative.Platform.OS === "web" ? { overflowWrap: "anywhere" } : null;
 function isAccountState(account) {
   return "displayName" in account;
 }
@@ -948,6 +965,14 @@ function planToneColor(theme, tone) {
   if (tone === "enterprise") return palette.accent?.["500"] ?? palette.primary["500"];
   return theme.colors.textSecondary;
 }
+function onBrandInk(palette) {
+  const scales = palette;
+  return scales[ON_BRAND_SCALE]?.[MAIN_STEP] ?? TEXT_ON_PRIMARY;
+}
+function planBadgeInk(theme, tone) {
+  const fillIsPrimary = planToneColor(theme, tone) === theme.palette.primary["500"];
+  return fillIsPrimary ? onBrandInk(theme.palette) : TEXT_ON_PRIMARY;
+}
 var Topbar = ({
   left,
   center,
@@ -961,15 +986,60 @@ var Topbar = ({
   const { theme } = uiFeedback.useUi();
   const colors = theme.colors;
   const primaryColor = theme.palette.primary["500"];
+  const onPrimaryInk = onBrandInk(theme.palette);
+  const { width: viewportWidth } = reactNative.useWindowDimensions();
+  const stacked = viewportWidth < uiLayout.HEADER_STACK_BREAKPOINT;
+  const userBlockStyle = [
+    navStyles.userBlock,
+    viewportWidth < RAIL_FULL_BREAKPOINT ? USER_BLOCK_COMPACT : null,
+    stacked ? USER_ROW_STACKED : null
+  ];
   const richAccount = account !== void 0 && isAccountState(account) ? account : void 0;
   const legacyAccount = account !== void 0 && !isAccountState(account) ? account : void 0;
   const upgrade = richAccount?.upgrade;
+  const identityBlocks = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    user ? /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { accessible: true, accessibilityLabel: `${user.name}, ${user.email}`, style: userBlockStyle, children: [
+      /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.userName, WRAP_ANYWHERE, { color: colors.text }], children: user.name }),
+      /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.userEmail, WRAP_ANYWHERE, { color: colors.textSecondary }], children: user.email })
+    ] }) : null,
+    richAccount ? /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: userBlockStyle, children: [
+      richAccount.onAccount ? /* @__PURE__ */ jsxRuntime.jsx(
+        FocusableTouchable,
+        {
+          accessibilityHint: richAccount.accountHint ?? richAccount.displayName,
+          accessibilityLabel: richAccount.displayName,
+          ringColor: primaryColor,
+          style: navStyles.accountNameBtn,
+          testID: richAccount.accountTestID ?? NAV_TEST_IDS.accountName,
+          onPress: richAccount.onAccount,
+          children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { numberOfLines: 1, style: [navStyles.userName, { color: colors.text }], children: richAccount.displayName })
+        }
+      ) : /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { numberOfLines: 1, style: [navStyles.userName, { color: colors.text }], testID: NAV_TEST_IDS.accountName, children: richAccount.displayName }),
+      richAccount.tenantName !== void 0 ? /* @__PURE__ */ jsxRuntime.jsx(
+        reactNative.Text,
+        {
+          style: [navStyles.accountTenant, { color: colors.textSecondary }],
+          testID: NAV_TEST_IDS.accountTenant,
+          children: richAccount.tenantName
+        }
+      ) : null,
+      richAccount.plan ? /* @__PURE__ */ jsxRuntime.jsx(
+        reactNative.View,
+        {
+          style: [navStyles.planBadge, { backgroundColor: planToneColor(theme, richAccount.plan.tone) }],
+          testID: NAV_TEST_IDS.accountPlan,
+          children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.planBadgeText, { color: planBadgeInk(theme, richAccount.plan.tone) }], children: richAccount.plan.label })
+        }
+      ) : null
+    ] }) : null
+  ] });
   return /* @__PURE__ */ jsxRuntime.jsxs(
     reactNative.View,
     {
       style: [
         navStyles.topbarContainer,
         { borderBottomColor: colors.border, backgroundColor: colors.background },
+        stacked ? CONTAINER_STACKED : null,
         containerStyle
       ],
       children: [
@@ -989,40 +1059,7 @@ var Topbar = ({
             }
           ) : null,
           renderTextSlot(notificationSlot, { color: colors.text }),
-          user ? /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: navStyles.userBlock, children: [
-            /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.userName, { color: colors.text }], children: user.name }),
-            /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.userEmail, { color: colors.textSecondary }], children: user.email })
-          ] }) : null,
-          richAccount ? /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: navStyles.userBlock, children: [
-            richAccount.onAccount ? /* @__PURE__ */ jsxRuntime.jsx(
-              FocusableTouchable,
-              {
-                accessibilityHint: richAccount.accountHint ?? richAccount.displayName,
-                accessibilityLabel: richAccount.displayName,
-                ringColor: primaryColor,
-                style: navStyles.accountNameBtn,
-                testID: richAccount.accountTestID ?? NAV_TEST_IDS.accountName,
-                onPress: richAccount.onAccount,
-                children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { numberOfLines: 1, style: [navStyles.userName, { color: colors.text }], children: richAccount.displayName })
-              }
-            ) : /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { numberOfLines: 1, style: [navStyles.userName, { color: colors.text }], testID: NAV_TEST_IDS.accountName, children: richAccount.displayName }),
-            richAccount.tenantName !== void 0 ? /* @__PURE__ */ jsxRuntime.jsx(
-              reactNative.Text,
-              {
-                style: [navStyles.accountTenant, { color: colors.textSecondary }],
-                testID: NAV_TEST_IDS.accountTenant,
-                children: richAccount.tenantName
-              }
-            ) : null,
-            richAccount.plan ? /* @__PURE__ */ jsxRuntime.jsx(
-              reactNative.View,
-              {
-                style: [navStyles.planBadge, { backgroundColor: planToneColor(theme, richAccount.plan.tone) }],
-                testID: NAV_TEST_IDS.accountPlan,
-                children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.planBadgeText, { color: TEXT_ON_PRIMARY }], children: richAccount.plan.label })
-              }
-            ) : null
-          ] }) : null,
+          stacked ? null : identityBlocks,
           legacyAccount ? /* @__PURE__ */ jsxRuntime.jsx(
             FocusableTouchable,
             {
@@ -1032,7 +1069,7 @@ var Topbar = ({
               style: [navStyles.accountBtn, { backgroundColor: primaryColor }],
               testID: legacyAccount.testID,
               onPress: legacyAccount.onPress,
-              children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.accountText, { color: TEXT_ON_PRIMARY }], children: legacyAccount.label })
+              children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.accountText, { color: onPrimaryInk }], children: legacyAccount.label })
             }
           ) : null,
           upgrade ? /* @__PURE__ */ jsxRuntime.jsx(
@@ -1044,7 +1081,7 @@ var Topbar = ({
               style: [navStyles.accountBtn, { backgroundColor: primaryColor }],
               testID: upgrade.testID ?? NAV_TEST_IDS.accountUpgrade,
               onPress: upgrade.onPress,
-              children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.accountText, { color: TEXT_ON_PRIMARY }], children: upgrade.label })
+              children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.accountText, { color: onPrimaryInk }], children: upgrade.label })
             }
           ) : null,
           /* @__PURE__ */ jsxRuntime.jsx(
@@ -1056,10 +1093,11 @@ var Topbar = ({
               style: [navStyles.accountBtn, { backgroundColor: primaryColor }],
               testID: logout.testID,
               onPress: richAccount ? richAccount.onLogout : logout.onPress,
-              children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.accountText, { color: TEXT_ON_PRIMARY }], children: logout.label })
+              children: /* @__PURE__ */ jsxRuntime.jsx(reactNative.Text, { style: [navStyles.accountText, { color: onPrimaryInk }], children: logout.label })
             }
           )
-        ] })
+        ] }),
+        stacked ? identityBlocks : null
       ]
     }
   );
@@ -1621,17 +1659,6 @@ var Nav = (props) => {
   }
   return /* @__PURE__ */ jsxRuntime.jsx(NavBar, { ...props });
 };
-var RAIL_FULL_BREAKPOINT = uiLayout.LAYOUT_COLLAPSE_BREAKPOINT;
-var DEFAULT_COLLAPSED_RAIL_MAX = 1024;
-function resolveRailMode({ viewport, hasSidebar, hasCollapsed, range }) {
-  if (!hasSidebar) return "none";
-  if (hasCollapsed) {
-    if (viewport >= range.max) return "full";
-    if (viewport >= range.min) return "collapsed";
-    return "drawer";
-  }
-  return viewport >= RAIL_FULL_BREAKPOINT ? "full" : "drawer";
-}
 var styles5 = reactNative.StyleSheet.create({
   band: { left: 0, position: "absolute", right: 0, top: 0 }
 });