@idealyst/navigation 1.0.24 → 1.0.26

package/src/layouts/GeneralLayout/types.ts

@@ -1,99 +1,99 @@
-import { ReactNode } from 'react';
-
-export interface SidebarConfig {
-  /**
-   * Whether the sidebar is enabled
-   */
-  enabled?: boolean;
-  
-  /**
-   * Whether the sidebar is initially expanded
-   */
-  initiallyExpanded?: boolean;
-  
-  /**
-   * Width of the sidebar when expanded
-   */
-  expandedWidth?: number;
-  
-  /**
-   * Width of the sidebar when collapsed
-   */
-  collapsedWidth?: number;
-  
-  /**
-   * Whether the sidebar can be collapsed
-   */
-  collapsible?: boolean;
-  
-  /**
-   * Position of the sidebar
-   */
-  position?: 'left' | 'right';
-  
-  /**
-   * Content to display in the sidebar
-   */
-  content?: ReactNode;
-  
-  /**
-   * Custom styles for the sidebar
-   */
-  style?: any;
-}
-
-export interface HeaderConfig {
-  /**
-   * Whether the header is enabled
-   */
-  enabled?: boolean;
-  
-  /**
-   * Height of the header
-   */
-  height?: number;
-  
-  /**
-   * Content to display in the header
-   */
-  content?: ReactNode;
-  
-  /**
-   * Custom styles for the header
-   */
-  style?: any;
-}
-
-export interface GeneralLayoutProps {
-  /**
-   * The main content to display
-   */
-  children?: ReactNode;
-  
-  /**
-   * Sidebar configuration
-   */
-  sidebar?: SidebarConfig;
-  
-  /**
-   * Header configuration
-   */
-  header?: HeaderConfig;
-  
-  /**
-   * Additional styles for the layout container
-   */
-  style?: any;
-  
-  /**
-   * Test ID for testing
-   */
-  testID?: string;
-}
-
-export interface GeneralLayoutState {
-  /**
-   * Whether the sidebar is currently expanded
-   */
-  isSidebarExpanded: boolean;
+import { ReactNode } from 'react';
+
+export interface SidebarConfig {
+  /**
+   * Whether the sidebar is enabled
+   */
+  enabled?: boolean;
+  
+  /**
+   * Whether the sidebar is initially expanded
+   */
+  initiallyExpanded?: boolean;
+  
+  /**
+   * Width of the sidebar when expanded
+   */
+  expandedWidth?: number;
+  
+  /**
+   * Width of the sidebar when collapsed
+   */
+  collapsedWidth?: number;
+  
+  /**
+   * Whether the sidebar can be collapsed
+   */
+  collapsible?: boolean;
+  
+  /**
+   * Position of the sidebar
+   */
+  position?: 'left' | 'right';
+  
+  /**
+   * Content to display in the sidebar
+   */
+  content?: ReactNode;
+  
+  /**
+   * Custom styles for the sidebar
+   */
+  style?: any;
+}
+
+export interface HeaderConfig {
+  /**
+   * Whether the header is enabled
+   */
+  enabled?: boolean;
+  
+  /**
+   * Height of the header
+   */
+  height?: number;
+  
+  /**
+   * Content to display in the header
+   */
+  content?: ReactNode;
+  
+  /**
+   * Custom styles for the header
+   */
+  style?: any;
+}
+
+export interface GeneralLayoutProps {
+  /**
+   * The main content to display
+   */
+  children?: ReactNode;
+  
+  /**
+   * Sidebar configuration
+   */
+  sidebar?: SidebarConfig;
+  
+  /**
+   * Header configuration
+   */
+  header?: HeaderConfig;
+  
+  /**
+   * Additional styles for the layout container
+   */
+  style?: any;
+  
+  /**
+   * Test ID for testing
+   */
+  testID?: string;
+}
+
+export interface GeneralLayoutState {
+  /**
+   * Whether the sidebar is currently expanded
+   */
+  isSidebarExpanded: boolean;
 } 

package/src/routing/index.native.tsx

@@ -1,2 +1,2 @@
-export * from './router.native';
+export * from './router.native';
 export * from './types';

package/src/routing/index.ts

@@ -1,2 +1,2 @@
-export * from './router.web';
+export * from './router.web';
 export * from './types'; 

package/src/routing/index.web.tsx

@@ -1,2 +1,2 @@
-export * from './router.web';
+export * from './router.web';
 export * from './types'; 

package/src/routing/router.native.tsx

@@ -1,90 +1,90 @@
-import React from "react";
-
-import { createNativeStackNavigator } from "@react-navigation/native-stack";
-import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
-import { createDrawerNavigator } from "@react-navigation/drawer";
-
-import { RouteParam } from "./types"
-import { TypedNavigator } from "@react-navigation/native";
-
-export const buildRouter = (routeParam: RouteParam, path: string = '') => {
-    return () => buildNativeRouter(routeParam, path)
-}
-
-/**
- * Create the router supporting React Navigation
- * @param routeParam 
- * @param path 
- * @param LastNavigator 
- * @returns 
- */
-const buildNativeRouter = (routeParam: RouteParam, path: string = '', LastNavigator?: TypedNavigator<any>): React.ReactElement => {
-    const nextPath = (routeParam.path ? path + routeParam.path : path) || '';
-    const type = routeParam.layout?.type;
-    console.log('Registered routes', nextPath, routeParam.routes);
-    switch (type) {
-        case 'stack':
-            const Stack = createNativeStackNavigator();
-            return (
-                <Stack.Navigator
-                    screenOptions={{
-                        // Disable screen optimization to ensure theme updates
-                        freezeOnBlur: false,
-                    }}
-                >
-                    <Stack.Screen name={nextPath} component={routeParam.component} />
-                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, Stack))}
-                </Stack.Navigator>
-            )
-        case 'tab':
-            const Tab = createBottomTabNavigator();
-            return (
-                <Tab.Navigator
-                    screenOptions={{
-                        // Disable screen optimization to ensure theme updates
-                        lazy: false,
-                        freezeOnBlur: false,
-                    }}
-                >
-                    <Tab.Screen name={nextPath} component={routeParam.component} />
-                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, Tab))}
-                </Tab.Navigator>
-            )
-        case 'drawer':
-            const Drawer = createDrawerNavigator();
-            return (
-                <Drawer.Navigator
-                    screenOptions={{
-                        // Disable screen optimization to ensure theme updates
-                        lazy: false,
-                        freezeOnBlur: false,
-                    }}
-                >
-                    <Drawer.Screen name={nextPath} component={routeParam.component} />
-                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, Drawer))}
-                </Drawer.Navigator>
-            )
-        case 'modal':
-            if (!LastNavigator) {
-                throw new Error('LastNavigator is required for modal layout');
-            }
-            return (
-                <>
-                    <LastNavigator.Screen options={{ headerShown: false, presentation: 'modal' }} name={nextPath} component={routeParam.component} />
-                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, LastNavigator))}
-                </>
-            )
-        case undefined:
-            if (!LastNavigator) {
-                throw new Error('LastNavigator is required for undefined layout');
-            }
-            return (
-                <>
-                    <LastNavigator.Screen name={nextPath} component={routeParam.component} />
-                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, LastNavigator))}
-                </>
-            )
-        default:
-            throw new Error(`Unknown layout type: ${type}`);
-    }
+import React from "react";
+
+import { createNativeStackNavigator } from "@react-navigation/native-stack";
+import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
+import { createDrawerNavigator } from "@react-navigation/drawer";
+
+import { RouteParam } from "./types"
+import { TypedNavigator } from "@react-navigation/native";
+
+export const buildRouter = (routeParam: RouteParam, path: string = '') => {
+    return () => buildNativeRouter(routeParam, path)
+}
+
+/**
+ * Create the router supporting React Navigation
+ * @param routeParam 
+ * @param path 
+ * @param LastNavigator 
+ * @returns 
+ */
+const buildNativeRouter = (routeParam: RouteParam, path: string = '', LastNavigator?: TypedNavigator<any>): React.ReactElement => {
+    const nextPath = (routeParam.path ? path + routeParam.path : path) || '';
+    const type = routeParam.layout?.type;
+    console.log('Registered routes', nextPath, routeParam.routes);
+    switch (type) {
+        case 'stack':
+            const Stack = createNativeStackNavigator();
+            return (
+                <Stack.Navigator
+                    screenOptions={{
+                        // Disable screen optimization to ensure theme updates
+                        freezeOnBlur: false,
+                    }}
+                >
+                    <Stack.Screen name={nextPath} component={routeParam.component} />
+                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, Stack))}
+                </Stack.Navigator>
+            )
+        case 'tab':
+            const Tab = createBottomTabNavigator();
+            return (
+                <Tab.Navigator
+                    screenOptions={{
+                        // Disable screen optimization to ensure theme updates
+                        lazy: false,
+                        freezeOnBlur: false,
+                    }}
+                >
+                    <Tab.Screen name={nextPath} component={routeParam.component} />
+                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, Tab))}
+                </Tab.Navigator>
+            )
+        case 'drawer':
+            const Drawer = createDrawerNavigator();
+            return (
+                <Drawer.Navigator
+                    screenOptions={{
+                        // Disable screen optimization to ensure theme updates
+                        lazy: false,
+                        freezeOnBlur: false,
+                    }}
+                >
+                    <Drawer.Screen name={nextPath} component={routeParam.component} />
+                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, Drawer))}
+                </Drawer.Navigator>
+            )
+        case 'modal':
+            if (!LastNavigator) {
+                throw new Error('LastNavigator is required for modal layout');
+            }
+            return (
+                <>
+                    <LastNavigator.Screen options={{ headerShown: false, presentation: 'modal' }} name={nextPath} component={routeParam.component} />
+                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, LastNavigator))}
+                </>
+            )
+        case undefined:
+            if (!LastNavigator) {
+                throw new Error('LastNavigator is required for undefined layout');
+            }
+            return (
+                <>
+                    <LastNavigator.Screen name={nextPath} component={routeParam.component} />
+                    {routeParam.routes?.map((route) => buildNativeRouter(route, nextPath, LastNavigator))}
+                </>
+            )
+        default:
+            throw new Error(`Unknown layout type: ${type}`);
+    }
 }

package/src/routing/router.web.tsx

@@ -1,74 +1,74 @@
-import React from "react";
-import { Routes, Route, Outlet } from "react-router-dom";
-import { RouteParam } from "./types";
-
-export const buildRouter = (routeParam: RouteParam, path: string = '') => {
-    return () => (
-        <Routes>
-            {buildWebRoutes(routeParam, path)}
-        </Routes>
-    );
-};
-
-/**
- * Create React Router routes from RouteParam configuration
- * @param routeParam The route parameter configuration
- * @param parentPath The parent path for nested routes
- * @returns Array of React Router Route elements
- */
-const buildWebRoutes = (routeParam: RouteParam, parentPath: string = ''): React.ReactElement[] => {
-    const routes: React.ReactElement[] = [];
-    const currentPath = routeParam.path ? `${parentPath}${routeParam.path}` : parentPath;
-    
-    // Handle layout wrapping
-    const LayoutComponent = routeParam.layout?.component;
-    const RouteComponent = routeParam.component;
-    
-    if (LayoutComponent && routeParam.routes) {
-        // Create a wrapper component that renders the layout with Outlet
-        const LayoutWrapper: React.FC = () => (
-            <LayoutComponent>
-                <Outlet />
-            </LayoutComponent>
-        );
-        
-        // Create parent route with layout
-        const layoutRoute = (
-            <Route 
-                key={`layout-${currentPath || 'root'}`} 
-                path={currentPath || '/'} 
-                element={<LayoutWrapper />}
-            >
-                {/* Add index route for the main component */}
-                <Route 
-                    index 
-                    element={<RouteComponent />} 
-                />
-                {/* Add nested routes */}
-                {routeParam.routes.reduce((acc, nestedRoute) => {
-                    return acc.concat(buildWebRoutes(nestedRoute, currentPath));
-                }, [] as React.ReactElement[])}
-            </Route>
-        );
-        
-        routes.push(layoutRoute);
-    } else {
-        // Simple route without layout
-        routes.push(
-            <Route 
-                key={currentPath || 'root'} 
-                path={currentPath || '/'} 
-                element={<RouteComponent />} 
-            />
-        );
-        
-        // Handle nested routes without layout
-        if (routeParam.routes) {
-            routeParam.routes.forEach(nestedRoute => {
-                routes.push(...buildWebRoutes(nestedRoute, currentPath));
-            });
-        }
-    }
-    
-    return routes;
+import React from "react";
+import { Routes, Route, Outlet } from "react-router-dom";
+import { RouteParam } from "./types";
+
+export const buildRouter = (routeParam: RouteParam, path: string = '') => {
+    return () => (
+        <Routes>
+            {buildWebRoutes(routeParam, path)}
+        </Routes>
+    );
+};
+
+/**
+ * Create React Router routes from RouteParam configuration
+ * @param routeParam The route parameter configuration
+ * @param parentPath The parent path for nested routes
+ * @returns Array of React Router Route elements
+ */
+const buildWebRoutes = (routeParam: RouteParam, parentPath: string = ''): React.ReactElement[] => {
+    const routes: React.ReactElement[] = [];
+    const currentPath = routeParam.path ? `${parentPath}${routeParam.path}` : parentPath;
+    
+    // Handle layout wrapping
+    const LayoutComponent = routeParam.layout?.component;
+    const RouteComponent = routeParam.component;
+    
+    if (LayoutComponent && routeParam.routes) {
+        // Create a wrapper component that renders the layout with Outlet
+        const LayoutWrapper: React.FC = () => (
+            <LayoutComponent>
+                <Outlet />
+            </LayoutComponent>
+        );
+        
+        // Create parent route with layout
+        const layoutRoute = (
+            <Route 
+                key={`layout-${currentPath || 'root'}`} 
+                path={currentPath || '/'} 
+                element={<LayoutWrapper />}
+            >
+                {/* Add index route for the main component */}
+                <Route 
+                    index 
+                    element={<RouteComponent />} 
+                />
+                {/* Add nested routes */}
+                {routeParam.routes.reduce((acc, nestedRoute) => {
+                    return acc.concat(buildWebRoutes(nestedRoute, currentPath));
+                }, [] as React.ReactElement[])}
+            </Route>
+        );
+        
+        routes.push(layoutRoute);
+    } else {
+        // Simple route without layout
+        routes.push(
+            <Route 
+                key={currentPath || 'root'} 
+                path={currentPath || '/'} 
+                element={<RouteComponent />} 
+            />
+        );
+        
+        // Handle nested routes without layout
+        if (routeParam.routes) {
+            routeParam.routes.forEach(nestedRoute => {
+                routes.push(...buildWebRoutes(nestedRoute, currentPath));
+            });
+        }
+    }
+    
+    return routes;
 };

package/src/routing/types.ts

@@ -1,15 +1,15 @@
-import React from "react";
-
-export type RouteParam = {
-    path?: string;
-    routes?: RouteParam[];
-    component: React.ComponentType;
-    layout?: LayoutParam;
-}
-
-export type LayoutType = 'stack' | 'tab' | 'drawer' | 'modal';
-
-export type LayoutParam = {
-    type: LayoutType;
-    component?: React.ComponentType<{ children?: React.ReactNode }>;
+import React from "react";
+
+export type RouteParam = {
+    path?: string;
+    routes?: RouteParam[];
+    component: React.ComponentType;
+    layout?: LayoutParam;
+}
+
+export type LayoutType = 'stack' | 'tab' | 'drawer' | 'modal';
+
+export type LayoutParam = {
+    type: LayoutType;
+    component?: React.ComponentType<{ children?: React.ReactNode }>;
 }