@idealyst/navigation 1.0.76 → 1.0.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/navigation",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "description": "Cross-platform navigation library for React and React Native",
   "readme": "README.md",
   "main": "src/index.ts",
@@ -38,8 +38,8 @@
     "publish:npm": "npm publish"
   },
   "peerDependencies": {
-    "@idealyst/components": "^1.0.76",
-    "@idealyst/theme": "^1.0.76",
+    "@idealyst/components": "^1.0.78",
+    "@idealyst/theme": "^1.0.78",
     "@react-navigation/bottom-tabs": "^7.0.0",
     "@react-navigation/drawer": "^7.0.0",
     "@react-navigation/native": "^7.0.0",

package/src/context/types.ts

@@ -5,7 +5,7 @@ import { NavigatorParam } from "../routing";
  */
 export type NavigateParams = {
     path: string;
-    vars: Record<string, string>;
+    vars?: Record<string, string>;
 };
 
 export type NavigatorProviderProps = {

package/src/routing/router.native.tsx

@@ -16,7 +16,7 @@ export const buildNavigator = (params: NavigatorParam, parentPath = '') => {
         <NavigatorType.Navigator screenOptions={{
             headerShown: params.options?.headerShown
         }}>
-            {params.routes.map((child) => buildScreen(child, NavigatorType))}
+            {params.routes.map((child, index) => buildScreen(child, NavigatorType, parentPath, index))}
         </NavigatorType.Navigator>
     )
 }
@@ -43,11 +43,33 @@ const getNavigatorType = (params: NavigatorParam) => {
  * @param parentPath 
  * @returns 
  */
-const buildScreen = (params: RouteParam, Navigator: TypedNavigator, parentPath = '') => {
+const buildScreen = (params: RouteParam, Navigator: TypedNavigator, parentPath = '', index: number) => {
+    // Build the full path by combining parent path with current route path
+    // Handle root paths properly to avoid double slashes
+    let fullPath: string;
+    if (!parentPath || parentPath === '/') {
+        // If no parent path or parent is root, use the route path directly
+        fullPath = params.path;
+    } else {
+        // For nested routes, combine parent path with route path
+        // Remove leading slash from route path to avoid double slashes
+        const routePath = params.path.startsWith('/') ? params.path.slice(1) : params.path;
+        fullPath = `${parentPath}/${routePath}`;
+    }
+    
+    console.log('📱 Registering screen:', {
+        originalPath: params.path,
+        parentPath,
+        fullPath,
+        type: params.type,
+        screenName: fullPath
+    });
+    
     return (
         <Navigator.Screen
-            name={params.path}
-            component={params.type === 'screen' ? params.component : buildNavigator(params, parentPath + params.path)}
+            key={`${fullPath}-${index}`}
+            name={fullPath}
+            component={params.type === 'screen' ? params.component : buildNavigator(params, fullPath)}
             options={params.options}
         />
     )

package/src/routing/router.web.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
-import { NavigatorParam, RouteParam, TabNavigatorParam, StackNavigatorParam } from './types'
-import { DefaultTabLayout } from '../layouts/DefaultTabLayout'
 import { DefaultStackLayout } from '../layouts/DefaultStackLayout'
+import { DefaultTabLayout } from '../layouts/DefaultTabLayout'
+import { NavigatorParam, StackNavigatorParam, TabNavigatorParam } from './types'
 
 /**
  * Build the Web navigator using custom layout components
@@ -44,7 +44,7 @@ const buildFullPath = (parentPath: string, childPath: string): string => {
     
     const normalizedParent = parentPath === '/' ? '' : parentPath
     const normalizedChild = normalizePath(childPath)
-    
+
     return `${normalizedParent}${normalizedChild}`
 }
 
@@ -164,7 +164,7 @@ const StackNavigator: React.FC<{ params: StackNavigatorParam; parentPath: string
             const navigatorRoute = params.routes.find(route => {
                 if (route.type === 'navigator') {
                     const fullRoutePath = buildFullPath(parentPath, route.path)
-                    return currentPath.startsWith(fullRoutePath)
+                    return currentPath.startsWith(fullRoutePath + '/') || currentPath === fullRoutePath
                 }
                 return false
             })

package/src/routing/types.ts

@@ -5,6 +5,7 @@ export type ScreenOptions = {
      * Screen title for navigation headers
      */
     title?: string;
+    headerShown?: boolean;
     
 };