@react-navigation/bottom-tabs 7.7.2 → 7.8.0

package/lib/module/unstable/NativeBottomTabView.native.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { getLabel, Lazy, SafeAreaProviderCompat } from '@react-navigation/elements';
+import { getLabel, Lazy, SafeAreaProviderCompat, Screen as ScreenContent } from '@react-navigation/elements';
 import { CommonActions, StackActions, useTheme } from '@react-navigation/native';
 import Color from 'color';
 import * as React from 'react';
@@ -199,8 +199,10 @@ export function NativeBottomTabView({
             }
           },
           children: /*#__PURE__*/_jsx(Lazy, {
-            enabled: lazy ? isFocused || isPreloaded : true,
-            render: () => /*#__PURE__*/_jsx(NativeScreen, {
+            enabled: lazy,
+            visible: isFocused || isPreloaded,
+            children: /*#__PURE__*/_jsx(ScreenWithHeader, {
+              isFocused: isFocused,
               route: route,
               navigation: navigation,
               options: options,
@@ -212,6 +214,47 @@ export function NativeBottomTabView({
     })
   });
 }
+function ScreenWithHeader({
+  isFocused,
+  route,
+  navigation,
+  options,
+  children
+}) {
+  const {
+    headerTransparent,
+    header: renderCustomHeader,
+    headerShown = renderCustomHeader != null
+  } = options;
+  const hasNativeHeader = headerShown && renderCustomHeader == null;
+  const [wasNativeHeaderShown] = React.useState(hasNativeHeader);
+  React.useEffect(() => {
+    if (wasNativeHeaderShown !== hasNativeHeader) {
+      throw new Error(`Changing 'headerShown' or 'header' options dynamically is not supported when using native header.`);
+    }
+  }, [wasNativeHeaderShown, hasNativeHeader]);
+  if (hasNativeHeader) {
+    return /*#__PURE__*/_jsx(NativeScreen, {
+      route: route,
+      navigation: navigation,
+      options: options,
+      children: children
+    });
+  }
+  return /*#__PURE__*/_jsx(ScreenContent, {
+    focused: isFocused,
+    route: route,
+    navigation: navigation,
+    headerShown: headerShown,
+    headerTransparent: headerTransparent,
+    header: renderCustomHeader?.({
+      route,
+      navigation,
+      options
+    }),
+    children: children
+  });
+}
 function getPlatformIcon(icon) {
   return {
     ios: icon?.type === 'sfSymbol' ? icon : icon?.type === 'image' && icon.tinted !== false ? {

package/lib/module/unstable/NativeBottomTabView.native.js.map

@@ -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","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","tinted","templateSource","source","android","imageSource"],"sourceRoot":"../../../src","sources":["unstable/NativeBottomTabView.native.tsx"],"mappings":";;AAAA,SACEA,QAAQ,EACRC,IAAI,EACJC,sBAAsB,QACjB,4BAA4B;AACnC,SACEC,aAAa,EAGbC,YAAY,EAEZC,QAAQ,QACH,0BAA0B;AACjC,OAAOC,KAAK,MAAM,OAAO;AACzB,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAA0BC,QAAQ,EAAEC,aAAa,QAAQ,cAAc;AACvE,SACEC,UAAU,EACVC,gBAAgB,QAGX,sBAAsB;AAE7B,SAASC,YAAY,QAAQ,gCAA6B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAc3D,OAAO,SAASC,mBAAmBA,CAAC;EAAEC,KAAK;EAAEC,UAAU;EAAEC;AAAmB,CAAC,EAAE;EAC7E,MAAM;IAAEC,MAAM;IAAEC;EAAM,CAAC,GAAGf,QAAQ,CAAC,CAAC;EAEpC,MAAMgB,eAAe,GAAGL,KAAK,CAACM,MAAM,CAACN,KAAK,CAACO,KAAK,CAAC,CAACC,GAAG;EACrD,MAAMC,mBAAmB,GAAGlB,KAAK,CAACmB,MAAM,CAACL,eAAe,CAAC;EAEzDd,KAAK,CAACoB,SAAS,CAAC,MAAM;IACpB,MAAMC,gBAAgB,GAAGH,mBAAmB,CAACI,OAAO;IAEpD,IACED,gBAAgB,KAAKP,eAAe,IACpCH,WAAW,CAACU,gBAAgB,CAAC,EAAEE,OAAO,CAACC,cAAc,EACrD;MACA,MAAMC,SAAS,GAAGhB,KAAK,CAACM,MAAM,CAACW,IAAI,CAChCC,KAAK,IAAKA,KAAK,CAACV,GAAG,KAAKI,gBAC3B,CAAC;MAED,IAAII,SAAS,EAAEhB,KAAK,EAAEmB,IAAI,KAAK,OAAO,IAAIH,SAAS,CAAChB,KAAK,CAACQ,GAAG,EAAE;QAC7D,MAAMY,cAAc,GAAG;UACrB,GAAGhC,YAAY,CAACiC,QAAQ,CAAC,CAAC;UAC1BC,MAAM,EAAEN,SAAS,CAAChB,KAAK,CAACQ;QAC1B,CAAC;QACDP,UAAU,CAACsB,QAAQ,CAACH,cAAc,CAAC;MACrC;IACF;IAEAX,mBAAmB,CAACI,OAAO,GAAGR,eAAe;EAC/C,CAAC,EAAE,CAACH,WAAW,EAAEG,eAAe,EAAEJ,UAAU,EAAED,KAAK,CAACO,KAAK,EAAEP,KAAK,CAACM,MAAM,CAAC,CAAC;EAEzE,MAAMkB,cAAc,GAAGtB,WAAW,CAACF,KAAK,CAACM,MAAM,CAACN,KAAK,CAACO,KAAK,CAAC,CAACC,GAAG,CAAC,EAAEM,OAAO;EAE1E,MAAM;IACJW,UAAU,GAAGjC,QAAQ,CAACkC,MAAM,CAAC;MAC3BC,GAAG,EAAEvB,KAAK,CAACwB,MAAM,CAACH,UAAU;MAC5BI,OAAO,EAAEzB,KAAK,CAAC0B,OAAO,CAACL;IACzB,CAAC,CAAC;IACFM,UAAU,GAAGvC,QAAQ,CAACkC,MAAM,CAAC;MAC3BC,GAAG,EAAEvB,KAAK,CAACwB,MAAM,CAACG,UAAU;MAC5BF,OAAO,EAAEzB,KAAK,CAAC0B,OAAO,CAACC;IACzB,CAAC,CAAC;IACFC,QAAQ;IACRC;EACF,CAAC,GAAGT,cAAc,CAACU,gBAAgB,IAAI,CAAC,CAAC;EAEzC,MAAMC,eAAe,GACnBX,cAAc,CAACY,qBAAqB,IAAIjC,MAAM,CAACkC,OAAO;EAExD,MAAMC,iBAAiB,GACrBd,cAAc,CAACe,uBAAuB,IACtC/C,QAAQ,CAACkC,MAAM,CAAsB;IACnCC,GAAG,EAAElC,aAAa,CAAC,OAAO,CAAC;IAC3BoC,OAAO,EAAE1B,MAAM,CAACqC;EAClB,CAAC,CAAC;EAEJ,MAAMC,oBAAoB,GACvBjB,cAAc,EAAEkB,0BAA0B,IAC3C,OAAOP,eAAe,KAAK,QAAQ,GAC/B7C,KAAK,CAAC6C,eAAe,CAAC,EAAEQ,KAAK,CAAC,GAAG,CAAC,CAACC,MAAM,CAAC,CAAC,GAC3CC,SAAS;EAEf,MAAMC,iBAAiB,GAAGA,CAAC;IACzBC,OAAO;IACP7B;EAIF,CAAC,KAAK;IACJjB,UAAU,CAAC+C,IAAI,CAAC;MACd7B,IAAI,EAAE,iBAAiB;MACvB8B,IAAI,EAAE;QAAEF;MAAQ,CAAC;MACjBzB,MAAM,EAAEJ,KAAK,CAACV;IAChB,CAAC,CAAC;EACJ,CAAC;EAED,MAAM0C,eAAe,GAAGA,CAAC;IACvBH,OAAO;IACP7B;EAIF,CAAC,KAAK;IACJjB,UAAU,CAAC+C,IAAI,CAAC;MACd7B,IAAI,EAAE,eAAe;MACrB8B,IAAI,EAAE;QAAEF;MAAQ,CAAC;MACjBzB,MAAM,EAAEJ,KAAK,CAACV;IAChB,CAAC,CAAC;EACJ,CAAC;EAED,oBACEV,IAAA,CAACZ,sBAAsB;IAAAiE,QAAA,eACrBrD,IAAA,CAACJ,UAAU;MACT0D,6BAA6B,EAC3B5B,cAAc,EAAE6B,yBACjB;MACDC,oBAAoB,EAAE9B,cAAc,EAAE8B,oBAAqB;MAC3DC,sBAAsB,EAAE/B,cAAc,EAAE+B,sBAAuB;MAC/DC,eAAe,EAAErB,eAAgB;MACjCsB,mBAAmB,EAAEnB,iBAAkB;MACvCoB,yBAAyB,EAAEvB,eAAgB;MAC3CwB,wBAAwB,EAAErB,iBAAkB;MAC5CsB,8BAA8B,EAAEzB,eAAgB;MAChD0B,yBAAyB,EAAEpC,UAAW;MACtCqC,yBAAyB,EAAE/B,UAAW;MACtCgC,uBAAuB,EAAE/B,QAAS;MAClCgC,6BAA6B,EAAEhC,QAAS;MACxCiC,wBAAwB,EAAEhC,SAAU;MACpCiC,qBAAqB,EAAE1C,cAAc,CAAC2C,WAAW,EAAEC,eAAgB;MACnEC,8BAA8B,EAAE5B,oBAAqB;MACrD6B,gCAAgC,EAC9B9C,cAAc,EAAE+C,4BACjB;MACDC,qBAAqB,EAAEhD,cAAc,EAAEiD,iBAAkB;MACzDC,sCAAsC,EAAE,KAAM;MAC9CC,mBAAmB,EAAGC,CAAC,IAAK;QAC1B,MAAM1D,KAAK,GAAGlB,KAAK,CAACM,MAAM,CAACW,IAAI,CAC5BC,KAAK,IAAKA,KAAK,CAACV,GAAG,KAAKoE,CAAC,CAACC,WAAW,CAACC,MACzC,CAAC;QAED,IAAI5D,KAAK,EAAE;UACTjB,UAAU,CAAC+C,IAAI,CAAC;YACd7B,IAAI,EAAE,UAAU;YAChBG,MAAM,EAAEJ,KAAK,CAACV;UAChB,CAAC,CAAC;UAEF,MAAMuE,SAAS,GACb/E,KAAK,CAACO,KAAK,KACXP,KAAK,CAACM,MAAM,CAAC0E,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAACzE,GAAG,KAAKU,KAAK,CAACV,GAAG,CAAC;UAEpD,IAAI,CAACuE,SAAS,EAAE;YACdxF,KAAK,CAAC2F,eAAe,CAAC,MAAM;cAC1BjF,UAAU,CAACsB,QAAQ,CAAC;gBAClB,GAAGpC,aAAa,CAACgG,QAAQ,CAACjE,KAAK,CAACkE,IAAI,EAAElE,KAAK,CAACmE,MAAM,CAAC;gBACnD/D,MAAM,EAAEtB,KAAK,CAACQ;cAChB,CAAC,CAAC;YACJ,CAAC,CAAC;UACJ;QACF;MACF,CAAE;MAAA2C,QAAA,EAEDnD,KAAK,CAACM,MAAM,CAACgF,GAAG,CAAC,CAACpE,KAAK,EAAEX,KAAK,KAAK;QAClC,MAAM;UAAEO,OAAO;UAAEyE,MAAM;UAAEtF;QAAW,CAAC,GAAGC,WAAW,CAACgB,KAAK,CAACV,GAAG,CAAC;QAC9D,MAAMuE,SAAS,GAAG/E,KAAK,CAACO,KAAK,KAAKA,KAAK;QACvC,MAAMiF,WAAW,GAAGxF,KAAK,CAACyF,kBAAkB,CAACC,QAAQ,CAACxE,KAAK,CAACV,GAAG,CAAC;QAEhE,MAAM;UACJmF,KAAK;UACLC,IAAI,GAAG,IAAI;UACXC,WAAW;UACXC,gBAAgB;UAChBC,UAAU;UACVC,WAAW;UACXC,gBAAgB;UAChBC,gBAAgB;UAChB/B;QACF,CAAC,GAAGrD,OAAO;QAEX,MAAM;UACJsD,eAAe,EAAEF,qBAAqB;UACtCiC,WAAW,EAAEC;QACf,CAAC,GAAGjC,WAAW,IAAI,CAAC,CAAC;QAErB,MAAMkC,QAAQ;QACZ;QACA;QACA7G,QAAQ,CAAC8G,EAAE,KAAK,KAAK,IAAIL,gBAAgB,IAAI,IAAI,GAC7CJ,WAAW,GACX7G,QAAQ,CAAC;UAAEuH,KAAK,EAAEV,WAAW;UAAEF;QAAM,CAAC,EAAEzE,KAAK,CAACkE,IAAI,CAAC;QAEzD,MAAMoB,iBAAsD,GAAG;UAC7D3C,yBAAyB,EAAEpC,UAAU;UACrCsC,uBAAuB,EAAE/B,QAAQ;UACjC8B,yBAAyB,EAAE/B,UAAU;UACrCkC,wBAAwB,EAAEhC;QAC5B,CAAC;QAED,MAAMwE,oBAAoB,GACxBX,gBAAgB,EAAE1B,eAAe,IAAIjE,MAAM,CAACuG,YAAY;QAC1D,MAAMC,cAAc,GAClB,OAAOF,oBAAoB,KAAK,QAAQ,IACxCnH,KAAK,CAACmH,oBAAoB,CAAC,EAAEG,OAAO,CAAC,CAAC,GAClC,OAAO,GACP,OAAO;QAEb,MAAMC,IAAI,GACR,OAAOd,UAAU,KAAK,UAAU,GAC5Be,eAAe,CAACf,UAAU,CAAC;UAAEgB,OAAO,EAAE;QAAM,CAAC,CAAC,CAAC,GAC/ChB,UAAU,IAAI,IAAI,GAChBe,eAAe,CAACf,UAAU,CAAC,GAC3BlD,SAAS;QAEjB,MAAMmE,YAAY,GAChB,OAAOjB,UAAU,KAAK,UAAU,GAC5Be,eAAe,CAACf,UAAU,CAAC;UAAEgB,OAAO,EAAE;QAAK,CAAC,CAAC,CAAC,GAC9ClE,SAAS;QAEf,oBACE/C,IAAA,CAACH,gBAAgB;UACfsH,eAAe,EAAEA,CAAA,KACfnE,iBAAiB,CAAC;YAAEC,OAAO,EAAE,IAAI;YAAE7B;UAAM,CAAC,CAC3C;UACDgG,YAAY,EAAEA,CAAA,KAAMpE,iBAAiB,CAAC;YAAEC,OAAO,EAAE,KAAK;YAAE7B;UAAM,CAAC,CAAE;UACjEiG,WAAW,EAAEA,CAAA,KAAMjE,eAAe,CAAC;YAAEH,OAAO,EAAE,KAAK;YAAE7B;UAAM,CAAC,CAAE;UAC9DkG,cAAc,EAAEA,CAAA,KAAMlE,eAAe,CAAC;YAAEH,OAAO,EAAE,IAAI;YAAE7B;UAAM,CAAC,CAAE;UAEhE4D,MAAM,EAAE5D,KAAK,CAACV,GAAI;UAClBqG,IAAI,EAAEA,IAAK;UACXG,YAAY,EAAEA,YAAY,EAAErF,GAAG,IAAIqF,YAAY,EAAEK,MAAO;UACxDC,8BAA8B,EAAEb,oBAAqB;UACrDc,wBAAwB,EAAEZ,cAAe;UACzCa,UAAU,EAAExB,WAAW,EAAEyB,QAAQ,CAAC,CAAE;UACpCC,UAAU,EAAEzB,gBAAiB;UAC7BlB,SAAS,EAAEA,SAAU;UACrBY,KAAK,EAAEU,QAAS;UAChBsB,kBAAkB,EAAE;YAClBzD,qBAAqB;YACrBkC,iBAAiB;YACjBF,gBAAgB;YAChB0B,OAAO,EAAE;cACPC,MAAM,EAAErB;YACV,CAAC;YACDsB,MAAM,EAAE;cACND,MAAM,EAAErB;YACV,CAAC;YACDuB,aAAa,EAAE;cACbF,MAAM,EAAErB;YACV;UACF,CAAE;UAAArD,QAAA,eAEFrD,IAAA,CAACb,IAAI;YACH+I,OAAO,EAAEpC,IAAI,GAAGb,SAAS,IAAIS,WAAW,GAAG,IAAK;YAChDD,MAAM,EAAEA,CAAA,kBACNzF,IAAA,CAACF,YAAY;cACXsB,KAAK,EAAEA,KAAM;cACbjB,UAAU,EAAEA,UAAW;cACvBa,OAAO,EAAEA,OAAQ;cAAAqC,QAAA,EAEhBoC,MAAM,CAAC;YAAC,CACG;UACd,CACH;QAAC,GApCGrE,KAAK,CAACV,GAqCK,CAAC;MAEvB,CAAC;IAAC,CACQ;EAAC,CACS,CAAC;AAE7B;AAEA,SAASsG,eAAeA,CAACD,IAAU,EAAgB;EACjD,OAAO;IACLlF,GAAG,EACDkF,IAAI,EAAE1F,IAAI,KAAK,UAAU,GACrB0F,IAAI,GACJA,IAAI,EAAE1F,IAAI,KAAK,OAAO,IAAI0F,IAAI,CAACoB,MAAM,KAAK,KAAK,GAC7C;MACE9G,IAAI,EAAE,gBAAgB;MACtB+G,cAAc,EAAErB,IAAI,CAACsB;IACvB,CAAC,GACDtF,SAAS;IACjBuF,OAAO,EAAEvB,IAAI,EAAE1F,IAAI,KAAK,kBAAkB,GAAG0F,IAAI,GAAGhE,SAAS;IAC7DwE,MAAM,EACJR,IAAI,EAAE1F,IAAI,KAAK,OAAO,GAClB;MACEA,IAAI,EAAE,aAAa;MACnBkH,WAAW,EAAExB,IAAI,CAACsB;IACpB,CAAC,GACDtF;EACR,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["getLabel","Lazy","SafeAreaProviderCompat","Screen","ScreenContent","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","ScreenWithHeader","headerTransparent","header","renderCustomHeader","headerShown","hasNativeHeader","wasNativeHeaderShown","useState","Error","tinted","templateSource","source","android","imageSource"],"sourceRoot":"../../../src","sources":["unstable/NativeBottomTabView.native.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/unstable/NativeScreen/NativeScreen.js

@@ -17,10 +17,10 @@ export function NativeScreen({
   children
 }) {
   const {
-    headerShown = true,
+    header: renderCustomHeader,
+    headerShown = renderCustomHeader != null,
     headerTransparent,
-    headerBackground,
-    header: renderCustomHeader
+    headerBackground
   } = options;
   const isModal = false;
   const insets = useSafeAreaInsets();

package/lib/module/unstable/NativeScreen/NativeScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["getDefaultHeaderHeight","HeaderHeightContext","HeaderShownContext","useFrameSize","React","Animated","Platform","StatusBar","StyleSheet","useAnimatedValue","View","useSafeAreaInsets","ScreenStack","ScreenStackItem","debounce","AnimatedHeaderHeightContext","useHeaderConfig","jsx","_jsx","jsxs","_jsxs","ANDROID_DEFAULT_HEADER_HEIGHT","NativeScreen","route","navigation","options","children","headerShown","headerTransparent","headerBackground","header","renderCustomHeader","isModal","insets","isIPhone","OS","isPad","isTV","isParentHeaderShown","useContext","parentHeaderHeight","isLandscape","frame","width","height","topInset","top","defaultHeaderHeight","select","android","default","headerHeight","setHeaderHeight","useState","setHeaderHeightDebounced","useCallback","hasCustomHeader","headerHeightCorrectionOffset","statusBarHeight","currentHeight","rawAnimatedHeaderHeight","animatedHeaderHeight","useMemo","add","headerTopInsetEnabled","onHeaderHeightChange","event","nativeEvent","useNativeDriver","listener","e","doesHeaderAnimate","headerLargeTitle","headerSearchBarOptions","headerConfig","style","styles","container","screenId","key","Provider","value","background","translucent","onLayout","layout","setValue","absolute","create","flex","zIndex","position","start","end","elevation","overflow"],"sourceRoot":"../../../../src","sources":["unstable/NativeScreen/NativeScreen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getDefaultHeaderHeight","HeaderHeightContext","HeaderShownContext","useFrameSize","React","Animated","Platform","StatusBar","StyleSheet","useAnimatedValue","View","useSafeAreaInsets","ScreenStack","ScreenStackItem","debounce","AnimatedHeaderHeightContext","useHeaderConfig","jsx","_jsx","jsxs","_jsxs","ANDROID_DEFAULT_HEADER_HEIGHT","NativeScreen","route","navigation","options","children","header","renderCustomHeader","headerShown","headerTransparent","headerBackground","isModal","insets","isIPhone","OS","isPad","isTV","isParentHeaderShown","useContext","parentHeaderHeight","isLandscape","frame","width","height","topInset","top","defaultHeaderHeight","select","android","default","headerHeight","setHeaderHeight","useState","setHeaderHeightDebounced","useCallback","hasCustomHeader","headerHeightCorrectionOffset","statusBarHeight","currentHeight","rawAnimatedHeaderHeight","animatedHeaderHeight","useMemo","add","headerTopInsetEnabled","onHeaderHeightChange","event","nativeEvent","useNativeDriver","listener","e","doesHeaderAnimate","headerLargeTitle","headerSearchBarOptions","headerConfig","style","styles","container","screenId","key","Provider","value","background","translucent","onLayout","layout","setValue","absolute","create","flex","zIndex","position","start","end","elevation","overflow"],"sourceRoot":"../../../../src","sources":["unstable/NativeScreen/NativeScreen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/unstable/NativeBottomTabView.native.d.ts.map

@@ -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,2CAsP5E"}
+{"version":3,"file":"NativeBottomTabView.native.d.ts","sourceRoot":"","sources":["../../../../src/unstable/NativeBottomTabView.native.tsx"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,aAAa,EAGlB,KAAK,kBAAkB,EAExB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,KAAK,EAEV,4BAA4B,EAC5B,+BAA+B,EAC/B,gCAAgC,EAGjC,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,2CAoP5E"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/bottom-tabs",
   "description": "Bottom tab navigator following iOS design guidelines",
-  "version": "7.7.2",
+  "version": "7.8.0",
   "keywords": [
     "react-native-component",
     "react-component",
@@ -46,7 +46,7 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/elements": "^2.8.0",
+    "@react-navigation/elements": "^2.8.1",
     "color": "^4.2.3",
     "sf-symbols-typescript": "^2.1.0"
   },
@@ -90,5 +90,5 @@
       ]
     ]
   },
-  "gitHead": "4cd530127137a467c9a99d2e61ec0df1860f98bc"
+  "gitHead": "12a9ab182d7c2950f7512a000ff5d4e5c904333d"
 }

package/src/unstable/NativeBottomTabView.native.tsx

@@ -2,6 +2,7 @@ import {
   getLabel,
   Lazy,
   SafeAreaProviderCompat,
+  Screen as ScreenContent,
 } from '@react-navigation/elements';
 import {
   CommonActions,
@@ -27,6 +28,8 @@ import type {
   NativeBottomTabDescriptorMap,
   NativeBottomTabNavigationConfig,
   NativeBottomTabNavigationHelpers,
+  NativeBottomTabNavigationOptions,
+  NativeBottomTabNavigationProp,
 } from './types';
 
 type Props = NativeBottomTabNavigationConfig & {
@@ -263,18 +266,16 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
                 },
               }}
             >
-              <Lazy
-                enabled={lazy ? isFocused || isPreloaded : true}
-                render={() => (
-                  <NativeScreen
-                    route={route}
-                    navigation={navigation}
-                    options={options}
-                  >
-                    {render()}
-                  </NativeScreen>
-                )}
-              />
+              <Lazy enabled={lazy} visible={isFocused || isPreloaded}>
+                <ScreenWithHeader
+                  isFocused={isFocused}
+                  route={route}
+                  navigation={navigation}
+                  options={options}
+                >
+                  {render()}
+                </ScreenWithHeader>
+              </Lazy>
             </BottomTabsScreen>
           );
         })}
@@ -283,6 +284,63 @@ export function NativeBottomTabView({ state, navigation, descriptors }: Props) {
   );
 }
 
+function ScreenWithHeader({
+  isFocused,
+  route,
+  navigation,
+  options,
+  children,
+}: {
+  isFocused: boolean;
+  route: Route<string>;
+  navigation: NativeBottomTabNavigationProp<ParamListBase>;
+  options: NativeBottomTabNavigationOptions;
+  children: React.ReactNode;
+}) {
+  const {
+    headerTransparent,
+    header: renderCustomHeader,
+    headerShown = renderCustomHeader != null,
+  } = options;
+
+  const hasNativeHeader = headerShown && renderCustomHeader == null;
+
+  const [wasNativeHeaderShown] = React.useState(hasNativeHeader);
+
+  React.useEffect(() => {
+    if (wasNativeHeaderShown !== hasNativeHeader) {
+      throw new Error(
+        `Changing 'headerShown' or 'header' options dynamically is not supported when using native header.`
+      );
+    }
+  }, [wasNativeHeaderShown, hasNativeHeader]);
+
+  if (hasNativeHeader) {
+    return (
+      <NativeScreen route={route} navigation={navigation} options={options}>
+        {children}
+      </NativeScreen>
+    );
+  }
+
+  return (
+    <ScreenContent
+      focused={isFocused}
+      route={route}
+      navigation={navigation}
+      headerShown={headerShown}
+      headerTransparent={headerTransparent}
+      header={renderCustomHeader?.({
+        route,
+        navigation,
+        options,
+      })}
+    >
+      {children}
+    </ScreenContent>
+  );
+}
+
 function getPlatformIcon(icon: Icon): PlatformIcon {
   return {
     ios:

package/src/unstable/NativeScreen/NativeScreen.tsx

@@ -29,10 +29,10 @@ const ANDROID_DEFAULT_HEADER_HEIGHT = 56;
 
 export function NativeScreen({ route, navigation, options, children }: Props) {
   const {
-    headerShown = true,
+    header: renderCustomHeader,
+    headerShown = renderCustomHeader != null,
     headerTransparent,
     headerBackground,
-    header: renderCustomHeader,
   } = options;
 
   const isModal = false;