@idealyst/navigation 1.0.80 → 1.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/navigation",
-  "version": "1.0.80",
+  "version": "1.0.82",
   "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.80",
-    "@idealyst/theme": "^1.0.80",
+    "@idealyst/components": "^1.0.82",
+    "@idealyst/theme": "^1.0.82",
     "@react-navigation/bottom-tabs": "^7.0.0",
     "@react-navigation/drawer": "^7.0.0",
     "@react-navigation/native": "^7.0.0",

package/src/context/NavigatorContext.native.tsx

@@ -6,19 +6,21 @@ import { useUnistyles } from 'react-native-unistyles';
 
 const NavigatorContext = createContext<NavigatorContextValue>({
     navigate: () => {},
-    params: {},
 });
 
 // Utility function to parse path with parameters and find matching route
-const parseParameterizedPath = (path: string, routes: any[]): { routeName: string, params: Record<string, string> } | null => {
+const parseParameterizedPath = (path: string, rootRoute: any): { routeName: string, params: Record<string, string> } | null => {
     // Handle absolute paths like /event/123
     if (path.startsWith('/')) {
         const pathSegments = path.split('/').filter(Boolean);
         
         // Find matching route by checking patterns like /event/:id
-        const findMatchingRoute = (routeList: any[], segments: string[], startIndex = 0): any => {
+        const findMatchingRoute = (routeList: any[], segments: string[], startIndex = 0, pathPrefix = ''): any => {
             for (const route of routeList) {
                 const routeSegments = route.path.split('/').filter(Boolean);
+                // Clean up path joining to avoid double slashes
+                const cleanPath = route.path.startsWith('/') ? route.path.slice(1) : route.path;
+                const fullRoutePath = pathPrefix ? `${pathPrefix}/${cleanPath}` : route.path;
                 
                 if (routeSegments.length === segments.length - startIndex) {
                     let isMatch = true;
@@ -40,13 +42,18 @@ const parseParameterizedPath = (path: string, routes: any[]): { routeName: strin
                     }
                     
                     if (isMatch) {
-                        return { route, params: extractedParams };
+                        return { route, params: extractedParams, fullPath: fullRoutePath };
                     }
                 }
                 
                 // Check nested routes
                 if (route.routes) {
-                    const nestedMatch = findMatchingRoute(route.routes, segments, startIndex + route.path.split('/').filter(Boolean).length);
+                    const nestedMatch = findMatchingRoute(
+                        route.routes, 
+                        segments, 
+                        startIndex + routeSegments.length,
+                        fullRoutePath
+                    );
                     if (nestedMatch) {
                         return nestedMatch;
                     }
@@ -55,10 +62,10 @@ const parseParameterizedPath = (path: string, routes: any[]): { routeName: strin
             return null;
         };
         
-        const match = findMatchingRoute([route], pathSegments);
+        const match = findMatchingRoute(rootRoute.routes || [], pathSegments);
         if (match) {
             return {
-                routeName: match.route.path,
+                routeName: match.fullPath,
                 params: match.params
             };
         }
@@ -70,13 +77,10 @@ const parseParameterizedPath = (path: string, routes: any[]): { routeName: strin
 const UnwrappedNavigatorProvider = ({ route }: NavigatorProviderProps) => {
 
     const navigation = useNavigation();
-    const currentRoute = useRoute();
         
     const navigate = (params: NavigateParams) => {
-        
         // Parse parameterized path for mobile
-        const parsed = parseParameterizedPath(params.path, [route]);
-        
+        const parsed = parseParameterizedPath(params.path, route);
         if (parsed) {
             // Navigate to the pattern route with extracted parameters
             navigation.navigate(parsed.routeName as never, parsed.params as never);
@@ -94,7 +98,6 @@ const UnwrappedNavigatorProvider = ({ route }: NavigatorProviderProps) => {
     return (
         <NavigatorContext.Provider value={{ 
             navigate,
-            params: currentRoute.params || {}
         }}>
             <RouteComponent />
         </NavigatorContext.Provider>

package/src/context/NavigatorContext.web.tsx

@@ -5,14 +5,12 @@ import { buildNavigator } from '../routing';
 
 const NavigatorContext = createContext<NavigatorContextValue>({
     navigate: () => {},
-    params: {},
 });
 
 export const NavigatorProvider = ({ 
     route,
 }: NavigatorProviderProps) => {
     const reactRouterNavigate = useNavigate()
-    const params = useParams()
     
     const navigateFunction = (params: NavigateParams) => {
         if (params.path) {
@@ -44,7 +42,6 @@ export const NavigatorProvider = ({
     return (
         <NavigatorContext.Provider value={{ 
             navigate: navigateFunction,
-            params: params || {}
         }}>
             <RouteComponent />
         </NavigatorContext.Provider>

package/src/context/types.ts

@@ -17,5 +17,4 @@ export type NavigatorProviderProps = {
  */
 export type NavigatorContextValue = {
     navigate: (params: NavigateParams) => void;
-    params: Record<string, string>;
 };

package/src/layouts/DefaultStackLayout.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { View, Text } from '@idealyst/components'
 import { StackLayoutProps } from '../routing/types'
-import { Outlet } from 'react-router'
+import { Outlet } from '..'
 
 export interface DefaultStackLayoutProps extends StackLayoutProps {
     onNavigate: (path: string) => void

package/src/layouts/DefaultTabLayout.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { View, Text, Button, Icon } from '@idealyst/components'
 import { TabLayoutProps } from '../routing/types'
-import { Outlet } from 'react-router'
+import { Outlet } from '..'
 
 export interface DefaultTabLayoutProps extends TabLayoutProps {}