@react-navigation/bottom-tabs 7.18.18 → 7.19.1
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.
- package/lib/module/navigators/createBottomTabNavigator.js +7 -9
- package/lib/module/navigators/createBottomTabNavigator.js.map +1 -1
- package/lib/module/unstable/createNativeBottomTabNavigator.native.js +7 -9
- package/lib/module/unstable/createNativeBottomTabNavigator.native.js.map +1 -1
- package/lib/typescript/src/navigators/createBottomTabNavigator.d.ts.map +1 -1
- package/lib/typescript/src/unstable/createNativeBottomTabNavigator.native.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/navigators/createBottomTabNavigator.tsx +25 -28
- package/src/unstable/createNativeBottomTabNavigator.native.tsx +25 -28
|
@@ -20,7 +20,7 @@ function BottomTabNavigator({
|
|
|
20
20
|
state,
|
|
21
21
|
descriptors,
|
|
22
22
|
navigation,
|
|
23
|
-
|
|
23
|
+
render
|
|
24
24
|
} = useNavigationBuilder(TabRouter, {
|
|
25
25
|
id,
|
|
26
26
|
initialRouteName,
|
|
@@ -33,14 +33,12 @@ function BottomTabNavigator({
|
|
|
33
33
|
screenLayout,
|
|
34
34
|
UNSTABLE_router
|
|
35
35
|
});
|
|
36
|
-
return /*#__PURE__*/_jsx(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
})
|
|
43
|
-
});
|
|
36
|
+
return render(/*#__PURE__*/_jsx(BottomTabView, {
|
|
37
|
+
...rest,
|
|
38
|
+
state: state,
|
|
39
|
+
navigation: navigation,
|
|
40
|
+
descriptors: descriptors
|
|
41
|
+
}));
|
|
44
42
|
}
|
|
45
43
|
export function createBottomTabNavigator(config) {
|
|
46
44
|
return createNavigatorFactory(BottomTabNavigator)(config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createNavigatorFactory","createScreenFactory","TabRouter","useNavigationBuilder","BottomTabView","jsx","_jsx","BottomTabNavigator","id","initialRouteName","backBehavior","UNSTABLE_routeNamesChangeBehavior","children","layout","screenListeners","screenOptions","screenLayout","UNSTABLE_router","rest","state","descriptors","navigation","
|
|
1
|
+
{"version":3,"names":["createNavigatorFactory","createScreenFactory","TabRouter","useNavigationBuilder","BottomTabView","jsx","_jsx","BottomTabNavigator","id","initialRouteName","backBehavior","UNSTABLE_routeNamesChangeBehavior","children","layout","screenListeners","screenOptions","screenLayout","UNSTABLE_router","rest","state","descriptors","navigation","render","createBottomTabNavigator","config","createBottomTabScreen"],"sourceRoot":"../../../src","sources":["navigators/createBottomTabNavigator.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EACtBC,mBAAmB,EAMnBC,SAAS,EAGTC,oBAAoB,QACf,0BAA0B;AAQjC,SAASC,aAAa,QAAQ,2BAAwB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEvD,SAASC,kBAAkBA,CAAC;EAC1BC,EAAE;EACFC,gBAAgB;EAChBC,YAAY;EACZC,iCAAiC;EACjCC,QAAQ;EACRC,MAAM;EACNC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,eAAe;EACf,GAAGC;AACoB,CAAC,EAAE;EAC1B,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAO,CAAC,GAAGnB,oBAAoB,CAMrED,SAAS,EAAE;IACXM,EAAE;IACFC,gBAAgB;IAChBC,YAAY;IACZC,iCAAiC;IACjCC,QAAQ;IACRC,MAAM;IACNC,eAAe;IACfC,aAAa;IACbC,YAAY;IACZC;EACF,CAAC,CAAC;EAEF,OAAOK,MAAM,cACXhB,IAAA,CAACF,aAAa;IAAA,GACRc,IAAI;IACRC,KAAK,EAAEA,KAAM;IACbE,UAAU,EAAEA,UAAW;IACvBD,WAAW,EAAEA;EAAY,CAC1B,CACH,CAAC;AACH;AAqBA,OAAO,SAASG,wBAAwBA,CAQtCC,MAAe,EAAmC;EAClD,OAAOxB,sBAAsB,CAACO,kBAAkB,CAAC,CAACiB,MAAM,CAAC;AAC3D;AAEA,OAAO,MAAMC,qBAAqB,GAAGxB,mBAAmB,CAAmB,CAAC","ignoreList":[]}
|
|
@@ -21,7 +21,7 @@ function NativeBottomTabNavigator({
|
|
|
21
21
|
state,
|
|
22
22
|
navigation,
|
|
23
23
|
descriptors,
|
|
24
|
-
|
|
24
|
+
render
|
|
25
25
|
} = useNavigationBuilder(TabRouter, {
|
|
26
26
|
id,
|
|
27
27
|
initialRouteName,
|
|
@@ -50,14 +50,12 @@ function NativeBottomTabNavigator({
|
|
|
50
50
|
}
|
|
51
51
|
previousRouteKeyRef.current = focusedRouteKey;
|
|
52
52
|
}, [descriptors, focusedRouteKey, navigation]);
|
|
53
|
-
return /*#__PURE__*/_jsx(
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
})
|
|
60
|
-
});
|
|
53
|
+
return render(/*#__PURE__*/_jsx(NativeBottomTabView, {
|
|
54
|
+
...rest,
|
|
55
|
+
state: state,
|
|
56
|
+
navigation: navigation,
|
|
57
|
+
descriptors: descriptors
|
|
58
|
+
}));
|
|
61
59
|
}
|
|
62
60
|
export function createNativeBottomTabNavigator(config) {
|
|
63
61
|
return createNavigatorFactory(NativeBottomTabNavigator)(config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createNavigatorFactory","createScreenFactory","StackActions","TabRouter","useNavigationBuilder","React","NativeBottomTabView","jsx","_jsx","NativeBottomTabNavigator","id","initialRouteName","backBehavior","children","layout","screenListeners","screenOptions","screenLayout","UNSTABLE_router","UNSTABLE_routeNamesChangeBehavior","rest","state","navigation","descriptors","
|
|
1
|
+
{"version":3,"names":["createNavigatorFactory","createScreenFactory","StackActions","TabRouter","useNavigationBuilder","React","NativeBottomTabView","jsx","_jsx","NativeBottomTabNavigator","id","initialRouteName","backBehavior","children","layout","screenListeners","screenOptions","screenLayout","UNSTABLE_router","UNSTABLE_routeNamesChangeBehavior","rest","state","navigation","descriptors","render","focusedRouteKey","routes","index","key","previousRouteKeyRef","useRef","useEffect","previousRouteKey","current","options","popToTopOnBlur","currentState","getState","prevRoute","find","route","type","length","dispatch","popToTop","target","createNativeBottomTabNavigator","config","createNativeBottomTabScreen"],"sourceRoot":"../../../src","sources":["unstable/createNativeBottomTabNavigator.native.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EACtBC,mBAAmB,EAGnBC,YAAY,EAIZC,SAAS,EAGTC,oBAAoB,QACf,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,mBAAmB,QAAQ,iCAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQnE,SAASC,wBAAwBA,CAAC;EAChCC,EAAE;EACFC,gBAAgB;EAChBC,YAAY;EACZC,QAAQ;EACRC,MAAM;EACNC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,eAAe;EACfC,iCAAiC;EACjC,GAAGC;AAC0B,CAAC,EAAE;EAChC,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC,WAAW;IAAEC;EAAO,CAAC,GAAGpB,oBAAoB,CAMrED,SAAS,EAAE;IACXO,EAAE;IACFC,gBAAgB;IAChBC,YAAY;IACZC,QAAQ;IACRC,MAAM;IACNC,eAAe;IACfC,aAAa;IACbC,YAAY;IACZC,eAAe;IACfC;EACF,CAAC,CAAC;EAEF,MAAMM,eAAe,GAAGJ,KAAK,CAACK,MAAM,CAACL,KAAK,CAACM,KAAK,CAAC,CAACC,GAAG;EACrD,MAAMC,mBAAmB,GAAGxB,KAAK,CAACyB,MAAM,CAACL,eAAe,CAAC;EAEzDpB,KAAK,CAAC0B,SAAS,CAAC,MAAM;IACpB,MAAMC,gBAAgB,GAAGH,mBAAmB,CAACI,OAAO;IAEpD,IACED,gBAAgB,KAAKP,eAAe,IACpCF,WAAW,CAACS,gBAAgB,CAAC,EAAEE,OAAO,CAACC,cAAc,EACrD;MACA,MAAMC,YAAY,GAAGd,UAAU,CAACe,QAAQ,CAAC,CAAC;MAC1C,MAAMC,SAAS,GAAGF,YAAY,CAACV,MAAM,CAACa,IAAI,CACvCC,KAAK,IAAKA,KAAK,CAACZ,GAAG,KAAKI,gBAC3B,CAAC;MAED,IACEM,SAAS,EAAEjB,KAAK,EAAEoB,IAAI,KAAK,OAAO,IAClCH,SAAS,CAACjB,KAAK,CAACO,GAAG,IACnB,CAACU,SAAS,CAACjB,KAAK,CAACM,KAAK,IAAIW,SAAS,CAACjB,KAAK,CAACK,MAAM,CAACgB,MAAM,GAAG,CAAC,IAAI,CAAC,EAChE;QACApB,UAAU,CAACqB,QAAQ,CAAC;UAClB,GAAGzC,YAAY,CAAC0C,QAAQ,CAAC,CAAC;UAC1BC,MAAM,EAAEP,SAAS,CAACjB,KAAK,CAACO;QAC1B,CAAC,CAAC;MACJ;IACF;IAEAC,mBAAmB,CAACI,OAAO,GAAGR,eAAe;EAC/C,CAAC,EAAE,CAACF,WAAW,EAAEE,eAAe,EAAEH,UAAU,CAAC,CAAC;EAE9C,OAAOE,MAAM,cACXhB,IAAA,CAACF,mBAAmB;IAAA,GACdc,IAAI;IACRC,KAAK,EAAEA,KAAM;IACbC,UAAU,EAAEA,UAAW;IACvBC,WAAW,EAAEA;EAAY,CAC1B,CACH,CAAC;AACH;AAqBA,OAAO,SAASuB,8BAA8BA,CAQ5CC,MAAe,EAAmC;EAClD,OAAO/C,sBAAsB,CAACS,wBAAwB,CAAC,CAACsC,MAAM,CAAC;AACjE;AAEA,OAAO,MAAMC,2BAA2B,GACtC/C,mBAAmB,CAAyB,CAAC","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBottomTabNavigator.d.ts","sourceRoot":"","sources":["../../../../src/navigators/createBottomTabNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,YAAY,EAEjB,KAAK,kBAAkB,EAGvB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,aAAU,CAAC;AAGlB,iBAAS,kBAAkB,CAAC,EAC1B,EAAE,EACF,gBAAgB,EAChB,YAAY,EACZ,iCAAiC,EACjC,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EACf,GAAG,IAAI,EACR,EAAE,uBAAuB,+
|
|
1
|
+
{"version":3,"file":"createBottomTabNavigator.d.ts","sourceRoot":"","sources":["../../../../src/navigators/createBottomTabNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,YAAY,EAEjB,KAAK,kBAAkB,EAGvB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,aAAU,CAAC;AAGlB,iBAAS,kBAAkB,CAAC,EAC1B,EAAE,EACF,gBAAgB,EAChB,YAAY,EACZ,iCAAiC,EACjC,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EACf,GAAG,IAAI,EACR,EAAE,uBAAuB,+BA4BzB;AAED,MAAM,MAAM,gBAAgB,CAC1B,SAAS,SAAS,aAAa,GAAG,aAAa,EAC/C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,IACzD;IACF,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACrC,aAAa,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,EAAE,2BAA2B,CAAC;IACtC,cAAc,EAAE;SACb,SAAS,IAAI,MAAM,SAAS,GAAG,uBAAuB,CACrD,SAAS,EACT,SAAS,EACT,WAAW,CACZ;KACF,CAAC;IACF,SAAS,EAAE,OAAO,kBAAkB,CAAC;CACtC,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,EACjE,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG,gBAAgB,CAC3D,SAAS,EACT,WAAW,CACZ,EACD,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAClE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD;AAED,eAAO,MAAM,qBAAqB,2GAA0C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNativeBottomTabNavigator.native.d.ts","sourceRoot":"","sources":["../../../../src/unstable/createNativeBottomTabNavigator.native.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAElB,KAAK,YAAY,EAEjB,KAAK,kBAAkB,EAGvB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EACV,iCAAiC,EACjC,gCAAgC,EAChC,6BAA6B,EAC7B,6BAA6B,EAC9B,MAAM,YAAS,CAAC;AAEjB,iBAAS,wBAAwB,CAAC,EAChC,EAAE,EACF,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EACf,iCAAiC,EACjC,GAAG,IAAI,EACR,EAAE,6BAA6B,
|
|
1
|
+
{"version":3,"file":"createNativeBottomTabNavigator.native.d.ts","sourceRoot":"","sources":["../../../../src/unstable/createNativeBottomTabNavigator.native.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAElB,KAAK,YAAY,EAEjB,KAAK,kBAAkB,EAGvB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EACV,iCAAiC,EACjC,gCAAgC,EAChC,6BAA6B,EAC7B,6BAA6B,EAC9B,MAAM,YAAS,CAAC;AAEjB,iBAAS,wBAAwB,CAAC,EAChC,EAAE,EACF,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EACf,iCAAiC,EACjC,GAAG,IAAI,EACR,EAAE,6BAA6B,qBA0D/B;AAED,MAAM,MAAM,sBAAsB,CAChC,SAAS,SAAS,aAAa,GAAG,aAAa,EAC/C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,IACzD;IACF,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACrC,aAAa,EAAE,gCAAgC,CAAC;IAChD,QAAQ,EAAE,iCAAiC,CAAC;IAC5C,cAAc,EAAE;SACb,SAAS,IAAI,MAAM,SAAS,GAAG,6BAA6B,CAC3D,SAAS,EACT,SAAS,EACT,WAAW,CACZ;KACF,CAAC;IACF,SAAS,EAAE,OAAO,wBAAwB,CAAC;CAC5C,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,EACjE,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG,sBAAsB,CACjE,SAAS,EACT,WAAW,CACZ,EACD,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAClE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD;AAED,eAAO,MAAM,2BAA2B,iHACO,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/bottom-tabs",
|
|
3
3
|
"description": "Bottom tab navigator following iOS design guidelines",
|
|
4
|
-
"version": "7.
|
|
4
|
+
"version": "7.19.1",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native-component",
|
|
7
7
|
"react-component",
|
|
@@ -46,13 +46,13 @@
|
|
|
46
46
|
"clean": "del lib"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@react-navigation/elements": "^2.9.
|
|
49
|
+
"@react-navigation/elements": "^2.9.42",
|
|
50
50
|
"color": "^4.2.3",
|
|
51
51
|
"sf-symbols-typescript": "^2.1.0"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@jest/globals": "^30.0.0",
|
|
55
|
-
"@react-navigation/native": "^7.
|
|
55
|
+
"@react-navigation/native": "^7.4.1",
|
|
56
56
|
"@testing-library/react-native": "^13.2.1",
|
|
57
57
|
"@types/color": "^4.2.0",
|
|
58
58
|
"@types/react": "~19.2.4",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"typescript": "~6.0.3"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@react-navigation/native": "^7.
|
|
69
|
+
"@react-navigation/native": "^7.4.1",
|
|
70
70
|
"react": ">= 18.2.0",
|
|
71
71
|
"react-native": "*",
|
|
72
72
|
"react-native-safe-area-context": ">= 4.0.0",
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
]
|
|
91
91
|
]
|
|
92
92
|
},
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "90950419c0ee5dec77cd40cee0687add80dcf625"
|
|
94
94
|
}
|
|
@@ -33,35 +33,32 @@ function BottomTabNavigator({
|
|
|
33
33
|
UNSTABLE_router,
|
|
34
34
|
...rest
|
|
35
35
|
}: BottomTabNavigatorProps) {
|
|
36
|
-
const { state, descriptors, navigation,
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
});
|
|
36
|
+
const { state, descriptors, navigation, render } = useNavigationBuilder<
|
|
37
|
+
TabNavigationState<ParamListBase>,
|
|
38
|
+
TabRouterOptions,
|
|
39
|
+
TabActionHelpers<ParamListBase>,
|
|
40
|
+
BottomTabNavigationOptions,
|
|
41
|
+
BottomTabNavigationEventMap
|
|
42
|
+
>(TabRouter, {
|
|
43
|
+
id,
|
|
44
|
+
initialRouteName,
|
|
45
|
+
backBehavior,
|
|
46
|
+
UNSTABLE_routeNamesChangeBehavior,
|
|
47
|
+
children,
|
|
48
|
+
layout,
|
|
49
|
+
screenListeners,
|
|
50
|
+
screenOptions,
|
|
51
|
+
screenLayout,
|
|
52
|
+
UNSTABLE_router,
|
|
53
|
+
});
|
|
55
54
|
|
|
56
|
-
return (
|
|
57
|
-
<
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
/>
|
|
64
|
-
</NavigationContent>
|
|
55
|
+
return render(
|
|
56
|
+
<BottomTabView
|
|
57
|
+
{...rest}
|
|
58
|
+
state={state}
|
|
59
|
+
navigation={navigation}
|
|
60
|
+
descriptors={descriptors}
|
|
61
|
+
/>
|
|
65
62
|
);
|
|
66
63
|
}
|
|
67
64
|
|
|
@@ -35,25 +35,24 @@ function NativeBottomTabNavigator({
|
|
|
35
35
|
UNSTABLE_routeNamesChangeBehavior,
|
|
36
36
|
...rest
|
|
37
37
|
}: NativeBottomTabNavigatorProps) {
|
|
38
|
-
const { state, navigation, descriptors,
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
});
|
|
38
|
+
const { state, navigation, descriptors, render } = useNavigationBuilder<
|
|
39
|
+
TabNavigationState<ParamListBase>,
|
|
40
|
+
TabRouterOptions,
|
|
41
|
+
TabActionHelpers<ParamListBase>,
|
|
42
|
+
NativeBottomTabNavigationOptions,
|
|
43
|
+
NativeBottomTabNavigationEventMap
|
|
44
|
+
>(TabRouter, {
|
|
45
|
+
id,
|
|
46
|
+
initialRouteName,
|
|
47
|
+
backBehavior,
|
|
48
|
+
children,
|
|
49
|
+
layout,
|
|
50
|
+
screenListeners,
|
|
51
|
+
screenOptions,
|
|
52
|
+
screenLayout,
|
|
53
|
+
UNSTABLE_router,
|
|
54
|
+
UNSTABLE_routeNamesChangeBehavior,
|
|
55
|
+
});
|
|
57
56
|
|
|
58
57
|
const focusedRouteKey = state.routes[state.index].key;
|
|
59
58
|
const previousRouteKeyRef = React.useRef(focusedRouteKey);
|
|
@@ -85,15 +84,13 @@ function NativeBottomTabNavigator({
|
|
|
85
84
|
previousRouteKeyRef.current = focusedRouteKey;
|
|
86
85
|
}, [descriptors, focusedRouteKey, navigation]);
|
|
87
86
|
|
|
88
|
-
return (
|
|
89
|
-
<
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
/>
|
|
96
|
-
</NavigationContent>
|
|
87
|
+
return render(
|
|
88
|
+
<NativeBottomTabView
|
|
89
|
+
{...rest}
|
|
90
|
+
state={state}
|
|
91
|
+
navigation={navigation}
|
|
92
|
+
descriptors={descriptors}
|
|
93
|
+
/>
|
|
97
94
|
);
|
|
98
95
|
}
|
|
99
96
|
|