fix: android elevation issue (#3617)

Co-authored-by: Tomasz Janiczek <[email protected]>
callstack · Feb 6, 2023 · 6a863cd · 6a863cd
1 parent e4aefd0
commit 6a863cd
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/components/BottomNavigation/BottomNavigation.tsx b/src/components/BottomNavigation/BottomNavigation.tsx
@@ -603,6 +603,7 @@ const BottomNavigation = ({
     }
 
     if (index !== navigationState.index) {
+      prevNavigationState.current = navigationState;
       onIndexChange(index);
     }
   };
@@ -613,6 +614,7 @@ const BottomNavigation = ({
         (route) => route.key === key
       );
 
+      prevNavigationState.current = navigationState;
       onIndexChange(index);
     },
     [navigationState.routes, onIndexChange]
@@ -694,6 +696,12 @@ const BottomNavigation = ({
           }
 
           const focused = navigationState.index === index;
+          const previouslyFocused =
+            prevNavigationState.current?.index === index;
+          const countAlphaOffscreen =
+            sceneAnimationEnabled && (focused || previouslyFocused);
+          const renderToHardwareTextureAndroid =
+            sceneAnimationEnabled && focused;
 
           const opacity = sceneAnimationEnabled
             ? tabsPositionAnims[index].interpolate({
@@ -743,9 +751,9 @@ const BottomNavigation = ({
             >
               <Animated.View
                 {...(Platform.OS === 'android' && {
-                  needsOffscreenAlphaCompositing: sceneAnimationEnabled,
+                  needsOffscreenAlphaCompositing: countAlphaOffscreen,
                 })}
-                renderToHardwareTextureAndroid={sceneAnimationEnabled}
+                renderToHardwareTextureAndroid={renderToHardwareTextureAndroid}
                 style={[
                   styles.content,
                   {