react-native-navigation 7.43.0 → 7.45.0

package/lib/Mock/Components/ComponentScreen.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
-import { View, Text, TouchableOpacity, Image, ImageURISource} from 'react-native';
-import { Navigation, ImageResource} from 'react-native-navigation';
+import { View, Text, TouchableOpacity, Image, ImageURISource } from 'react-native';
+import { Navigation, ImageResource } from 'react-native-navigation';
 import { ComponentProps } from '../ComponentProps';
 import { VISIBLE_SCREEN_TEST_ID } from '../constants';
 import { LayoutStore } from '../Stores/LayoutStore';
@@ -10,8 +10,7 @@ import { events } from '../Stores/EventsStore';
 import _ from 'lodash';
 import { switchTabByIndex } from '../actions/layoutActions';
 
-
-function isURISource(src: ImageResource| undefined): src is ImageURISource {
+function isURISource(src: ImageResource | undefined): src is ImageURISource {
   return !!src && typeof src === 'object' && 'uri' in src;
 }
 
@@ -36,12 +35,15 @@ export const ComponentScreen = connect(
       if (bottomTabsOptions?.visible === false) return null;
       const buttons = bottomTabs!.children!.map((child, i) => {
         const bottomTabOptions = child.resolveOptions().bottomTab;
-        const icon = (bottomTabs as any).selectedIndex === i ? bottomTabOptions?.selectedIcon : bottomTabOptions?.icon;
+        const icon =
+          (bottomTabs as any).selectedIndex === i
+            ? bottomTabOptions?.selectedIcon
+            : bottomTabOptions?.icon;
         const iconURI = isURISource(icon) ? icon.uri : undefined;
         return (
           <View key={`tab-${i}`}>
             <TouchableOpacity
-              style={{padding:10}}
+              style={{ padding: 10 }}
               testID={bottomTabOptions?.testID}
               onPress={() => {
                 events.invokeBottomTabPressed({
@@ -51,22 +53,34 @@ export const ComponentScreen = connect(
                   switchTabByIndex(this.props.layoutNode.getBottomTabs(), i);
               }}
             >
-            <View style={{justifyContent: 'center', alignItems: 'center'}}>
-              <Text>{bottomTabOptions?.badge}</Text>
-              {iconURI && <Image style={{width: 18, height: 18, marginBottom: 5}} source={{uri: iconURI}}/>}
-              <Text style={{fontSize: 12}}>{bottomTabOptions?.text || ''}</Text>
-            </View>
+              <View style={{ justifyContent: 'center', alignItems: 'center' }}>
+                <Text>{bottomTabOptions?.badge}</Text>
+                {iconURI && (
+                  <Image
+                    style={{ width: 18, height: 18, marginBottom: 5 }}
+                    source={{ uri: iconURI }}
+                  />
+                )}
+                <Text style={{ fontSize: 12 }}>{bottomTabOptions?.text || ''}</Text>
+              </View>
             </TouchableOpacity>
           </View>
         );
       });
 
       return (
-      <View 
-        testID={bottomTabsOptions?.testID} 
-        style={{flexDirection: 'row',justifyContent: 'center', width: '100%', backgroundColor: '#F0F2F5'}}>
+        <View
+          testID={bottomTabsOptions?.testID}
+          style={{
+            flexDirection: 'row',
+            justifyContent: 'center',
+            width: '100%',
+            backgroundColor: '#F0F2F5',
+          }}
+        >
           {buttons}
-      </View>);
+        </View>
+      );
     }
 
     render() {

package/lib/Mock/Components/LayoutComponent.tsx

@@ -19,8 +19,8 @@ export const LayoutComponent = class extends Component<ComponentProps> {
     return <View />;
   }
   componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-    const err =  new Error(
-      `Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}: ${error}\n${errorInfo?.componentStack}`,
+    const err = new Error(
+      `Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}: ${error}\n${errorInfo?.componentStack}`
     );
     (err as any).cause = error;
     throw err;

package/lib/Mock/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApplicationMock = void 0;
-exports.mockNativeComponents = mockNativeComponents;
+exports.mockNativeComponents = exports.ApplicationMock = void 0;
 const tslib_1 = require("tslib");
 exports.ApplicationMock = require('./Application').Application;
 tslib_1.__exportStar(require("./constants"), exports);
@@ -12,3 +11,4 @@ function mockNativeComponents() {
     const { Navigation } = require('react-native-navigation');
     Navigation.mockNativeComponents(new NativeCommandsSender(), new NativeEventsReceiver(), new AppRegistryService());
 }
+exports.mockNativeComponents = mockNativeComponents;

package/lib/android/app/build.gradle

@@ -20,6 +20,7 @@ def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8'
 def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION)
 def kotlinStdlib = safeExtGet('RNNKotlinStdlib',DEFAULT_KOTLIN_STDLIB )
 def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2')
+
 android {
     namespace 'com.reactnativenavigation'
     compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)

package/lib/android/app/src/main/java/com/reactnativenavigation/FeatureToggles.kt

@@ -0,0 +1,62 @@
+package com.reactnativenavigation
+
+import androidx.annotation.VisibleForTesting
+
+enum class RNNToggles {
+    TOP_BAR_COLOR_ANIMATION__PUSH,
+    TOP_BAR_COLOR_ANIMATION__TABS,
+}
+
+private val ToggleDefaults = mapOf(
+    RNNToggles.TOP_BAR_COLOR_ANIMATION__PUSH to false,
+    RNNToggles.TOP_BAR_COLOR_ANIMATION__TABS to false,
+)
+
+object RNNFeatureToggles {
+    private var init = false
+    private var toggles = mutableMapOf<RNNToggles, Boolean>()
+
+    @JvmStatic
+    fun init() {
+        assertNotInitialized()
+
+        init = true
+        toggles = ToggleDefaults.toMutableMap()
+    }
+
+    @JvmStatic
+    fun init(overrides: Map<RNNToggles, Boolean>) {
+        init()
+        this.toggles.putAll(overrides)
+    }
+
+    @JvmStatic
+    fun init(vararg overrides: Pair<RNNToggles, Boolean>) {
+        init(mapOf(*overrides))
+    }
+
+    @JvmStatic
+    fun isEnabled(toggleName: RNNToggles): Boolean {
+        assertInitialized()
+        return toggles.getOrElse(toggleName) { false }
+    }
+
+    @VisibleForTesting
+    @JvmStatic
+    fun clear() {
+        init = false
+        toggles.clear()
+    }
+
+    private fun assertNotInitialized() {
+        if (init) {
+            throw IllegalStateException("FeatureToggles already initialized")
+        }
+    }
+
+    private fun assertInitialized() {
+        if (!init) {
+            throw IllegalStateException("FeatureToggles not initialized")
+        }
+    }
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -3,7 +3,6 @@ package com.reactnativenavigation;
 import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -12,8 +11,8 @@ import android.view.View;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
-import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.viewcontrollers.overlay.OverlayManager;
+import com.reactnativenavigation.viewcontrollers.statusbar.StatusBarPresenter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.RootPresenter;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.ReactGateway;
@@ -51,6 +50,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         navigator.bindViews();
         getReactGateway().onActivityCreated(this);
         setBackPressedCallback();
+        StatusBarPresenter.Companion.init(this);
     }
 
     @Override

package/lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -4,10 +4,13 @@ import android.app.Application;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
+import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import com.facebook.soloader.SoLoader;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
 
+import java.util.Collections;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -15,15 +18,28 @@ import androidx.annotation.NonNull;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
-	private ReactGateway reactGateway;
 	public static NavigationApplication instance;
-	final Map<String, ExternalComponentCreator> externalComponents = new HashMap<>();
+
+	private final Map<String, ExternalComponentCreator> externalComponents = new HashMap<>();
+	private ReactGateway reactGateway;
+
+    public NavigationApplication() {
+        this(Collections.emptyMap());
+    }
+
+    public NavigationApplication(Map<RNNToggles, Boolean> featureToggleOverrides) {
+        instance = this;
+        RNNFeatureToggles.init(featureToggleOverrides);
+    }
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-        instance = this;
-        SoLoader.init(this, false);
+        try {
+            SoLoader.init(this, OpenSourceMergedSoMapping.INSTANCE);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         reactGateway = createReactGateway();
 	}
 

package/lib/android/app/src/main/java/com/reactnativenavigation/options/ValueAnimationOptions.kt

@@ -50,9 +50,9 @@ class ValueAnimationOptions {
             to += this.to[animationValueAccessor!!(view)]
         }
         val animator = ObjectAnimator.ofFloat(view,
-                animProp,
-                from,
-                to
+            animProp,
+            from,
+            to
         )
         animator.interpolator = interpolator
         if (duration.hasValue()) animator.duration = duration.get().toLong()

package/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -5,6 +5,8 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.MotionEvent;
 
+import androidx.annotation.RestrictTo;
+
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.ReactContext;
@@ -12,14 +14,12 @@ import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.IReactView;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.views.component.Renderable;
 
-import androidx.annotation.RestrictTo;
-
 @SuppressLint("ViewConstructor")
 public class ReactView extends ReactRootView implements IReactView, Renderable {
 

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalHostLayout.kt

@@ -34,7 +34,7 @@ open class ModalHostLayout(reactContext: ThemedReactContext) : ViewGroup(reactCo
     }
 
     @TargetApi(23)
-    override fun dispatchProvideStructure(structure: ViewStructure?) {
+    override fun dispatchProvideStructure(structure: ViewStructure) {
         mHostView.dispatchProvideStructure(structure)
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ColorUtils.java

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.utils;
 
+import android.graphics.Color;
+
 public class ColorUtils {
     public static double[] colorToLAB(int color) {
         final double[] result = new double[3];
@@ -10,4 +12,13 @@ public class ColorUtils {
     public static int labToColor(double[] lab) {
         return androidx.core.graphics.ColorUtils.LABToColor(lab[0], lab[1], lab[2]);
     }
+
+    public static boolean isColorLight(int color) {
+        double darkness = 1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255;
+        return darkness < 0.5;
+    }
+
+    public static int setAlpha(int color, int alpha) {
+        return (color & 0x00FFFFFF) | (alpha << 24);
+    }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactTypefaceUtils.java

@@ -18,6 +18,7 @@ import android.graphics.Typeface;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.views.text.ReactFontManager;
 import com.facebook.react.views.text.ReactTextShadowNode;
 import java.util.ArrayList;
@@ -96,12 +97,12 @@ public class ReactTypefaceUtils {
 
     int want = 0;
     if ((weight == Typeface.BOLD)
-        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactTextShadowNode.UNSET)) {
+        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactConstants.UNSET)) {
       want |= Typeface.BOLD;
     }
 
     if ((style == Typeface.ITALIC)
-        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactTextShadowNode.UNSET)) {
+        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactConstants.UNSET)) {
       want |= Typeface.ITALIC;
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactViewGroup.kt

@@ -1,7 +1,9 @@
 package com.reactnativenavigation.utils
 
-import com.facebook.react.views.view.ReactViewBackgroundDrawable
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable
 import com.facebook.react.views.view.ReactViewGroup
 
+@OptIn(UnstableReactNativeAPI::class)
 val ReactViewGroup.borderRadius: Float
-    get() = (background as? ReactViewBackgroundDrawable)?.fullBorderRadius ?: 0f
+    get() = (background as? CSSBackgroundDrawable)?.fullBorderWidth ?: 0f

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/StubAnimationListener.kt

@@ -0,0 +1,19 @@
+package com.reactnativenavigation.utils
+
+import android.animation.Animator
+
+open class StubAnimationListener: Animator.AnimatorListener {
+    override fun onAnimationStart(animation: Animator) {}
+    override fun onAnimationEnd(animation: Animator) {}
+    override fun onAnimationCancel(animation: Animator) {}
+    override fun onAnimationRepeat(animation: Animator) {}
+
+    companion object {
+        @JvmStatic
+        fun onAnimatorEnd(onEnd: (animation: Animator) -> Unit) = object: StubAnimationListener() {
+            override fun onAnimationEnd(animation: Animator) {
+                onEnd(animation)
+            }
+        }
+    }
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/SystemUiUtils.kt

@@ -3,7 +3,6 @@ package com.reactnativenavigation.utils
 import android.app.Activity
 import android.graphics.Color
 import android.graphics.Rect
-import android.os.Build
 import android.view.View
 import android.view.Window
 import androidx.annotation.ColorInt
@@ -16,7 +15,6 @@ import kotlin.math.ceil
 
 object SystemUiUtils {
     private const val STATUS_BAR_HEIGHT_M = 24
-    private const val STATUS_BAR_HEIGHT_L = 25
     internal const val STATUS_BAR_HEIGHT_TRANSLUCENCY = 0.65f
     private var statusBarHeight = -1
     var navigationBarDefaultColor = -1
@@ -38,7 +36,7 @@ object SystemUiUtils {
                     val contentViewTop = contentView.top
                     abs(contentViewTop - statusBarHeight)
                 }
-            } ?: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) STATUS_BAR_HEIGHT_M else STATUS_BAR_HEIGHT_L
+            } ?: STATUS_BAR_HEIGHT_M
             statusBarHeight
         }
         return res
@@ -77,8 +75,6 @@ object SystemUiUtils {
 
     @JvmStatic
     fun setStatusBarColorScheme(window: Window?, view: View, isDark: Boolean) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return
-
         window?.let {
             WindowInsetsControllerCompat(window, view).isAppearanceLightStatusBars = isDark
            // Workaround: on devices with api 30 status bar icons flickers or get hidden when removing view
@@ -121,17 +117,22 @@ object SystemUiUtils {
         @ColorInt color: Int,
         translucent: Boolean
     ) {
-        val opaqueColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            Color.BLACK
-        }else{
-            val colorAlpha = Color.alpha(color)
-            val alpha = if (translucent && colorAlpha == 255) STATUS_BAR_HEIGHT_TRANSLUCENCY else colorAlpha/255.0f
-            val red: Int = Color.red(color)
-            val green: Int = Color.green(color)
-            val blue: Int = Color.blue(color)
-            Color.argb(ceil(alpha * 255).toInt(), red, green, blue)
-        }
-        window?.statusBarColor = opaqueColor
+        val colorAlpha = Color.alpha(color)
+        val alpha = if (translucent && colorAlpha == 255) STATUS_BAR_HEIGHT_TRANSLUCENCY else colorAlpha/255.0f
+        val red: Int = Color.red(color)
+        val green: Int = Color.green(color)
+        val blue: Int = Color.blue(color)
+        val opaqueColor = Color.argb(ceil(alpha * 255).toInt(), red, green, blue)
+        setStatusBarColor(window, opaqueColor)
+    }
+
+    fun setStatusBarColor(window: Window?, color: Int) {
+        window?.statusBarColor = color
+    }
+
+    @JvmStatic
+    fun getStatusBarColor(window: Window?): Int? {
+        return window?.statusBarColor
     }
 
     @JvmStatic

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -5,8 +5,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
-import com.facebook.react.views.view.ReactViewBackgroundDrawable;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,6 +12,9 @@ import androidx.annotation.Nullable;
 
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
+import com.facebook.react.common.annotations.UnstableReactNativeAPI;
+import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable;
+
 public class ViewUtils {
     @Nullable
     public static <T extends View> T findChildByClass(ViewGroup root, Class<T> clazz) {
@@ -107,9 +108,10 @@ public class ViewUtils {
         return ((ViewGroup) parent).indexOfChild(view);
     }
 
+    @UnstableReactNativeAPI
     public static int getBackgroundColor(View view) {
-        if (view.getBackground() instanceof ReactViewBackgroundDrawable) {
-            return ((ReactViewBackgroundDrawable) view.getBackground()).getColor();
+        if (view.getBackground() instanceof CSSBackgroundDrawable) {
+            return ((CSSBackgroundDrawable) view.getBackground()).getColor();
         }
         throw new RuntimeException(view.getBackground().getClass().getSimpleName() + " is not ReactViewBackgroundDrawable");
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabPresenter.java

@@ -9,7 +9,6 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
 
-import com.aurelhubert.ahbottomnavigation.AHTextView;
 import com.aurelhubert.ahbottomnavigation.notification.AHNotification;
 import com.reactnativenavigation.options.BottomTabOptions;
 import com.reactnativenavigation.options.DotIndicatorOptions;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsAnimator.kt

@@ -1,9 +1,9 @@
 package com.reactnativenavigation.viewcontrollers.bottomtabs
 
-import com.reactnativenavigation.views.animations.BaseViewAnimator
+import com.reactnativenavigation.views.animations.BaseViewAppearanceAnimator
 import com.reactnativenavigation.views.bottomtabs.BottomTabs
 
-class BottomTabsAnimator(view: BottomTabs? = null) : BaseViewAnimator<BottomTabs>(HideDirection.Down, view) {
+class BottomTabsAnimator(view: BottomTabs? = null) : BaseViewAppearanceAnimator<BottomTabs>(HideDirection.Down, view) {
     override fun onShowAnimationEnd() {
         view.restoreBottomNavigation(false)
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -1,5 +1,9 @@
 package com.reactnativenavigation.viewcontrollers.bottomtabs;
 
+import static com.reactnativenavigation.utils.CollectionUtils.forEach;
+import static com.reactnativenavigation.utils.CollectionUtils.map;
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
+
 import android.animation.Animator;
 import android.app.Activity;
 import android.content.res.Configuration;
@@ -9,6 +13,8 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.graphics.Insets;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
@@ -34,10 +40,6 @@ import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
 
-import static com.reactnativenavigation.utils.CollectionUtils.forEach;
-import static com.reactnativenavigation.utils.CollectionUtils.map;
-import static com.reactnativenavigation.utils.ObjectUtils.perform;
-
 public class BottomTabsController extends ParentController<BottomTabsLayout> implements AHBottomNavigation.OnTabSelectedListener, TabSelector {
 
     private BottomTabsContainer bottomTabsContainer;
@@ -84,6 +86,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
     @Override
     public BottomTabsLayout createView() {
         BottomTabsLayout root = new BottomTabsLayout(getActivity());
+
         this.bottomTabsContainer = createBottomTabsContainer();
         this.bottomTabs = bottomTabsContainer.getBottomTabs();
         Options resolveCurrentOptions = resolveCurrentOptions();
@@ -95,6 +98,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         bottomTabs.addItems(createTabs());
         setInitialTab(resolveCurrentOptions);
         tabsAttacher.attach();
+
         return root;
     }
 
@@ -271,11 +275,11 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
     private void selectTab(int newIndex, boolean enableSelectionHistory) {
         saveTabSelection(newIndex, enableSelectionHistory);
         tabsAttacher.onTabSelected(tabs.get(newIndex));
-        getCurrentView().setVisibility(View.INVISIBLE);
+        getCurrentChild().onDeselected();
+
+        ViewController<?> previouslyVisible = getCurrentChild();
         bottomTabs.setCurrentItem(newIndex, false);
-        getCurrentView().setVisibility(View.VISIBLE);
-        getCurrentChild().onViewWillAppear();
-        getCurrentChild().onViewDidAppear();
+        getCurrentChild().onSelected(previouslyVisible);
     }
 
     private void saveTabSelection(int newIndex, boolean enableSelectionHistory) {
@@ -287,11 +291,6 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         }
     }
 
-    @NonNull
-    private ViewGroup getCurrentView() {
-        return tabs.get(bottomTabs.getCurrentItem()).getView();
-    }
-
     public Animator getPushAnimation(Options appearingOptions) {
         return presenter.getPushAnimation(appearingOptions);
     }
@@ -304,6 +303,14 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         return presenter.getPopAnimation(appearingOptions, disappearingOptions);
     }
 
+    @Override
+    protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
+        Insets sysInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+        view.setPaddingRelative(0, 0, 0, sysInsets.bottom);
+        return WindowInsetsCompat.CONSUMED;
+    }
+
+
     @RestrictTo(RestrictTo.Scope.TESTS)
     public BottomTabs getBottomTabs() {
         return bottomTabs;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/child/ChildController.java

@@ -2,30 +2,23 @@ package com.reactnativenavigation.viewcontrollers.child;
 
 import android.app.Activity;
 import android.content.res.Configuration;
-import android.os.Build;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowInsets;
+
+import androidx.annotation.CallSuper;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.utils.LogKt;
-import com.reactnativenavigation.viewcontrollers.parent.ParentController;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.NoOpYellowBoxDelegate;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.NoOpYellowBoxDelegate;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ViewControllerOverlay;
 import com.reactnativenavigation.views.component.Component;
 
-import androidx.annotation.CallSuper;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowCompat;
-import androidx.core.view.WindowInsetsCompat;
-
 public abstract class ChildController<T extends ViewGroup> extends ViewController<T> {
-    private final Presenter presenter;
+    protected final Presenter presenter;
     private final ChildControllersRegistry childRegistry;
 
     public ChildControllersRegistry getChildRegistry() {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentPresenter.java

@@ -1,6 +1,12 @@
 package com.reactnativenavigation.viewcontrollers.component;
 
+import android.animation.Animator;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.reactnativenavigation.options.Options;
+import com.reactnativenavigation.viewcontrollers.statusbar.StatusBarPresenter;
 import com.reactnativenavigation.views.component.ComponentLayout;
 
 public class ComponentPresenter extends ComponentPresenterBase {
@@ -35,4 +41,16 @@ public class ComponentPresenter extends ComponentPresenterBase {
         Options withDefault = options.withDefaultOptions(defaultOptions);
         setBackgroundColor(view, withDefault);
     }
+
+    @Nullable
+    public Animator getStatusBarPushAnimation(@NonNull Options appearingOptions) {
+        Options appearingOptionsWithDefault = appearingOptions.copy().withDefaultOptions(defaultOptions);
+        return StatusBarPresenter.instance.getStatusBarPushAnimation(appearingOptionsWithDefault);
+    }
+
+    @Nullable
+    public Animator getStatusBarPopAnimation(@NonNull Options appearingOptions, @NonNull Options disappearingOptions) {
+        Options appearingOptionsWithDefault = appearingOptions.copy().withDefaultOptions(defaultOptions);
+        return StatusBarPresenter.instance.getStatusBarPopAnimation(appearingOptionsWithDefault, disappearingOptions);
+    }
 }