expo-router 2.0.3 → 2.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/build/layouts/Drawer.d.ts +59 -58
  2. package/build/layouts/Drawer.d.ts.map +1 -1
  3. package/build/layouts/Stack.d.ts +63 -62
  4. package/build/layouts/Stack.d.ts.map +1 -1
  5. package/build/layouts/Tabs.d.ts +65 -64
  6. package/build/layouts/Tabs.d.ts.map +1 -1
  7. package/build/layouts/withLayoutContext.d.ts +3 -2
  8. package/build/layouts/withLayoutContext.d.ts.map +1 -1
  9. package/build/link/stateOperations.d.ts.map +1 -1
  10. package/build/useScreens.d.ts +6 -2
  11. package/build/useScreens.d.ts.map +1 -1
  12. package/package.json +2 -2
  13. package/src/fork/getPathFromState.ts +1 -1
  14. package/src/layouts/Drawer.tsx +5 -1
  15. package/src/layouts/Stack.tsx +5 -1
  16. package/src/layouts/Tabs.tsx +5 -1
  17. package/src/layouts/withLayoutContext.tsx +8 -3
  18. package/src/link/stateOperations.ts +11 -0
  19. package/src/useScreens.tsx +16 -3
package/build/layouts/Drawer.d.ts CHANGED
@@ -1,107 +1,108 @@
1
1
  /// <reference types="react" />
2
- import { DrawerNavigationOptions } from "@react-navigation/drawer";
3
- export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/routers").DefaultRouterOptions<string> & {
2
+ import { DrawerNavigationEventMap, DrawerNavigationOptions } from "@react-navigation/drawer";
3
+ import { DrawerNavigationState, ParamListBase } from "@react-navigation/native";
4
+ export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/native").DefaultRouterOptions<string> & {
4
5
  id?: string | undefined;
5
6
  children: import("react").ReactNode;
6
7
  screenListeners?: Partial<{
7
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
8
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
9
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
10
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
11
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
8
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
9
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
10
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
11
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
12
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
12
13
  }> | ((props: {
13
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
14
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
14
15
  navigation: any;
15
16
  }) => Partial<{
16
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
17
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
18
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
19
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
20
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
17
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
18
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
19
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
20
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
21
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
21
22
  }>) | undefined;
22
23
  screenOptions?: DrawerNavigationOptions | ((props: {
23
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
24
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
24
25
  navigation: any;
25
26
  }) => DrawerNavigationOptions) | undefined;
26
- } & import("@react-navigation/routers").DefaultRouterOptions & {
27
+ } & import("@react-navigation/native").DefaultRouterOptions & {
27
28
  backBehavior?: import("@react-navigation/routers/lib/typescript/src/TabRouter").BackBehavior | undefined;
28
29
  } & {
29
- defaultStatus?: import("@react-navigation/routers").DrawerStatus | undefined;
30
- } & import("@react-navigation/drawer/lib/typescript/src/types").DrawerNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
30
+ defaultStatus?: import("@react-navigation/native").DrawerStatus | undefined;
31
+ } & import("@react-navigation/drawer/lib/typescript/src/types").DrawerNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/native").DefaultRouterOptions<string> & {
31
32
  id?: string | undefined;
32
33
  children: import("react").ReactNode;
33
34
  screenListeners?: Partial<{
34
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
35
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
36
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
37
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
38
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
35
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
36
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
37
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
38
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
39
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
39
40
  }> | ((props: {
40
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
41
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
41
42
  navigation: any;
42
43
  }) => Partial<{
43
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
44
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
45
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
46
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
47
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
44
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
45
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
46
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
47
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
48
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
48
49
  }>) | undefined;
49
50
  screenOptions?: DrawerNavigationOptions | ((props: {
50
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
51
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
51
52
  navigation: any;
52
53
  }) => DrawerNavigationOptions) | undefined;
53
- }, "children"> & Partial<Pick<Omit<import("@react-navigation/routers").DefaultRouterOptions<string> & {
54
+ }, "children"> & Partial<Pick<Omit<import("@react-navigation/native").DefaultRouterOptions<string> & {
54
55
  id?: string | undefined;
55
56
  children: import("react").ReactNode;
56
57
  screenListeners?: Partial<{
57
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
58
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
59
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
60
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
61
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
58
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
59
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
60
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
61
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
62
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
62
63
  }> | ((props: {
63
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
64
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
64
65
  navigation: any;
65
66
  }) => Partial<{
66
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
67
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
68
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
69
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
70
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
67
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
68
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
69
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
70
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
71
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
71
72
  }>) | undefined;
72
73
  screenOptions?: DrawerNavigationOptions | ((props: {
73
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
74
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
74
75
  navigation: any;
75
76
  }) => DrawerNavigationOptions) | undefined;
76
- } & import("@react-navigation/routers").DefaultRouterOptions & {
77
+ } & import("@react-navigation/native").DefaultRouterOptions & {
77
78
  backBehavior?: import("@react-navigation/routers/lib/typescript/src/TabRouter").BackBehavior | undefined;
78
79
  } & {
79
- defaultStatus?: import("@react-navigation/routers").DrawerStatus | undefined;
80
- } & import("@react-navigation/drawer/lib/typescript/src/types").DrawerNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
80
+ defaultStatus?: import("@react-navigation/native").DrawerStatus | undefined;
81
+ } & import("@react-navigation/drawer/lib/typescript/src/types").DrawerNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/native").DefaultRouterOptions<string> & {
81
82
  id?: string | undefined;
82
83
  children: import("react").ReactNode;
83
84
  screenListeners?: Partial<{
84
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
85
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
86
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
87
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
88
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
85
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
86
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
87
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
88
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
89
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
89
90
  }> | ((props: {
90
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
91
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
91
92
  navigation: any;
92
93
  }) => Partial<{
93
- drawerItemPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "drawerItemPress">;
94
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "focus">;
95
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "blur">;
96
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "state">;
97
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/drawer").DrawerNavigationEventMap, "beforeRemove">;
94
+ drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "drawerItemPress">;
95
+ focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "focus">;
96
+ blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "blur">;
97
+ state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "state">;
98
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap, "beforeRemove">;
98
99
  }>) | undefined;
99
100
  screenOptions?: DrawerNavigationOptions | ((props: {
100
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
101
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
101
102
  navigation: any;
102
103
  }) => DrawerNavigationOptions) | undefined;
103
104
  }, "children">> & import("react").RefAttributes<unknown>> & {
104
- Screen: (props: import("../useScreens").ScreenProps<DrawerNavigationOptions>) => null;
105
+ Screen: (props: import("../useScreens").ScreenProps<DrawerNavigationOptions, DrawerNavigationState<ParamListBase>, DrawerNavigationEventMap>) => null;
105
106
  };
106
107
  export default Drawer;
107
108
  //# sourceMappingURL=Drawer.d.ts.map
package/build/layouts/Drawer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Drawer.d.ts","sourceRoot":"","sources":["../../src/layouts/Drawer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEL,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAMlC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGD,CAAC;AAEnB,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"Drawer.d.ts","sourceRoot":"","sources":["../../src/layouts/Drawer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEL,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMhF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKD,CAAC;AAEnB,eAAe,MAAM,CAAC"}
package/build/layouts/Stack.d.ts CHANGED
@@ -1,107 +1,108 @@
1
1
  /// <reference types="react" />
2
- import { NativeStackNavigationOptions } from "@react-navigation/native-stack";
3
- export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/routers").DefaultRouterOptions<string> & {
2
+ import { ParamListBase, StackNavigationState } from "@react-navigation/native";
3
+ import { NativeStackNavigationEventMap, NativeStackNavigationOptions } from "@react-navigation/native-stack";
4
+ export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/native").DefaultRouterOptions<string> & {
4
5
  id?: string | undefined;
5
6
  children: import("react").ReactNode;
6
7
  screenListeners?: Partial<{
7
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
8
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
9
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
10
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
11
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
12
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
8
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
9
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
10
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
11
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
12
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
13
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
13
14
  }> | ((props: {
14
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
15
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
15
16
  navigation: any;
16
17
  }) => Partial<{
17
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
18
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
19
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
20
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
21
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
22
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
18
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
19
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
20
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
21
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
22
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
23
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
23
24
  }>) | undefined;
24
25
  screenOptions?: NativeStackNavigationOptions | ((props: {
25
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
26
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
26
27
  navigation: any;
27
28
  }) => NativeStackNavigationOptions) | undefined;
28
- } & import("@react-navigation/routers").StackRouterOptions, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
29
+ } & import("@react-navigation/native").StackRouterOptions, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/native").DefaultRouterOptions<string> & {
29
30
  id?: string | undefined;
30
31
  children: import("react").ReactNode;
31
32
  screenListeners?: Partial<{
32
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
33
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
34
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
35
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
36
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
37
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
33
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
34
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
35
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
36
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
37
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
38
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
38
39
  }> | ((props: {
39
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
40
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
40
41
  navigation: any;
41
42
  }) => Partial<{
42
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
43
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
44
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
45
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
46
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
47
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
43
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
44
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
45
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
46
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
47
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
48
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
48
49
  }>) | undefined;
49
50
  screenOptions?: NativeStackNavigationOptions | ((props: {
50
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
51
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
51
52
  navigation: any;
52
53
  }) => NativeStackNavigationOptions) | undefined;
53
- }, "children"> & Partial<Pick<Omit<import("@react-navigation/routers").DefaultRouterOptions<string> & {
54
+ }, "children"> & Partial<Pick<Omit<import("@react-navigation/native").DefaultRouterOptions<string> & {
54
55
  id?: string | undefined;
55
56
  children: import("react").ReactNode;
56
57
  screenListeners?: Partial<{
57
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
58
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
59
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
60
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
61
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
62
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
58
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
59
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
60
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
61
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
62
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
63
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
63
64
  }> | ((props: {
64
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
65
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
65
66
  navigation: any;
66
67
  }) => Partial<{
67
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
68
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
69
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
70
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
71
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
72
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
68
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
69
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
70
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
71
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
72
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
73
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
73
74
  }>) | undefined;
74
75
  screenOptions?: NativeStackNavigationOptions | ((props: {
75
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
76
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
76
77
  navigation: any;
77
78
  }) => NativeStackNavigationOptions) | undefined;
78
- } & import("@react-navigation/routers").StackRouterOptions, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
79
+ } & import("@react-navigation/native").StackRouterOptions, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/native").DefaultRouterOptions<string> & {
79
80
  id?: string | undefined;
80
81
  children: import("react").ReactNode;
81
82
  screenListeners?: Partial<{
82
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
83
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
84
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
85
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
86
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
87
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
83
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
84
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
85
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
86
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
87
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
88
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
88
89
  }> | ((props: {
89
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
90
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
90
91
  navigation: any;
91
92
  }) => Partial<{
92
- transitionStart: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionStart">;
93
- transitionEnd: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "transitionEnd">;
94
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "focus">;
95
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "blur">;
96
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "state">;
97
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/native-stack").NativeStackNavigationEventMap, "beforeRemove">;
93
+ transitionStart: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionStart">;
94
+ transitionEnd: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "transitionEnd">;
95
+ focus: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "focus">;
96
+ blur: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "blur">;
97
+ state: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "state">;
98
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<NativeStackNavigationEventMap, "beforeRemove">;
98
99
  }>) | undefined;
99
100
  screenOptions?: NativeStackNavigationOptions | ((props: {
100
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
101
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
101
102
  navigation: any;
102
103
  }) => NativeStackNavigationOptions) | undefined;
103
104
  }, "children">> & import("react").RefAttributes<unknown>> & {
104
- Screen: (props: import("../useScreens").ScreenProps<NativeStackNavigationOptions>) => null;
105
+ Screen: (props: import("../useScreens").ScreenProps<NativeStackNavigationOptions, StackNavigationState<ParamListBase>, NativeStackNavigationEventMap>) => null;
105
106
  };
106
107
  export default Stack;
107
108
  //# sourceMappingURL=Stack.d.ts.map
package/build/layouts/Stack.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../../src/layouts/Stack.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEL,4BAA4B,EAC7B,MAAM,gCAAgC,CAAC;AAMxC,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGK,CAAC;AAExB,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../../src/layouts/Stack.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAEL,6BAA6B,EAC7B,4BAA4B,EAC7B,MAAM,gCAAgC,CAAC;AAMxC,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKK,CAAC;AAExB,eAAe,KAAK,CAAC"}
package/build/layouts/Tabs.d.ts CHANGED
@@ -1,108 +1,109 @@
1
- import { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
1
+ import { BottomTabNavigationOptions, BottomTabNavigationEventMap } from "@react-navigation/bottom-tabs";
2
+ import { TabNavigationState, ParamListBase } from "@react-navigation/native";
2
3
  import React from "react";
3
4
  import { Href } from "../link/href";
4
- export declare const Tabs: React.ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/routers").DefaultRouterOptions<string> & {
5
+ export declare const Tabs: React.ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/native").DefaultRouterOptions<string> & {
5
6
  id?: string | undefined;
6
7
  children: React.ReactNode;
7
8
  screenListeners?: Partial<{
8
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
9
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
10
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
11
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
12
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
13
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
9
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
10
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
11
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
12
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
13
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
14
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
14
15
  }> | ((props: {
15
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
16
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
16
17
  navigation: any;
17
18
  }) => Partial<{
18
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
19
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
20
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
21
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
22
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
23
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
19
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
20
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
21
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
22
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
23
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
24
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
24
25
  }>) | undefined;
25
26
  screenOptions?: BottomTabNavigationOptions | ((props: {
26
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
27
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
27
28
  navigation: any;
28
29
  }) => BottomTabNavigationOptions) | undefined;
29
- } & import("@react-navigation/routers").DefaultRouterOptions & {
30
+ } & import("@react-navigation/native").DefaultRouterOptions & {
30
31
  backBehavior?: import("@react-navigation/routers/lib/typescript/src/TabRouter").BackBehavior | undefined;
31
- } & import("@react-navigation/bottom-tabs/lib/typescript/src/types").BottomTabNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
32
+ } & import("@react-navigation/bottom-tabs/lib/typescript/src/types").BottomTabNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/native").DefaultRouterOptions<string> & {
32
33
  id?: string | undefined;
33
34
  children: React.ReactNode;
34
35
  screenListeners?: Partial<{
35
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
36
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
37
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
38
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
39
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
40
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
36
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
37
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
38
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
39
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
40
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
41
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
41
42
  }> | ((props: {
42
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
43
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
43
44
  navigation: any;
44
45
  }) => Partial<{
45
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
46
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
47
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
48
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
49
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
50
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
46
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
47
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
48
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
49
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
50
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
51
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
51
52
  }>) | undefined;
52
53
  screenOptions?: BottomTabNavigationOptions | ((props: {
53
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
54
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
54
55
  navigation: any;
55
56
  }) => BottomTabNavigationOptions) | undefined;
56
- }, "children"> & Partial<Pick<Omit<import("@react-navigation/routers").DefaultRouterOptions<string> & {
57
+ }, "children"> & Partial<Pick<Omit<import("@react-navigation/native").DefaultRouterOptions<string> & {
57
58
  id?: string | undefined;
58
59
  children: React.ReactNode;
59
60
  screenListeners?: Partial<{
60
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
61
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
62
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
63
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
64
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
65
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
61
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
62
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
63
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
64
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
65
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
66
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
66
67
  }> | ((props: {
67
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
68
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
68
69
  navigation: any;
69
70
  }) => Partial<{
70
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
71
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
72
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
73
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
74
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
75
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
71
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
72
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
73
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
74
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
75
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
76
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
76
77
  }>) | undefined;
77
78
  screenOptions?: BottomTabNavigationOptions | ((props: {
78
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
79
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
79
80
  navigation: any;
80
81
  }) => BottomTabNavigationOptions) | undefined;
81
- } & import("@react-navigation/routers").DefaultRouterOptions & {
82
+ } & import("@react-navigation/native").DefaultRouterOptions & {
82
83
  backBehavior?: import("@react-navigation/routers/lib/typescript/src/TabRouter").BackBehavior | undefined;
83
- } & import("@react-navigation/bottom-tabs/lib/typescript/src/types").BottomTabNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
84
+ } & import("@react-navigation/bottom-tabs/lib/typescript/src/types").BottomTabNavigationConfig, "initialRouteName" | "children" | "id" | "screenListeners" | "screenOptions"> & import("@react-navigation/native").DefaultRouterOptions<string> & {
84
85
  id?: string | undefined;
85
86
  children: React.ReactNode;
86
87
  screenListeners?: Partial<{
87
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
88
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
89
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
90
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
91
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
92
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
88
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
89
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
90
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
91
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
92
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
93
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
93
94
  }> | ((props: {
94
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
95
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
95
96
  navigation: any;
96
97
  }) => Partial<{
97
- tabPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabPress">;
98
- tabLongPress: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "tabLongPress">;
99
- focus: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "focus">;
100
- blur: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "blur">;
101
- state: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "state">;
102
- beforeRemove: import("@react-navigation/core").EventListenerCallback<import("@react-navigation/bottom-tabs").BottomTabNavigationEventMap, "beforeRemove">;
98
+ tabPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabPress">;
99
+ tabLongPress: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "tabLongPress">;
100
+ focus: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "focus">;
101
+ blur: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "blur">;
102
+ state: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "state">;
103
+ beforeRemove: import("@react-navigation/native").EventListenerCallback<BottomTabNavigationEventMap, "beforeRemove">;
103
104
  }>) | undefined;
104
105
  screenOptions?: BottomTabNavigationOptions | ((props: {
105
- route: import("@react-navigation/core").RouteProp<import("@react-navigation/routers").ParamListBase, string>;
106
+ route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
106
107
  navigation: any;
107
108
  }) => BottomTabNavigationOptions) | undefined;
108
109
  }, "children">> & React.RefAttributes<unknown>> & {
@@ -148,7 +149,7 @@ export declare const Tabs: React.ForwardRefExoticComponent<Omit<Omit<import("@re
148
149
  freezeOnBlur?: boolean | undefined;
149
150
  } & {
150
151
  href?: Href | null | undefined;
151
- }>) => null;
152
+ }, TabNavigationState<ParamListBase>, BottomTabNavigationEventMap>) => null;
152
153
  };
153
154
  export default Tabs;
154
155
  //# sourceMappingURL=Tabs.d.ts.map
package/build/layouts/Tabs.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAE3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAMpC,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2Cf,CAAC;AAEH,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,EAE5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAMpC,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Cf,CAAC;AAEH,eAAe,IAAI,CAAC"}
package/build/layouts/withLayoutContext.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { EventMapBase, NavigationState } from "@react-navigation/native";
1
2
  import React from "react";
2
3
  import { PickPartial } from "../types";
3
4
  import { ScreenProps } from "../useScreens";
@@ -10,7 +11,7 @@ export declare function useFilterScreenChildren(children: React.ReactNode, { isC
10
11
  children: any[];
11
12
  };
12
13
  /** Return a navigator that automatically injects matched routes and renders nothing when there are no children. Return type with children prop optional */
13
- export declare function withLayoutContext<TOptions extends object, T extends React.ComponentType<any>>(Nav: T, processor?: (options: ScreenProps<TOptions>[]) => ScreenProps<TOptions>[]): React.ForwardRefExoticComponent<React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, "children">> & React.RefAttributes<unknown>> & {
14
- Screen: (props: ScreenProps<TOptions>) => null;
14
+ export declare function withLayoutContext<TOptions extends object, T extends React.ComponentType<any>, State extends NavigationState, EventMap extends EventMapBase>(Nav: T, processor?: (options: ScreenProps<TOptions, State, EventMap>[]) => ScreenProps<TOptions, State, EventMap>[]): React.ForwardRefExoticComponent<React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, "children">> & React.RefAttributes<unknown>> & {
15
+ Screen: (props: ScreenProps<TOptions, State, EventMap>) => null;
15
16
  };
16
17
  //# sourceMappingURL=withLayoutContext.d.ts.map
package/build/layouts/withLayoutContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"withLayoutContext.d.ts","sourceRoot":"","sources":["../../src/layouts/withLayoutContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAoB,WAAW,EAAE,MAAM,eAAe,CAAC;AAG9D,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,EACE,iBAAiB,EACjB,UAAU,GACX,GAAE;IACD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB;;;EAgDP;AAED,2JAA2J;AAC3J,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,EACvB,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAElC,GAAG,EAAE,CAAC,EACN,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,KAAK,WAAW,CAAC,QAAQ,CAAC,EAAE,GACxE,KAAK,CAAC,yBAAyB,CAChC,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GACrE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAC/B,GAAG;IACF,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CAChD,CAmCA"}
1
+ {"version":3,"file":"withLayoutContext.d.ts","sourceRoot":"","sources":["../../src/layouts/withLayoutContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAoB,WAAW,EAAE,MAAM,eAAe,CAAC;AAG9D,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,EACE,iBAAiB,EACjB,UAAU,GACX,GAAE;IACD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB;;;EAgDP;AAED,2JAA2J;AAC3J,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,EACvB,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAClC,KAAK,SAAS,eAAe,EAC7B,QAAQ,SAAS,YAAY,EAE7B,GAAG,EAAE,CAAC,EACN,SAAS,CAAC,EAAE,CACV,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,KAC9C,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,GAC5C,KAAK,CAAC,yBAAyB,CAChC,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GACrE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAC/B,GAAG;IACF,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,CAAC;CACjE,CAmCA"}
package/build/link/stateOperations.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stateOperations.d.ts","sourceRoot":"","sources":["../../src/link/stateOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,aAAa,EACb,YAAY,EACZ,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CACrB,GAAG;IACF,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAaF,iDAAiD;AACjD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;EAIvD;AAED,sEAAsE;AACtE,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,EACzE,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAgCT;AAKD,wBAAgB,oCAAoC,CAClD,SAAS,EAAE,YAAY,EACvB,WAAW,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyBzB;AAKD,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,aAAa,EAChE,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,EACzC,YAAY,EAAE,oBAAoB,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgCtD"}
1
+ {"version":3,"file":"stateOperations.d.ts","sourceRoot":"","sources":["../../src/link/stateOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,aAAa,EACb,YAAY,EACZ,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CACrB,GAAG;IACF,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAwBF,iDAAiD;AACjD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;EAIvD;AAED,sEAAsE;AACtE,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,EACzE,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAgCT;AAKD,wBAAgB,oCAAoC,CAClD,SAAS,EAAE,YAAY,EACvB,WAAW,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyBzB;AAKD,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,aAAa,EAChE,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,EACzC,YAAY,EAAE,oBAAoB,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgCtD"}
package/build/useScreens.d.ts CHANGED
@@ -1,6 +1,7 @@
1
+ import type { EventMapBase, NavigationState, ParamListBase, RouteProp, ScreenListeners } from "@react-navigation/native";
1
2
  import React from "react";
2
3
  import { RouteNode } from "./Route";
3
- export type ScreenProps<TOptions extends Record<string, any> = Record<string, any>> = {
4
+ export type ScreenProps<TOptions extends Record<string, any> = Record<string, any>, State extends NavigationState = NavigationState, EventMap extends EventMapBase = EventMapBase> = {
4
5
  /** Name is required when used inside a Layout component. */
5
6
  name?: string;
6
7
  /**
@@ -12,7 +13,10 @@ export type ScreenProps<TOptions extends Record<string, any> = Record<string, an
12
13
  [key: string]: any;
13
14
  };
14
15
  options?: TOptions;
15
- listeners?: any;
16
+ listeners?: ScreenListeners<State, EventMap> | ((prop: {
17
+ route: RouteProp<ParamListBase, string>;
18
+ navigation: any;
19
+ }) => ScreenListeners<State, EventMap>);
16
20
  getId?: ({ params, }: {
17
21
  params?: Record<string, any> | undefined;
18
22
  }) => string | undefined;
package/build/useScreens.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAIL,SAAS,EAGV,MAAM,SAAS,CAAC;AAOjB,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAGnB,SAAS,CAAC,EAAE,GAAG,CAAC;IAEhB,KAAK,CAAC,EAAE,CAAC,EACP,MAAM,GACP,EAAE;QACD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;KAC1C,KAAK,MAAM,GAAG,SAAS,CAAC;CAC1B,CAAC;AAiEF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAUxE;AAsCD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,kIAuE1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;;sCA0B5C"}
1
+ {"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAIL,SAAS,EAGV,MAAM,SAAS,CAAC;AAOjB,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1D,KAAK,SAAS,eAAe,GAAG,eAAe,EAC/C,QAAQ,SAAS,YAAY,GAAG,YAAY,IAC1C;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB,SAAS,CAAC,EACN,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,GAChC,CAAC,CAAC,IAAI,EAAE;QACN,KAAK,EAAE,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACxC,UAAU,EAAE,GAAG,CAAC;KACjB,KAAK,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE5C,KAAK,CAAC,EAAE,CAAC,EACP,MAAM,GACP,EAAE;QACD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;KAC1C,KAAK,MAAM,GAAG,SAAS,CAAC;CAC1B,CAAC;AAiEF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAUxE;AAsCD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,kIAuE1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;;sCA0B5C"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "expo-router",
3
- "version": "2.0.3",
3
+ "version": "2.0.5",
4
4
  "main": "src/index.tsx",
5
5
  "types": "build/index.d.ts",
6
6
  "files": [
@@ -104,7 +104,7 @@
104
104
  },
105
105
  "dependencies": {
106
106
  "@bacons/react-views": "^1.1.3",
107
- "@expo/metro-runtime": "2.2.6",
107
+ "@expo/metro-runtime": "2.2.7",
108
108
  "@radix-ui/react-slot": "1.0.1",
109
109
  "@react-navigation/bottom-tabs": "~6.5.7",
110
110
  "@react-navigation/native": "~6.1.6",
package/src/fork/getPathFromState.ts CHANGED
@@ -153,7 +153,7 @@ export function getPathDataFromState<ParamList extends object>(
153
153
  }
154
154
 
155
155
  return getPathFromResolvedState(
156
- state,
156
+ JSON.parse(JSON.stringify(state)),
157
157
  // Create a normalized configs object which will be easier to use
158
158
  createNormalizedConfigs(options.screens),
159
159
  { preserveGroups, preserveDynamicRoutes }
package/src/layouts/Drawer.tsx CHANGED
@@ -1,7 +1,9 @@
1
1
  import {
2
2
  createDrawerNavigator,
3
+ DrawerNavigationEventMap,
3
4
  DrawerNavigationOptions,
4
5
  } from "@react-navigation/drawer";
6
+ import { DrawerNavigationState, ParamListBase } from "@react-navigation/native";
5
7
 
6
8
  import { withLayoutContext } from "./withLayoutContext";
7
9
 
@@ -9,7 +11,9 @@ const DrawerNavigator = createDrawerNavigator().Navigator;
9
11
 
10
12
  export const Drawer = withLayoutContext<
11
13
  DrawerNavigationOptions,
12
- typeof DrawerNavigator
14
+ typeof DrawerNavigator,
15
+ DrawerNavigationState<ParamListBase>,
16
+ DrawerNavigationEventMap
13
17
  >(DrawerNavigator);
14
18
 
15
19
  export default Drawer;
package/src/layouts/Stack.tsx CHANGED
@@ -1,5 +1,7 @@
1
+ import { ParamListBase, StackNavigationState } from "@react-navigation/native";
1
2
  import {
2
3
  createNativeStackNavigator,
4
+ NativeStackNavigationEventMap,
3
5
  NativeStackNavigationOptions,
4
6
  } from "@react-navigation/native-stack";
5
7
 
@@ -9,7 +11,9 @@ const NativeStackNavigator = createNativeStackNavigator().Navigator;
9
11
 
10
12
  export const Stack = withLayoutContext<
11
13
  NativeStackNavigationOptions,
12
- typeof NativeStackNavigator
14
+ typeof NativeStackNavigator,
15
+ StackNavigationState<ParamListBase>,
16
+ NativeStackNavigationEventMap
13
17
  >(NativeStackNavigator);
14
18
 
15
19
  export default Stack;
package/src/layouts/Tabs.tsx CHANGED
@@ -1,8 +1,10 @@
1
1
  import { Pressable } from "@bacons/react-views";
2
2
  import {
3
3
  BottomTabNavigationOptions,
4
+ BottomTabNavigationEventMap,
4
5
  createBottomTabNavigator,
5
6
  } from "@react-navigation/bottom-tabs";
7
+ import { TabNavigationState, ParamListBase } from "@react-navigation/native";
6
8
  import React from "react";
7
9
  import { Platform } from "react-native";
8
10
 
@@ -15,7 +17,9 @@ const BottomTabNavigator = createBottomTabNavigator().Navigator;
15
17
 
16
18
  export const Tabs = withLayoutContext<
17
19
  BottomTabNavigationOptions & { href?: Href | null },
18
- typeof BottomTabNavigator
20
+ typeof BottomTabNavigator,
21
+ TabNavigationState<ParamListBase>,
22
+ BottomTabNavigationEventMap
19
23
  >(BottomTabNavigator, (screens) => {
20
24
  // Support the `href` shortcut prop.
21
25
  return screens.map((screen) => {
package/src/layouts/withLayoutContext.tsx CHANGED
@@ -1,3 +1,4 @@
1
+ import { EventMapBase, NavigationState } from "@react-navigation/native";
1
2
  import React from "react";
2
3
 
3
4
  import { useContextKey } from "../Route";
@@ -67,15 +68,19 @@ export function useFilterScreenChildren(
67
68
  /** Return a navigator that automatically injects matched routes and renders nothing when there are no children. Return type with children prop optional */
68
69
  export function withLayoutContext<
69
70
  TOptions extends object,
70
- T extends React.ComponentType<any>
71
+ T extends React.ComponentType<any>,
72
+ State extends NavigationState,
73
+ EventMap extends EventMapBase
71
74
  >(
72
75
  Nav: T,
73
- processor?: (options: ScreenProps<TOptions>[]) => ScreenProps<TOptions>[]
76
+ processor?: (
77
+ options: ScreenProps<TOptions, State, EventMap>[]
78
+ ) => ScreenProps<TOptions, State, EventMap>[]
74
79
  ): React.ForwardRefExoticComponent<
75
80
  React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, "children">> &
76
81
  React.RefAttributes<unknown>
77
82
  > & {
78
- Screen: (props: ScreenProps<TOptions>) => null;
83
+ Screen: (props: ScreenProps<TOptions, State, EventMap>) => null;
79
84
  } {
80
85
  const Navigator = React.forwardRef(
81
86
  (
package/src/link/stateOperations.ts CHANGED
@@ -26,11 +26,22 @@ export type NavigateActionParams = {
26
26
  // Get the last state for a given target state (generated from a path).
27
27
  function findTopStateForTarget(state: ResultState) {
28
28
  let current: Partial<InitialState> | undefined = state;
29
+ let previous: Partial<InitialState> | undefined = state;
29
30
 
30
31
  while (current?.routes?.[current?.routes?.length - 1].state != null) {
32
+ previous = current;
31
33
  current = current?.routes[current?.routes.length - 1].state;
32
34
  }
33
35
 
36
+ // If the last route in the target state is an index route, return the previous state (parent).
37
+ // NOTE: This may need to be updated to support initial route name being a non-standard value.
38
+ if (
39
+ previous &&
40
+ current?.routes?.[current.routes.length - 1]!.name === "index"
41
+ ) {
42
+ return previous;
43
+ }
44
+
34
45
  return current;
35
46
  }
36
47
 
package/src/useScreens.tsx CHANGED
@@ -1,3 +1,10 @@
1
+ import type {
2
+ EventMapBase,
3
+ NavigationState,
4
+ ParamListBase,
5
+ RouteProp,
6
+ ScreenListeners,
7
+ } from "@react-navigation/native";
1
8
  import React from "react";
2
9
 
3
10
  import {
@@ -15,7 +22,9 @@ import { SuspenseFallback } from "./views/SuspenseFallback";
15
22
  import { Try } from "./views/Try";
16
23
 
17
24
  export type ScreenProps<
18
- TOptions extends Record<string, any> = Record<string, any>
25
+ TOptions extends Record<string, any> = Record<string, any>,
26
+ State extends NavigationState = NavigationState,
27
+ EventMap extends EventMapBase = EventMapBase
19
28
  > = {
20
29
  /** Name is required when used inside a Layout component. */
21
30
  name?: string;
@@ -27,8 +36,12 @@ export type ScreenProps<
27
36
  initialParams?: { [key: string]: any };
28
37
  options?: TOptions;
29
38
 
30
- // TODO: types
31
- listeners?: any;
39
+ listeners?:
40
+ | ScreenListeners<State, EventMap>
41
+ | ((prop: {
42
+ route: RouteProp<ParamListBase, string>;
43
+ navigation: any;
44
+ }) => ScreenListeners<State, EventMap>);
32
45
 
33
46
  getId?: ({
34
47
  params,