pytech-ui 1.0.34 → 1.0.36

package/android/src/main/java/expo/modules/pytechui/Navigation/NavigationWrapperView.kt

@@ -10,16 +10,13 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.FunctionalComposableScope
 import expo.modules.pytechui.findChildBySlotName
 import expo.modules.ui.SlotView
 
-object PytechRoutes {
-  const val SCREEN_A = "screen_A"
-  const val SCREEN_B = "screen_B"
-}
-
 /**
  * Referencia global al NavController del wrapper activo.
  * Se setea al montar `NavigationWrapperView` y se limpia al desmontarlo.
@@ -39,13 +36,22 @@ object PytechNavigation {
 /** Disponible para cualquier composable renderizado dentro del wrapper. */
 val LocalPytechNavController = staticCompositionLocalOf<NavHostController?> { null }
 
+data class NavigationRouteRecord(
+  @Field val route: String = "",
+) : Record
+
 data class NavigationWrapperProps(
-  val startDestination: String = PytechRoutes.SCREEN_A,
+  val routes: List<NavigationRouteRecord> = emptyList(),
+  val startDestination: String = "",
 ) : ComposeProps
 
 @Composable
 internal fun FunctionalComposableScope.NavigationWrapperViewContent(props: NavigationWrapperProps) {
   val navController = rememberNavController()
+  val routeNames = props.routes.map { it.route }.filter { it.isNotEmpty() }
+  val startDestination = props.startDestination.takeIf { it.isNotEmpty() }
+    ?: routeNames.firstOrNull()
+    ?: return
 
   DisposableEffect(navController) {
     PytechNavigation.navController = navController
@@ -56,17 +62,16 @@ internal fun FunctionalComposableScope.NavigationWrapperViewContent(props: Navig
     }
   }
 
-  val screenA = findChildBySlotName(PytechRoutes.SCREEN_A)
-  val screenB = findChildBySlotName(PytechRoutes.SCREEN_B)
-
   CompositionLocalProvider(LocalPytechNavController provides navController) {
     NavHost(
       navController = navController,
-      startDestination = props.startDestination,
+      startDestination = startDestination,
       modifier = Modifier.fillMaxSize(),
     ) {
-      composable(PytechRoutes.SCREEN_A) { RenderScreen(screenA) }
-      composable(PytechRoutes.SCREEN_B) { RenderScreen(screenB) }
+      routeNames.forEach { route ->
+        val slot = findChildBySlotName(route)
+        composable(route) { RenderScreen(slot) }
+      }
     }
   }
 }

package/build/jetpack-compose/components/Host.d.ts

@@ -1,4 +1,3 @@
 import { HostProps as ExpoHostProps } from '@expo/ui/jetpack-compose';
-import { NavigationWrapperProps } from './NavigationWrapper';
-export type HostProps = ExpoHostProps & Partial<Omit<NavigationWrapperProps, 'screenA' | 'startDestination'>>;
-export declare const Host: ({ style, screenB, ...props }: HostProps) => import("react").JSX.Element;
+export type HostProps = ExpoHostProps;
+export declare const Host: ({ style, children, ...props }: HostProps) => import("react").JSX.Element;

package/build/jetpack-compose/components/Host.js

@@ -3,14 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Host = void 0;
 const expo_1 = require("expo");
 const jetpack_compose_1 = require("@expo/ui/jetpack-compose");
-const NavigationWrapper_1 = require("./NavigationWrapper");
 const ExtendedTheme = (0, expo_1.requireNativeView)('PytechUi', 'ExtendedTheme');
-const Host = ({ style, screenB, ...props }) => {
-    const hasNavigation = screenB != null;
-    return (<jetpack_compose_1.Host style={{ flex: 1, ...style }} {...props}>
-            <ExtendedTheme>
-                {hasNavigation ? (<NavigationWrapper_1.NavigationWrapper screenA={props.children} screenB={screenB} startDestination='screen_A'/>) : (props.children)}
-            </ExtendedTheme>
-        </jetpack_compose_1.Host>);
-};
+const Host = ({ style, children, ...props }) => (<jetpack_compose_1.Host style={{ flex: 1, ...style }} {...props}>
+		<ExtendedTheme>{children}</ExtendedTheme>
+	</jetpack_compose_1.Host>);
 exports.Host = Host;

package/build/jetpack-compose/components/NavigationWrapper.d.ts

@@ -1,10 +1,12 @@
 import { ReactNode } from 'react';
-export type NavigationRoute = 'screen_A' | 'screen_B';
+export type NavigationRouteDefinition = {
+    route: string;
+    screen: ReactNode;
+};
 export type NavigationWrapperProps = {
-    screenA: ReactNode;
-    screenB: ReactNode;
-    startDestination?: NavigationRoute;
+    routes: NavigationRouteDefinition[];
+    startDestination?: string;
 };
-export declare const navigate: (route: NavigationRoute) => Promise<void>;
+export declare const navigate: (route: string) => Promise<void>;
 export declare const goBack: () => Promise<boolean>;
-export declare const NavigationWrapper: ({ screenA, screenB, startDestination }: NavigationWrapperProps) => import("react").JSX.Element;
+export declare const NavigationWrapper: ({ routes, startDestination }: NavigationWrapperProps) => import("react").JSX.Element;

package/build/jetpack-compose/components/NavigationWrapper.js

@@ -9,8 +9,12 @@ const navigate = (route) => Native.navigate(route);
 exports.navigate = navigate;
 const goBack = () => Native.goBack();
 exports.goBack = goBack;
-const NavigationWrapper = ({ screenA, screenB, startDestination }) => (<NavigationWrapperNativeView startDestination={startDestination}>
-		<SlotNativeView slotName="screen_A">{screenA}</SlotNativeView>
-		<SlotNativeView slotName="screen_B">{screenB}</SlotNativeView>
-	</NavigationWrapperNativeView>);
+const NavigationWrapper = ({ routes, startDestination }) => {
+    const resolvedStartDestination = startDestination ?? routes[0]?.route;
+    return (<NavigationWrapperNativeView routes={routes.map(({ route }) => ({ route }))} startDestination={resolvedStartDestination}>
+			{routes.map(({ route, screen }) => (<SlotNativeView key={route} slotName={route}>
+					{screen}
+				</SlotNativeView>))}
+		</NavigationWrapperNativeView>);
+};
 exports.NavigationWrapper = NavigationWrapper;

package/build/jetpack-compose/index.d.ts

@@ -11,7 +11,6 @@ export * from './components/List';
 export * from './components/ListItem/index';
 export * from './components/Menu';
 export * from './components/NavigationWrapper';
-export * from './components/NavigationButton';
 export * from './components/PagePicker';
 export * from './components/PullToRefreshBox';
 export * from './components/Section';

package/build/jetpack-compose/index.js

@@ -27,7 +27,6 @@ __exportStar(require("./components/List"), exports);
 __exportStar(require("./components/ListItem/index"), exports);
 __exportStar(require("./components/Menu"), exports);
 __exportStar(require("./components/NavigationWrapper"), exports);
-__exportStar(require("./components/NavigationButton"), exports);
 __exportStar(require("./components/PagePicker"), exports);
 __exportStar(require("./components/PullToRefreshBox"), exports);
 __exportStar(require("./components/Section"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pytech-ui",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "Librería de componentes de UI para Pytech",
   "keywords": [
     "react-native",

package/build/jetpack-compose/components/NavigationButton.d.ts

@@ -1,7 +0,0 @@
-import { ButtonProps } from '@expo/ui/jetpack-compose';
-import { NavigationRoute } from './NavigationWrapper';
-export type NavigationButtonProps = Omit<ButtonProps, 'onClick'> & {
-    route: NavigationRoute;
-    onClick?: (route: NavigationRoute) => void;
-};
-export declare const NavigationButton: ({ route, onClick, children, ...props }: NavigationButtonProps) => import("react").JSX.Element;

package/build/jetpack-compose/components/NavigationButton.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NavigationButton = void 0;
-const jetpack_compose_1 = require("@expo/ui/jetpack-compose");
-const NavigationWrapper_1 = require("./NavigationWrapper");
-const TextSlot_1 = require("./TextSlot");
-const NavigationButton = ({ route, onClick, children, ...props }) => {
-    const handleClick = () => {
-        onClick?.(route);
-        (0, NavigationWrapper_1.navigate)(route);
-    };
-    return (<jetpack_compose_1.Button {...props} onClick={handleClick}>
-			{typeof children === 'string' ? <TextSlot_1.Text>{children}</TextSlot_1.Text> : children}
-		</jetpack_compose_1.Button>);
-};
-exports.NavigationButton = NavigationButton;