@react-navigation/bottom-tabs 7.7.1 → 7.7.3
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/unstable/NativeBottomTabView.native.js +8 -8
- package/lib/module/unstable/NativeBottomTabView.native.js.map +1 -1
- package/lib/typescript/src/unstable/NativeBottomTabView.native.d.ts.map +1 -1
- package/lib/typescript/src/unstable/types.d.ts +1 -1
- package/lib/typescript/src/unstable/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/unstable/NativeBottomTabView.native.tsx +16 -20
- package/src/unstable/types.tsx +1 -1
|
@@ -95,17 +95,16 @@ export function NativeBottomTabView({
|
|
|
95
95
|
tabBarItemActiveIndicatorColor: activeIndicatorColor,
|
|
96
96
|
tabBarItemActiveIndicatorEnabled: currentOptions?.tabBarActiveIndicatorEnabled,
|
|
97
97
|
tabBarItemRippleColor: currentOptions?.tabBarRippleColor,
|
|
98
|
-
experimentalControlNavigationStateInJS:
|
|
98
|
+
experimentalControlNavigationStateInJS: false,
|
|
99
99
|
onNativeFocusChange: e => {
|
|
100
100
|
const route = state.routes.find(route => route.key === e.nativeEvent.tabKey);
|
|
101
101
|
if (route) {
|
|
102
|
-
|
|
103
|
-
const event = navigation.emit({
|
|
102
|
+
navigation.emit({
|
|
104
103
|
type: 'tabPress',
|
|
105
|
-
target: route.key
|
|
106
|
-
canPreventDefault: true
|
|
104
|
+
target: route.key
|
|
107
105
|
});
|
|
108
|
-
|
|
106
|
+
const isFocused = state.index === state.routes.findIndex(r => r.key === route.key);
|
|
107
|
+
if (!isFocused) {
|
|
109
108
|
React.startTransition(() => {
|
|
110
109
|
navigation.dispatch({
|
|
111
110
|
...CommonActions.navigate(route.name, route.params),
|
|
@@ -200,8 +199,9 @@ export function NativeBottomTabView({
|
|
|
200
199
|
}
|
|
201
200
|
},
|
|
202
201
|
children: /*#__PURE__*/_jsx(Lazy, {
|
|
203
|
-
enabled: lazy
|
|
204
|
-
|
|
202
|
+
enabled: lazy,
|
|
203
|
+
visible: isFocused || isPreloaded,
|
|
204
|
+
children: /*#__PURE__*/_jsx(NativeScreen, {
|
|
205
205
|
route: route,
|
|
206
206
|
navigation: navigation,
|
|
207
207
|
options: options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getLabel","Lazy","SafeAreaProviderCompat","CommonActions","StackActions","useTheme","Color","React","Platform","PlatformColor","BottomTabs","BottomTabsScreen","NativeScreen","jsx","_jsx","NativeBottomTabView","state","navigation","descriptors","colors","fonts","focusedRouteKey","routes","index","key","previousRouteKeyRef","useRef","useEffect","previousRouteKey","current","options","popToTopOnBlur","prevRoute","find","route","type","popToTopAction","popToTop","target","dispatch","currentOptions","fontFamily","select","ios","medium","default","regular","fontWeight","fontSize","fontStyle","tabBarLabelStyle","activeTintColor","tabBarActiveTintColor","primary","inactiveTintColor","tabBarInactiveTintColor","text","activeIndicatorColor","tabBarActiveIndicatorColor","alpha","string","undefined","onTransitionStart","closing","emit","data","onTransitionEnd","children","tabBarItemLabelVisibilityMode","tabBarLabelVisibilityMode","tabBarControllerMode","tabBarMinimizeBehavior","tabBarTintColor","tabBarItemIconColor","tabBarItemIconColorActive","tabBarItemTitleFontColor","tabBarItemTitleFontColorActive","tabBarItemTitleFontFamily","tabBarItemTitleFontWeight","tabBarItemTitleFontSize","tabBarItemTitleFontSizeActive","tabBarItemTitleFontStyle","tabBarBackgroundColor","tabBarStyle","backgroundColor","tabBarItemActiveIndicatorColor","tabBarItemActiveIndicatorEnabled","tabBarActiveIndicatorEnabled","tabBarItemRippleColor","tabBarRippleColor","experimentalControlNavigationStateInJS","onNativeFocusChange","e","nativeEvent","tabKey","isFocused","findIndex","r","
|
|
1
|
+
{"version":3,"names":["getLabel","Lazy","SafeAreaProviderCompat","CommonActions","StackActions","useTheme","Color","React","Platform","PlatformColor","BottomTabs","BottomTabsScreen","NativeScreen","jsx","_jsx","NativeBottomTabView","state","navigation","descriptors","colors","fonts","focusedRouteKey","routes","index","key","previousRouteKeyRef","useRef","useEffect","previousRouteKey","current","options","popToTopOnBlur","prevRoute","find","route","type","popToTopAction","popToTop","target","dispatch","currentOptions","fontFamily","select","ios","medium","default","regular","fontWeight","fontSize","fontStyle","tabBarLabelStyle","activeTintColor","tabBarActiveTintColor","primary","inactiveTintColor","tabBarInactiveTintColor","text","activeIndicatorColor","tabBarActiveIndicatorColor","alpha","string","undefined","onTransitionStart","closing","emit","data","onTransitionEnd","children","tabBarItemLabelVisibilityMode","tabBarLabelVisibilityMode","tabBarControllerMode","tabBarMinimizeBehavior","tabBarTintColor","tabBarItemIconColor","tabBarItemIconColorActive","tabBarItemTitleFontColor","tabBarItemTitleFontColorActive","tabBarItemTitleFontFamily","tabBarItemTitleFontWeight","tabBarItemTitleFontSize","tabBarItemTitleFontSizeActive","tabBarItemTitleFontStyle","tabBarBackgroundColor","tabBarStyle","backgroundColor","tabBarItemActiveIndicatorColor","tabBarItemActiveIndicatorEnabled","tabBarActiveIndicatorEnabled","tabBarItemRippleColor","tabBarRippleColor","experimentalControlNavigationStateInJS","onNativeFocusChange","e","nativeEvent","tabKey","isFocused","findIndex","r","startTransition","navigate","name","params","map","render","isPreloaded","preloadedRouteKeys","includes","title","lazy","tabBarLabel","tabBarBadgeStyle","tabBarIcon","tabBarBadge","tabBarSystemItem","tabBarBlurEffect","shadowColor","tabBarShadowColor","tabTitle","OS","label","tabItemAppearance","badgeBackgroundColor","notification","badgeTextColor","isLight","icon","getPlatformIcon","focused","selectedIcon","onWillDisappear","onWillAppear","onDidAppear","onDidDisappear","shared","tabBarItemBadgeBackgroundColor","tabBarItemBadgeTextColor","badgeValue","toString","systemItem","standardAppearance","stacked","normal","inline","compactInline","enabled","visible","tinted","templateSource","source","android","imageSource"],"sourceRoot":"../../../src","sources":["unstable/NativeBottomTabView.native.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativeBottomTabView.native.d.ts","sourceRoot":"","sources":["../../../../src/unstable/NativeBottomTabView.native.tsx"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,aAAa,EAGlB,KAAK,kBAAkB,EAExB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,KAAK,EAEV,4BAA4B,EAC5B,+BAA+B,EAC/B,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAEjB,KAAK,KAAK,GAAG,+BAA+B,GAAG;IAC7C,KAAK,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACzC,UAAU,EAAE,gCAAgC,CAAC;IAC7C,WAAW,EAAE,4BAA4B,CAAC;CAC3C,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"NativeBottomTabView.native.d.ts","sourceRoot":"","sources":["../../../../src/unstable/NativeBottomTabView.native.tsx"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,aAAa,EAGlB,KAAK,kBAAkB,EAExB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,KAAK,EAEV,4BAA4B,EAC5B,+BAA+B,EAC/B,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAEjB,KAAK,KAAK,GAAG,+BAA+B,GAAG;IAC7C,KAAK,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACzC,UAAU,EAAE,gCAAgC,CAAC;IAC7C,WAAW,EAAE,4BAA4B,CAAC;CAC3C,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,KAAK,2CAmP5E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/unstable/types.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,EACN,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,oBAAoB,EACpB,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,MAAM,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvD,MAAM,MAAM,iCAAiC,GAAG;IAC9C;;OAEG;IACH,QAAQ,EAAE;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/unstable/types.tsx"],"names":[],"mappings":"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"}
|
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.7.
|
|
4
|
+
"version": "7.7.3",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native-component",
|
|
7
7
|
"react-component",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"clean": "del lib"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@react-navigation/elements": "^2.8.
|
|
49
|
+
"@react-navigation/elements": "^2.8.1",
|
|
50
50
|
"color": "^4.2.3",
|
|
51
51
|
"sf-symbols-typescript": "^2.1.0"
|
|
52
52
|
},
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
]
|
|
91
91
|
]
|
|
92
92
|
},
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "85fa1e22e5b9af9004354ae7f74cc7d0a0fa6009"
|
|
94
94
|
}
|
|
@@ -147,24 +147,23 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
|
|
|
147
147
|
currentOptions?.tabBarActiveIndicatorEnabled
|
|
148
148
|
}
|
|
149
149
|
tabBarItemRippleColor={currentOptions?.tabBarRippleColor}
|
|
150
|
-
experimentalControlNavigationStateInJS
|
|
150
|
+
experimentalControlNavigationStateInJS={false}
|
|
151
151
|
onNativeFocusChange={(e) => {
|
|
152
152
|
const route = state.routes.find(
|
|
153
153
|
(route) => route.key === e.nativeEvent.tabKey
|
|
154
154
|
);
|
|
155
155
|
|
|
156
156
|
if (route) {
|
|
157
|
-
|
|
158
|
-
state.index ===
|
|
159
|
-
state.routes.findIndex((r) => r.key === route.key);
|
|
160
|
-
|
|
161
|
-
const event = navigation.emit({
|
|
157
|
+
navigation.emit({
|
|
162
158
|
type: 'tabPress',
|
|
163
159
|
target: route.key,
|
|
164
|
-
canPreventDefault: true,
|
|
165
160
|
});
|
|
166
161
|
|
|
167
|
-
|
|
162
|
+
const isFocused =
|
|
163
|
+
state.index ===
|
|
164
|
+
state.routes.findIndex((r) => r.key === route.key);
|
|
165
|
+
|
|
166
|
+
if (!isFocused) {
|
|
168
167
|
React.startTransition(() => {
|
|
169
168
|
navigation.dispatch({
|
|
170
169
|
...CommonActions.navigate(route.name, route.params),
|
|
@@ -264,18 +263,15 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
|
|
|
264
263
|
},
|
|
265
264
|
}}
|
|
266
265
|
>
|
|
267
|
-
<Lazy
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
</NativeScreen>
|
|
277
|
-
)}
|
|
278
|
-
/>
|
|
266
|
+
<Lazy enabled={lazy} visible={isFocused || isPreloaded}>
|
|
267
|
+
<NativeScreen
|
|
268
|
+
route={route}
|
|
269
|
+
navigation={navigation}
|
|
270
|
+
options={options}
|
|
271
|
+
>
|
|
272
|
+
{render()}
|
|
273
|
+
</NativeScreen>
|
|
274
|
+
</Lazy>
|
|
279
275
|
</BottomTabsScreen>
|
|
280
276
|
);
|
|
281
277
|
})}
|
package/src/unstable/types.tsx
CHANGED
|
@@ -29,7 +29,7 @@ export type NativeBottomTabNavigationEventMap = {
|
|
|
29
29
|
/**
|
|
30
30
|
* Event which fires on tapping on the tab in the tab bar.
|
|
31
31
|
*/
|
|
32
|
-
tabPress: { data: undefined; canPreventDefault:
|
|
32
|
+
tabPress: { data: undefined; canPreventDefault: false };
|
|
33
33
|
/**
|
|
34
34
|
* Event which fires when a transition animation starts.
|
|
35
35
|
*/
|