react-native-navigation 7.23.1-snapshot.334 → 7.23.1-snapshot.357

package/jest.config.js

@@ -0,0 +1,40 @@
+module.exports = {
+  preset: 'react-native',
+  transformIgnorePatterns: [
+    'node_modules/(?!(@react-native|react-native|react-native-ui-lib|react-native-animatable)/)',
+  ],
+  transform: {
+    '\\.[jt]sx?$': 'babel-jest',
+  },
+  roots: [
+    '<rootDir>/lib/src/',
+    '<rootDir>/playground/src/',
+    '<rootDir>/integration/',
+    '<rootDir>/scripts/',
+    '<rootDir>/e2e/',
+  ],
+  setupFilesAfterEnv: ['./jest-setup.js'],
+  testPathIgnorePatterns: ['/node_modules/'],
+  moduleNameMapper: {
+    'react-native-navigation/Mock': '<rootDir>/lib/src/Mock',
+    'react-native-navigation': '<rootDir>/lib/src',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+      '<rootDir>/playground/img/layouts@2x.png',
+  },
+  collectCoverageFrom: [
+    'lib/src/**/*.ts',
+    'lib/src/**/*.tsx',
+    'integration/**/*.js',
+    '!lib/dist/index.js',
+    '!lib/dist/Navigation.js',
+    '!lib/dist/adapters/**/*',
+    '!lib/dist/interfaces/**/*',
+    '!lib/dist/**/*.test.*',
+    '!integration/**/*.test.*',
+    '!integration/*.test.*',
+    '!e2e/**/*test.js',
+  ],
+  resetMocks: true,
+  resetModules: true,
+  coverageReporters: ['json', 'lcov', 'text', 'html'],
+};

package/lib/android/app/build.gradle

@@ -3,27 +3,29 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def DEFAULT_COMPILE_SDK_VERSION = 29
-def DEFAULT_MIN_SDK_VERSION = 19
-def DEFAULT_TARGET_SDK_VERSION = 29
-def kotlinVersion = rootProject.ext.get("RNNKotlinVersion")
-def kotlinStdlib = safeExtGet('RNNKotlinStdlib', 'kotlin-stdlib-jdk8')
-def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.4.3')
+def safeExtGetFallbackLowerBound(prop, fallback) {
+    Math.max(safeExtGet(prop,fallback),fallback)
+}
 
+def DEFAULT_COMPILE_SDK_VERSION = 30
+def DEFAULT_MIN_SDK_VERSION = 21
+def DEFAULT_TARGET_SDK_VERSION = 30
+def DEFAULT_KOTLIN_VERSION = "1.5.31"
+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 {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+    compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion safeExtGetFallbackLowerBound('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion safeExtGetFallbackLowerBound('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
     }
     buildTypes {
         release {

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

@@ -26,11 +26,11 @@ class FontOptions {
 
     @JvmOverloads fun getTypeface(typefaceLoader: TypefaceLoader, defaultTypeface: Typeface? = null): Typeface? {
         if (isDirty) {
-            _typeface = typefaceLoader.getTypeFace(fontFamily.get(""), fontStyle.get(""), fontWeight.get(""))
+            _typeface = typefaceLoader.getTypeFace(fontFamily.get(null), fontStyle.get(""), fontWeight.get(""), defaultTypeface)
             isDirty = false
         }
         return _typeface
-                ?: defaultTypeface?.let { typefaceLoader.getTypeFace(fontFamily.get(""), fontStyle.get(""), fontWeight.get(""), it) }
+                ?: defaultTypeface?.let { typefaceLoader.getTypeFace(fontFamily.get(null), fontStyle.get(""), fontWeight.get(""), it) }
     }
 
     fun mergeWith(other: FontOptions) {

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

@@ -2,21 +2,27 @@ package com.reactnativenavigation.options.parsers
 
 import android.content.Context
 import android.graphics.Typeface
+import com.aurelhubert.ahbottomnavigation.AHTextView
 import com.reactnativenavigation.utils.ReactTypefaceUtils
 
 open class TypefaceLoader(private val context: Context) {
-    @JvmOverloads open fun getTypeFace(
-            fontFamilyName: String?,
-            fontStyle: String?,
-            fontWeight: String?,
-            defaultTypeFace: Typeface? = null
+  open  val defaultTypeFace: Typeface by lazy {
+        AHTextView(context).typeface ?: Typeface.DEFAULT
+    }
+
+    @JvmOverloads
+    open fun getTypeFace(
+        fontFamilyName: String?,
+        fontStyle: String?,
+        fontWeight: String?,
+        defaultTypeFace: Typeface? = null
     ): Typeface? {
         return ReactTypefaceUtils.applyStyles(
-                defaultTypeFace,
-                ReactTypefaceUtils.parseFontStyle(fontStyle),
-                ReactTypefaceUtils.parseFontWeight(fontWeight),
-                fontFamilyName,
-                context.assets
+            defaultTypeFace,
+            ReactTypefaceUtils.parseFontStyle(fontStyle),
+            ReactTypefaceUtils.parseFontWeight(fontWeight),
+            fontFamilyName,
+            context.assets
         )
     }
 }

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

@@ -11,7 +11,7 @@ class ModalFrameLayout(context: ReactContext) : FrameLayout(context) {
         addView(modalContentLayout, MarginLayoutParams(MarginLayoutParams.WRAP_CONTENT, MarginLayoutParams.WRAP_CONTENT)
             .apply {
                 val translucent = context.currentActivity?.window?.let {
-                    StatusBarUtils.isTranslucent(context.currentActivity?.window)
+                    StatusBarUtils.isTranslucent(it)
                 } ?: false
                 topMargin = if (translucent) 0 else StatusBarUtils.getStatusBarHeight(context)
             })

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

@@ -0,0 +1,39 @@
+package com.reactnativenavigation.utils
+
+import android.content.Context
+import android.os.Build
+import android.view.Window
+import android.view.WindowManager
+
+object StatusBarUtils {
+    private const val STATUS_BAR_HEIGHT_M = 24
+    private const val STATUS_BAR_HEIGHT_L = 25
+    private var statusBarHeight = -1
+    @JvmStatic
+    fun saveStatusBarHeight(height: Int) {
+        statusBarHeight = height
+    }
+    @JvmStatic
+    fun getStatusBarHeight(context: Context): Int {
+        if (statusBarHeight > 0) {
+            return statusBarHeight
+        }
+        val resources = context.resources
+        val resourceId = resources.getIdentifier("status_bar_height", "dimen", "android")
+        statusBarHeight = if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else UiUtils.dpToPx(
+            context,
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) STATUS_BAR_HEIGHT_M else STATUS_BAR_HEIGHT_L
+        )
+        return statusBarHeight
+    }
+    @JvmStatic
+    fun getStatusBarHeightDp(context: Context): Int {
+        return UiUtils.pxToDp(context, getStatusBarHeight(context).toFloat())
+            .toInt()
+    }
+    @JvmStatic
+    fun isTranslucent(window: Window): Boolean {
+        val lp = window.attributes
+        return lp != null && lp.flags and WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS == WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
+    }
+}

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

@@ -9,6 +9,7 @@ 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;
@@ -27,6 +28,7 @@ public class BottomTabPresenter {
     private final Context context;
     private final ImageLoader imageLoader;
     private final TypefaceLoader typefaceLoader;
+    private final Typeface defaultTypeface;
     private Options defaultOptions;
     private final BottomTabFinder bottomTabFinder;
     private final LateInit<BottomTabs> bottomTabs = new LateInit<>();
@@ -39,6 +41,7 @@ public class BottomTabPresenter {
         this.bottomTabFinder = new BottomTabFinder(tabs);
         this.imageLoader = imageLoader;
         this.typefaceLoader = typefaceLoader;
+        this.defaultTypeface = typefaceLoader.getDefaultTypeFace();
         this.defaultOptions = defaultOptions;
         defaultDotIndicatorSize = dpToPx(context, 6);
     }
@@ -57,7 +60,7 @@ public class BottomTabPresenter {
                 BottomTabOptions tab = tabs.get(i).resolveCurrentOptions(defaultOptions).bottomTabOptions;
                 bottomTabs.setIconWidth(i, tab.iconWidth.get(null));
                 bottomTabs.setIconHeight(i, tab.iconHeight.get(null));
-                bottomTabs.setTitleTypeface(i, tab.font.getTypeface(typefaceLoader, Typeface.DEFAULT));
+                bottomTabs.setTitleTypeface(i, tab.font.getTypeface(typefaceLoader, defaultTypeface));
                 if (tab.selectedIconColor.canApplyValue()) bottomTabs.setIconActiveColor(i, tab.selectedIconColor.get(null));
                 if (tab.iconColor.canApplyValue()) bottomTabs.setIconInactiveColor(i, tab.iconColor.get(null));
                 bottomTabs.setTitleActiveColor(i, tab.selectedTextColor.get(null));
@@ -86,7 +89,7 @@ public class BottomTabPresenter {
                 BottomTabOptions tab = options.bottomTabOptions;
                 if (tab.iconWidth.hasValue()) bottomTabs.setIconWidth(index, tab.iconWidth.get(null));
                 if (tab.iconHeight.hasValue()) bottomTabs.setIconHeight(index, tab.iconHeight.get(null));
-                if (tab.font.hasValue()) bottomTabs.setTitleTypeface(index, tab.font.getTypeface(typefaceLoader, Typeface.DEFAULT));
+                if (tab.font.hasValue()) bottomTabs.setTitleTypeface(index, tab.font.getTypeface(typefaceLoader, defaultTypeface));
                 if (canMergeColor(tab.selectedIconColor)) bottomTabs.setIconActiveColor(index, tab.selectedIconColor.get());
                 if (canMergeColor(tab.iconColor)) bottomTabs.setIconInactiveColor(index, tab.iconColor.get());
                 if (tab.selectedTextColor.hasValue()) bottomTabs.setTitleActiveColor(index, tab.selectedTextColor.get());

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

@@ -15,6 +15,7 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.component.ComponentLayout;
 
 import androidx.annotation.NonNull;
+import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
@@ -137,13 +138,13 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     protected WindowInsetsCompat applyWindowInsets(ViewController<?> view, WindowInsetsCompat insets) {
-        ViewCompat.onApplyWindowInsets(view.getView(), insets.replaceSystemWindowInsets(
-                insets.getSystemWindowInsetLeft(),
-                insets.getSystemWindowInsetTop(),
+        final WindowInsetsCompat.Builder builder = new WindowInsetsCompat.Builder();
+        final WindowInsetsCompat finalInsets = builder.setSystemWindowInsets(Insets.of(insets.getSystemWindowInsetLeft(),
+                Math.max(insets.getSystemWindowInsetTop() - getTopInset(), 0),
                 insets.getSystemWindowInsetRight(),
-                Math.max(insets.getSystemWindowInsetBottom() - getBottomInset(), 0)
-        ));
-        return insets;
+                Math.max(insets.getSystemWindowInsetBottom() - getBottomInset(), 0))).build();
+        ViewCompat.onApplyWindowInsets(view.getView(), finalInsets);
+        return finalInsets;
     }
 
     @Override

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -90,10 +90,12 @@ public class ModalPresenter {
     }
 
     private void onShowModalEnd(ViewController<?> toAdd, @Nullable ViewController<?> toRemove, CommandListener listener) {
-        toAdd.onViewDidAppear();
-        if (toRemove != null && toAdd.resolveCurrentOptions(defaultOptions).modal.presentationStyle != ModalPresentationStyle.OverCurrentContext) {
-            toRemove.detachView();
-        }
+        toAdd.addOnAppearedListener(()->{
+            toAdd.onViewDidAppear();
+            if (toRemove != null && toAdd.resolveCurrentOptions(defaultOptions).modal.presentationStyle != ModalPresentationStyle.OverCurrentContext) {
+                toRemove.detachView();
+            }
+        });
         listener.onSuccess(toAdd.getId());
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -5,6 +5,7 @@ import android.content.res.Configuration;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.options.ButtonOptions;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.StackAnimationOptions;
@@ -175,9 +176,7 @@ public class StackController extends ParentController<StackLayout> {
                         presenter.getAdditionalPushAnimations(this, child, resolvedOptions),
                         () -> onPushAnimationComplete(child, toRemove, listener));
             } else {
-                child.onViewDidAppear();
-                getView().removeView(toRemove.getView());
-                listener.onSuccess(child.getId());
+                onPushAnimationComplete(child, toRemove, listener);
             }
         } else {
             listener.onSuccess(child.getId());
@@ -191,8 +190,10 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     private void onPushAnimationComplete(ViewController<?> toAdd, ViewController<?> toRemove, CommandListener listener) {
-        toAdd.onViewDidAppear();
-        if (!peek().equals(toRemove)) getView().removeView(toRemove.getView());
+        toAdd.addOnAppearedListener(() -> {
+            toAdd.onViewDidAppear();
+            if (!peek().equals(toRemove)) getView().removeView(toRemove.getView());
+        });
         listener.onSuccess(toAdd.getId());
     }
 
@@ -421,12 +422,19 @@ public class StackController extends ParentController<StackLayout> {
         if (isEmpty()) return;
         ViewController<?> childController = peek();
         ViewGroup child = childController.getView();
-        child.setId(CompatUtils.generateViewId());
+        setChildId(child);
         childController.addOnAppearedListener(this::startChildrenBellowTopChild);
         stackLayout.addView(child, 0, matchParentWithBehaviour(new StackBehaviour(this)));
         presenter.applyInitialChildLayoutOptions(resolveCurrentOptions());
     }
 
+    private void setChildId(ViewGroup child) {
+        //From RN > 64 we can't set id to child that is ReactRootView
+        //see:https://github.com/facebook/react-native/blob/main/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java#L676
+        if (!(child instanceof ReactRootView))
+            child.setId(CompatUtils.generateViewId());
+    }
+
     private void startChildrenBellowTopChild() {
         ArrayList<ViewController<?>> children = new ArrayList<>(getChildControllers());
         for (int i = children.size() - 2; i >= 0; i--) {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonSpan.kt

@@ -25,7 +25,7 @@ class ButtonSpan(
 
     fun apply(paint: Paint) {
         with(button.font) {
-            val typeface = getTypeface(typefaceLoader, Typeface.DEFAULT)
+            val typeface = getTypeface(typefaceLoader, paint.typeface)
             val fakeStyle = (paint.typeface?.style ?: 0) and (typeface?.style?.inv() ?: 1)
             if (fakeStyle and Typeface.BOLD != 0) paint.isFakeBoldText = true
             if (fakeStyle and Typeface.ITALIC != 0) paint.textSkewX = -0.25f

package/lib/android/app/src/reactNative51/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -8,6 +8,7 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.reactnativenavigation.NavigationApplication;
+import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -44,7 +45,7 @@ public abstract class NavigationReactNativeHost extends ReactNativeHost implemen
                 .setJSMainModulePath(getJSMainModuleName())
                 .setUseDeveloperSupport(getUseDeveloperSupport())
                 .setRedBoxHandler(getRedBoxHandler())
-                .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
+                .setJavaScriptExecutorFactory(new HermesExecutorFactory())
                 .setUIImplementationProvider(getUIImplementationProvider())
                 .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
                 .setDevBundleDownloadListener(getDevBundleDownloadListener());

package/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TypefaceLoaderMock.kt

@@ -9,8 +9,12 @@ class TypefaceLoaderMock() : TypefaceLoader(mock()) {
 
     constructor(mockTypefaces: Map<String, Typeface>?) : this() {
         this.mockTypefaces = mockTypefaces
+
     }
 
+    override val defaultTypeFace: Typeface
+        get() = Typeface.DEFAULT
+
     override fun getTypeFace(fontFamilyName: String?, fontStyle: String?, fontWeight: String?, defaultTypeFace: Typeface?): Typeface? {
         return mockTypefaces?.getOrDefault(fontFamilyName, defaultTypeFace) ?: defaultTypeFace
     }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -50,6 +50,7 @@ public class ModalPresenterTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        super.beforeEach();
         Activity activity = newActivity();
         ChildControllersRegistry childRegistry = new ChildControllersRegistry();
 
@@ -210,6 +211,7 @@ public class ModalPresenterTest extends BaseTest {
         uut.setRootLayout(spy);
 
         uut.showModal(modal1, root, new CommandListenerAdapter());
+        idleMainLooper();
         uut.dismissModal(modal1, root, root, new CommandListenerAdapter());
 
         verify(spy).addView(root.getView(), 0);
@@ -237,6 +239,7 @@ public class ModalPresenterTest extends BaseTest {
         verify(modal1).onViewWillAppear();
 
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
+        idleMainLooper();
         assertThat(modal1.getView().getParent()).isNull();
 
         Shadows.shadowOf(Looper.getMainLooper()).idle();
@@ -253,6 +256,7 @@ public class ModalPresenterTest extends BaseTest {
 
         uut.showModal(modal1, root, new CommandListenerAdapter());
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
+        idleMainLooper();
         assertThat(modal1.getView().getParent()).isNull();
         assertThat(root.getView().getParent()).isNull();
 

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -13,7 +13,7 @@ import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-
+import com.reactnativenavigation.options.TransitionAnimationOptions;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -54,6 +54,7 @@ public class ModalStackTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        super.beforeEach();
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
         root = new SimpleViewController(activity, childRegistry, "root", new Options());
@@ -81,6 +82,16 @@ public class ModalStackTest extends BaseTest {
                 .build();
     }
 
+    @Test
+    public void showModal_DidAppearEventShouldWaitForReactViewToBeShown(){
+        CommandListener listener = spy(new CommandListenerAdapter());
+        uut.showModal(modal1, root, listener);
+        verify(modal1).addOnAppearedListener(any());
+        verify(listener).onSuccess(modal1.getId());
+        idleMainLooper();
+        verify(modal1).onViewDidAppear();
+    }
+
     @Test
     public void modalRefIsSaved() {
         disableShowModalAnimation(modal1);
@@ -94,6 +105,7 @@ public class ModalStackTest extends BaseTest {
     public void showModal() {
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.showModal(modal1, root, listener);
+        idleMainLooper();
         verify(listener).onSuccess(modal1.getId());
         verify(modal1).onViewDidAppear();
         assertThat(uut.size()).isOne();

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java

@@ -507,7 +507,7 @@ public class NavigatorTest extends BaseTest {
         StackController stack2 = newStack(child2, child3, child4);
         BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter(), reactInstanceManager);
-
+        idleMainLooper();
         CommandListenerAdapter listener = spy(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -670,7 +670,7 @@ public class NavigatorTest extends BaseTest {
         final StackController stack2 = newStack(child2, child3);
         BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter(), reactInstanceManager);
-
+        idleMainLooper();
         CommandListenerAdapter listener = spy(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.kt

@@ -197,7 +197,7 @@ class StackControllerTest : BaseTest() {
     fun setRoot_pushDuringSetRootAnimationShouldNotCrash() {
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
-
+        idleMainLooper()
         uut.setRoot(listOf(child1), CommandListenerAdapter())
         uut.push(child3, CommandListenerAdapter())
         assertThat(uut.currentChild).isEqualTo(child3)
@@ -281,6 +281,7 @@ class StackControllerTest : BaseTest() {
         disablePushAnimation(child1, child2)
         uut.push(child1, CommandListenerAdapter()) // Initialize stack with a child
         uut.push(child2, CommandListenerAdapter())
+        idleMainLooper()
         verify(child2).onViewDidAppear()
     }
 
@@ -608,8 +609,9 @@ class StackControllerTest : BaseTest() {
         assertNotChildOf(uut.view, child1.view)
         uut.push(child1, CommandListenerAdapter())
         assertIsChild(uut.view, child1.view)
-
+        idleMainLooper()
         uut.push(child2, CommandListenerAdapter())
+        idleMainLooper()
         assertIsChild(uut.view, child2)
         assertNotChildOf(uut.view, child1)
     }
@@ -663,7 +665,7 @@ class StackControllerTest : BaseTest() {
         val child1View: View = child1.view
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
-
+        idleMainLooper()
         assertIsChild(uut.view, child2View)
         assertNotChildOf(uut.view, child1View)
         uut.pop(Options.EMPTY, CommandListenerAdapter())
@@ -715,7 +717,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child2, CommandListenerAdapter())
         uut.push(child3, CommandListenerAdapter())
         uut.push(child4, CommandListenerAdapter())
-
+        idleMainLooper()
         uut.popTo(child2, Options.EMPTY, CommandListenerAdapter())
         verify(animator, never()).pop(any(), eq(child1), any(), any(), any())
         verify(animator, never()).pop(any(), eq(child2), any(), any(), any())
@@ -729,6 +731,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child1, mock())
         uut.push(child2, mock())
         uut.push(child3, mock())
+        idleMainLooper()
         uut.popTo(child1, Options.EMPTY, mock())
         animator.endPushAnimation(child3)
         assertContainsOnlyId(child1.id)
@@ -759,8 +762,8 @@ class StackControllerTest : BaseTest() {
         disablePushAnimation(child1, child2, child3)
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
-
         uut.push(child3, CommandListenerAdapter())
+        idleMainLooper()
         uut.popToRoot(Options.EMPTY, object : CommandListenerAdapter() {
             override fun onSuccess(childId: String) {
                 verify(animator).pop(eq(child1), eq(child3), any(), any(), any())
@@ -776,6 +779,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
         uut.push(child3, CommandListenerAdapter())
+        idleMainLooper()
         uut.popToRoot(Options.EMPTY, object : CommandListenerAdapter() {
             override fun onSuccess(childId: String) {
                 verify(child1, never()).destroy()
@@ -811,6 +815,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child1, mock())
         uut.push(child2, mock())
         uut.push(child3, mock())
+        idleMainLooper()
         uut.popToRoot(Options.EMPTY, mock())
         animator.endPushAnimation(child3)
         assertContainsOnlyId(child1.id)

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/TopBarControllerTest.kt

@@ -336,11 +336,11 @@ class TopBarControllerTest : BaseTest() {
         verify(removedControllers[textButton1.id]!!, never()).destroy()
         verify(removedControllers[textButton2.id]!!, never()).destroy()
 
-        verify(rightButtonControllers[textButton1.id]!!, times(1)).addToMenu(any(), any())
-        verify(rightButtonControllers[textButton2.id]!!, times(1)).addToMenu(any(), any())
+        verify(rightButtonControllers[textButton1.id]!!, times(2)).addToMenu(any(), any())
+        verify(rightButtonControllers[textButton2.id]!!, times(2)).addToMenu(any(), any())
     }
     @Test
-    fun `mergeRightButtons - should rebuild menu when adding menu items`(){
+    fun `mergeRightButtons - should rebuild menu when adding menu items, existing should not be destroyed`(){
         val controllers = spy(LinkedHashMap<String,ButtonController>())
         uut.mergeRightButtonsOptions(controllers, listOf(textButton1)) {
             createButtonController(it)
@@ -351,8 +351,8 @@ class TopBarControllerTest : BaseTest() {
             createButtonController(it)
         }
         assertThat(uut.rightButtonCount).isEqualTo(2)
-        verify(controllers, times(1)).remove(any())
-        verify(controllers[textButton1.id]!!, times(1)).addToMenu(any(), any())
+        verify(controllers, never()).remove(any())
+        verify(controllers[textButton1.id]!!, times(2)).addToMenu(any(), any())
     }
     @Test
     fun `mergeRightButtons - should modify changed buttons`(){
@@ -374,12 +374,13 @@ class TopBarControllerTest : BaseTest() {
         verify(controllers[textButton1.id]!!, never()).destroy()
     }
 
-    fun `mergeRightButtons - reorder of same menu items should rebuild menu`(){
+    @Test
+    fun `mergeRightButtons - reorder of same menu items should rebuild menu, not view recreation`(){
         val controllers = spy(LinkedHashMap<String,ButtonController>())
         uut.mergeRightButtonsOptions(controllers, listOf(textButton1, textButton2)) {
             createButtonController(it)
         }
-        assertThat(uut.rightButtonCount).isEqualTo(1)
+        assertThat(uut.rightButtonCount).isEqualTo(2)
         verify(controllers[textButton1.id]!!, times(1)).addToMenu(any(), any())
         verify(controllers[textButton2.id]!!, times(1)).addToMenu(any(), any())
 
@@ -390,8 +391,8 @@ class TopBarControllerTest : BaseTest() {
         verify(controllers[textButton2.id]!!, never()).mergeButtonOptions(any(), any())
         verify(controllers[textButton1.id]!!, times(2)).addToMenu(any(), any())
         verify(controllers[textButton2.id]!!, times(2)).addToMenu(any(), any())
-        verify(controllers[textButton1.id]!!, times(1)).destroy()
-        verify(controllers[textButton2.id]!!, times(1)).destroy()
+        verify(controllers[textButton1.id]!!, never()).destroy()
+        verify(controllers[textButton2.id]!!, never()).destroy()
     }
 
     private fun createButtonController(it: ButtonOptions) =

package/lib/ios/RNNModalManager.m

@@ -36,12 +36,14 @@
     modalHostViewManager.presentationBlock =
         ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
           dispatch_block_t completionBlock) {
-          [self showModal:viewController
-                 animated:animated
-               completion:^(NSString *_Nonnull componentId) {
-                 if (completionBlock)
-                     completionBlock();
-               }];
+          if (reactViewController.presentedViewController != viewController) {
+              [self showModal:viewController
+                     animated:animated
+                   completion:^(NSString *_Nonnull componentId) {
+                     if (completionBlock)
+                         completionBlock();
+                   }];
+          }
         };
 
     modalHostViewManager.dismissalBlock =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.23.1-snapshot.334",
+  "version": "7.23.1-snapshot.357",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -66,10 +66,9 @@
     "tslib": "1.9.3"
   },
   "devDependencies": {
-    "@babel/core": "7.10.3",
     "@babel/plugin-proposal-export-default-from": "7.10.1",
     "@babel/plugin-proposal-export-namespace-from": "7.10.1",
-    "@babel/types": "7.6.x",
+    "@babel/types": "7.15.6",
     "@react-native-community/blur": "^3.6.0",
     "@react-native-community/datetimepicker": "^3.4.7",
     "@react-native-community/eslint-config": "2.0.0",
@@ -79,14 +78,14 @@
     "@types/detox": "17.14.3",
     "@types/hoist-non-react-statics": "^3.0.1",
     "@types/jasmine": "3.5.10",
-    "@types/jest": "26.0.3",
+    "@types/jest": "27.0.2",
     "@types/lodash": "^4.14.149",
     "@types/react": "16.9.41",
     "@types/react-native": "0.63.1",
     "@types/react-test-renderer": "16.9.2",
     "@typescript-eslint/eslint-plugin": "3.3.0",
     "@typescript-eslint/parser": "3.3.0",
-    "babel-jest": "26.1.0",
+    "babel-jest": "^27.2.5",
     "clang-format": "^1.4.0",
     "detox": "18.23.1",
     "eslint": "7.3.0",
@@ -95,16 +94,18 @@
     "github-release-notes": "https://github.com/yogevbd/github-release-notes/tarball/e601b3dba72dcd6cba323c1286ea6dd0c0110b58",
     "husky": "4.2.5",
     "identity-obj-proxy": "3.0.0",
-    "jest": "26.1.0",
-    "jest-circus": "26.1.0",
+    "@babel/core": "7.15.8",
+    "@babel/runtime": "7.15.4",
+    "jest": "^27.2.5",
+    "jest-circus": "^27.2.5",
     "lint-staged": "10.2.11",
-    "metro-react-native-babel-preset": "0.59.0",
+    "metro-react-native-babel-preset": "0.66.2",
     "prettier": "2.1.2",
-    "react": "16.13.1",
-    "react-native": "0.63.2",
+    "react": "17.0.2",
+    "react-native": "0.66.2",
     "react-native-fast-image": "^8.3.4",
     "react-native-gesture-handler": "^1.6.1",
-    "react-native-reanimated": "^1.9.0",
+    "react-native-reanimated": "2.3.0-beta.2",
     "react-native-ui-lib": "5.11.0",
     "react-redux": "5.x.x",
     "react-test-renderer": "16.13.1",
@@ -117,48 +118,6 @@
     "detox-testing-library-rnn-adapter": "2.x.x",
     "remx": "3.x.x"
   },
-  "jest": {
-    "preset": "react-native",
-    "transform": {
-      "^.+\\.js$": "<rootDir>/node_modules/react-native/jest/preprocessor.js"
-    },
-    "roots": [
-      "<rootDir>/lib/src/",
-      "<rootDir>/playground/src/",
-      "<rootDir>/integration/",
-      "<rootDir>/scripts/",
-      "<rootDir>/e2e/"
-    ],
-    "setupFilesAfterEnv": [
-      "./jest-setup.js"
-    ],
-    "moduleNameMapper": {
-      "react-native-navigation/Mock": "<rootDir>/lib/src/Mock",
-      "react-native-navigation": "<rootDir>/lib/src",
-      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/playground/img/layouts@2x.png"
-    },
-    "collectCoverageFrom": [
-      "lib/src/**/*.ts",
-      "lib/src/**/*.tsx",
-      "integration/**/*.js",
-      "!lib/dist/index.js",
-      "!lib/dist/Navigation.js",
-      "!lib/dist/adapters/**/*",
-      "!lib/dist/interfaces/**/*",
-      "!lib/dist/**/*.test.*",
-      "!integration/**/*.test.*",
-      "!integration/*.test.*",
-      "!e2e/**/*test.js"
-    ],
-    "resetMocks": true,
-    "resetModules": true,
-    "coverageReporters": [
-      "json",
-      "lcov",
-      "text",
-      "html"
-    ]
-  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"

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

@@ -1,41 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Build;
-import android.view.Window;
-import android.view.WindowManager;
-
-import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
-import static com.reactnativenavigation.utils.UiUtils.dpToPx;
-
-public class StatusBarUtils {
-    private static final int STATUS_BAR_HEIGHT_M = 24;
-    private static final int STATUS_BAR_HEIGHT_L = 25;
-    private static int statusBarHeight = -1;
-
-    public static void saveStatusBarHeight(int height) {
-        statusBarHeight = height;
-    }
-
-    public static int getStatusBarHeight(Context context) {
-        if (statusBarHeight > 0) {
-            return statusBarHeight;
-        }
-        final Resources resources = context.getResources();
-        final int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
-        statusBarHeight = resourceId > 0 ?
-                resources.getDimensionPixelSize(resourceId) :
-                dpToPx(context, Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? STATUS_BAR_HEIGHT_M : STATUS_BAR_HEIGHT_L);
-        return statusBarHeight;
-    }
-
-    public static int getStatusBarHeightDp(Context context) {
-        return (int) UiUtils.pxToDp(context, getStatusBarHeight(context));
-    }
-
-    public static boolean isTranslucent(Window window) {
-        WindowManager.LayoutParams lp = window.getAttributes();
-        return lp != null && (lp.flags & FLAG_TRANSLUCENT_STATUS) == FLAG_TRANSLUCENT_STATUS;
-    }
-}