@dloizides/ui-nav 1.10.1 → 1.11.0

package/dist/index.mjs

@@ -283,6 +283,10 @@ function hoverTransitionStyle(reducedMotion) {
 function ariaCurrentProps(isActive) {
   return isActive ? { "aria-current": "page" } : {};
 }
+function hasActiveDescendant(item, pathname) {
+  if (isRouteActive(pathname, item.route)) return true;
+  return (item.children ?? []).some((child) => hasActiveDescendant(child, pathname));
+}
 var NavExpandableItem = ({
   item,
   pathname,
@@ -293,7 +297,7 @@ var NavExpandableItem = ({
   renderChevron,
   depth = 0
 }) => {
-  const [expanded, setExpanded] = useState(false);
+  const [expanded, setExpanded] = useState(() => hasActiveDescendant(item, pathname));
   const [focused, setFocused] = useState(false);
   const { theme } = useUi();
   const colors = theme.colors;
@@ -998,6 +1002,9 @@ var MENU_MIN_TARGET = 44;
 var MENU_GLYPH_FONT_SIZE = 20;
 var MENU_TOGGLE_PADDING = 12;
 var DRAWER_Z_INDEX = 50;
+var DRAWER_WIDTH = 280;
+var SCRIM_Z_INDEX = 1;
+var PANEL_Z_INDEX = 2;
 var NAV_ACTIVATABLE_SELECTOR = 'a, [role="button"], [role="link"]';
 var DEFAULT_DRAWER_LABELS = {
   openLabel: "Menu",
@@ -1007,8 +1014,22 @@ var DEFAULT_DRAWER_LABELS = {
 };
 var styles2 = StyleSheet.create({
   overlay: { ...StyleSheet.absoluteFillObject, zIndex: DRAWER_Z_INDEX },
-  scrim: { ...StyleSheet.absoluteFillObject, backgroundColor: SCRIM_COLOR },
-  panel: { position: "absolute", top: 0, bottom: 0, left: 0 },
+  // 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
+  // reach the Sidebar's TouchableOpacity, while taps beside the drawer still close.
+  scrim: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    left: DRAWER_WIDTH,
+    right: 0,
+    backgroundColor: SCRIM_COLOR,
+    zIndex: SCRIM_Z_INDEX
+  },
+  // The panel gets an explicit width (a real drawer) AND a zIndex above the scrim,
+  // 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 },
   menuToggle: {
     minWidth: MENU_MIN_TARGET,
     minHeight: MENU_MIN_TARGET,
@@ -1065,7 +1086,17 @@ var MobileDrawer = ({
         onPress: onClose
       }
     ),
-    /* @__PURE__ */ jsx(View, { ref: panelRef, "aria-modal": true, role: "dialog", style: styles2.panel, testID: drawerTestID, children: renderTextSlot(sidebar, { color: theme.colors.text }) })
+    /* @__PURE__ */ jsx(
+      View,
+      {
+        ref: panelRef,
+        "aria-modal": true,
+        role: "dialog",
+        style: [styles2.panel, { backgroundColor: theme.colors.surface }],
+        testID: drawerTestID,
+        children: renderTextSlot(sidebar, { color: theme.colors.text })
+      }
+    )
   ] });
 };