react-native-navigation 7.24.0 → 7.24.3

package/lib/Mock/Components/ComponentScreen.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Button, View, Text } from 'react-native';
-import { Navigation } from '../../src';
+import { Navigation } from 'react-native-navigation';
 import { ComponentProps } from '../ComponentProps';
 import { VISIBLE_SCREEN_TEST_ID } from '../constants';
 import { LayoutStore } from '../Stores/LayoutStore';

package/lib/Mock/Components/NavigationButton.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Button, TouchableOpacity } from 'react-native';
-import { Navigation, OptionsTopBarButton } from '../../src';
+import { Navigation, OptionsTopBarButton } from 'react-native-navigation';
 import { events } from '../Stores/EventsStore';
 
 interface ButtonProps {

package/lib/Mock/Components/TopBar.tsx

@@ -1,7 +1,11 @@
 import React, { Component } from 'react';
 import { Button, View, Text } from 'react-native';
-import { Navigation, OptionsTopBarButton } from '../../src';
-import { OptionsTopBar, OptionsTopBarBackButton } from '../../src/interfaces/Options';
+import {
+  Navigation,
+  OptionsTopBar,
+  OptionsTopBarBackButton,
+  OptionsTopBarButton,
+} from 'react-native-navigation';
 import ParentNode from '../Layouts/ParentNode';
 import { LayoutStore } from '../Stores/LayoutStore';
 import { NavigationButton } from './NavigationButton';

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

@@ -66,18 +66,22 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
     }
 
     public void sendComponentWillStart(ComponentType type) {
-        if (this.reactInstanceManager == null) return;
-        ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
-        if (currentReactContext != null)
-            new EventEmitter(currentReactContext).emitComponentWillAppear(componentId, componentName, type);
+        this.post(()->{
+            if (this.reactInstanceManager == null) return;
+            ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+            if (currentReactContext != null)
+                new EventEmitter(currentReactContext).emitComponentWillAppear(componentId, componentName, type);
+        });
     }
 
     public void sendComponentStart(ComponentType type) {
-        if (this.reactInstanceManager == null) return;
-        ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
-        if (currentReactContext != null) {
-            new EventEmitter(currentReactContext).emitComponentDidAppear(componentId, componentName, type);
-        }
+        this.post(()->{
+            if (this.reactInstanceManager == null) return;
+            ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+            if (currentReactContext != null) {
+                new EventEmitter(currentReactContext).emitComponentDidAppear(componentId, componentName, type);
+            }
+        });
     }
 
     public void sendComponentStop(ComponentType type) {

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

@@ -17,7 +17,7 @@ import kotlin.math.ceil
 object SystemUiUtils {
     private const val STATUS_BAR_HEIGHT_M = 24
     private const val STATUS_BAR_HEIGHT_L = 25
-    private const val STATUS_BAR_HEIGHT_TRANSLUCENCY = 0.65f
+    internal const val STATUS_BAR_HEIGHT_TRANSLUCENCY = 0.65f
     private var statusBarHeight = -1
     var navigationBarDefaultColor = -1
         private set
@@ -124,7 +124,8 @@ object SystemUiUtils {
         val opaqueColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             Color.BLACK
         }else{
-            val alpha = if (translucent) STATUS_BAR_HEIGHT_TRANSLUCENCY else 1f
+            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)

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

@@ -274,6 +274,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         getCurrentView().setVisibility(View.INVISIBLE);
         bottomTabs.setCurrentItem(newIndex, false);
         getCurrentView().setVisibility(View.VISIBLE);
+        getCurrentChild().onViewWillAppear();
         getCurrentChild().onViewDidAppear();
     }
 

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

@@ -78,12 +78,14 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
         if (view != null)
             view.sendComponentWillStart();
         super.onViewDidAppear();
+        view.requestApplyInsets();
         if (view != null && lastVisibilityState == VisibilityState.Disappear) view.sendComponentStart();
         lastVisibilityState = VisibilityState.Appear;
     }
 
     @Override
     public void onViewDisappear() {
+        if(lastVisibilityState == VisibilityState.Disappear)return;
         lastVisibilityState = VisibilityState.Disappear;
         if (view != null) view.sendComponentStop();
         super.onViewDisappear();

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

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

@@ -190,10 +190,8 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     private void onPushAnimationComplete(ViewController<?> toAdd, ViewController<?> toRemove, CommandListener listener) {
-        toAdd.addOnAppearedListener(() -> {
-            toAdd.onViewDidAppear();
-            if (!peek().equals(toRemove)) getView().removeView(toRemove.getView());
-        });
+        toAdd.onViewDidAppear();
+        if (!peek().equals(toRemove)) getView().removeView(toRemove.getView());
         listener.onSuccess(toAdd.getId());
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabs.java

@@ -88,6 +88,12 @@ public class BottomTabs extends AHBottomNavigation {
         if (getDefaultBackgroundColor() != color) setDefaultBackgroundColor(color);
     }
 
+    @Override
+    public void restoreBottomNavigation(boolean withAnimation) {
+        super.restoreBottomNavigation(withAnimation);
+        if (!withAnimation) setVisibility(View.VISIBLE);
+    }
+
     @Override
     public void hideBottomNavigation(boolean withAnimation) {
         super.hideBottomNavigation(withAnimation);

package/lib/android/app/src/test/java/com/reactnativenavigation/utils/SystemUiUtilsTest.kt

@@ -0,0 +1,27 @@
+package com.reactnativenavigation.utils
+
+import android.graphics.Color
+import android.view.Window
+import com.reactnativenavigation.BaseTest
+import com.reactnativenavigation.utils.SystemUiUtils.STATUS_BAR_HEIGHT_TRANSLUCENCY
+import org.junit.Test
+import org.mockito.Mockito
+import org.mockito.kotlin.verify
+import kotlin.math.ceil
+
+class SystemUiUtilsTest : BaseTest() {
+
+    @Test
+    fun `setStatusBarColor - should change color considering alpha`() {
+        val window = Mockito.mock(Window::class.java)
+        val alphaColor = Color.argb(44, 22, 255, 255)
+        val color = Color.argb(255, 22, 255, 255)
+        SystemUiUtils.setStatusBarColor(window, alphaColor, false)
+
+        verify(window).statusBarColor = alphaColor
+
+        SystemUiUtils.setStatusBarColor(window, color, true)
+
+        verify(window).statusBarColor = Color.argb(ceil(STATUS_BAR_HEIGHT_TRANSLUCENCY*255).toInt(), 22, 255, 255)
+    }
+}

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.kt

@@ -316,7 +316,24 @@ class BottomTabsControllerTest : BaseTest() {
             ), ArgumentMatchers.any(Int::class.java)
         )
     }
+    @Test
+    fun `mergeOptions - select tab calls onViewWillAppear to apply options on the selected child`(){
+        uut.ensureViewIsCreated()
+        Java6Assertions.assertThat(uut.selectedIndex).isZero
+
+        val options = Options()
+        options.bottomTabsOptions.currentTabIndex = Number(1)
+        uut.mergeOptions(options)
+        Java6Assertions.assertThat(uut.selectedIndex).isOne
+        Mockito.verify(child2).onViewWillAppear()
+        Mockito.verify(child2).onViewDidAppear()
 
+        options.bottomTabsOptions.currentTabIndex = Number(0)
+        uut.mergeOptions(options)
+        Java6Assertions.assertThat(uut.selectedIndex).isZero
+        Mockito.verify(child1).onViewWillAppear()
+        Mockito.verify(child1).onViewDidAppear()
+    }
     @Test
     fun mergeOptions_drawBehind() {
         Java6Assertions.assertThat(uut.getBottomInset(child1)).isEqualTo(uut.bottomTabs.height)

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewControllerTest.java

@@ -94,6 +94,24 @@ public class ComponentViewControllerTest extends BaseTest {
         Mockito.verify(view, Mockito.times(1)).sendComponentStop();
     }
 
+    @Test
+    public void shouldNotSendDidDisappearAboutDisappearedView() {
+        uut.ensureViewIsCreated();
+        uut.onViewDisappear();
+        Mockito.verify(view, Mockito.times(0)).sendComponentStart();
+        Mockito.verify(view, Mockito.times(0)).sendComponentStop();
+
+        uut.onViewWillAppear();
+        uut.onViewDidAppear();
+        uut.onViewDisappear();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStart();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStop();
+
+        uut.onViewDisappear();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStart();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStop();
+    }
+
     @Test
     public void onViewDidAppear_componentStartIsEmittedOnlyIfComponentIsNotAppeared() {
         uut.ensureViewIsCreated();
@@ -109,6 +127,13 @@ public class ComponentViewControllerTest extends BaseTest {
         Mockito.verify(view, Mockito.times(2)).sendComponentStart();
     }
 
+    @Test
+    public void shouldCallApplyWindowInsetsWhenViewFullyAppeared(){
+        uut.ensureViewIsCreated();
+        uut.onViewDidAppear();
+        Mockito.verify(view).requestApplyInsets();
+    }
+
     @Test
     public void isViewShownOnlyIfComponentViewIsReady() {
         Java6Assertions.assertThat(uut.isViewShown()).isFalse();

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

@@ -84,10 +84,9 @@ public class ModalStackTest extends BaseTest {
     }
 
     @Test
-    public void showModal_DidAppearEventShouldWaitForReactViewToBeShown(){
+    public void showModal_DidAppearEventShouldBeCallled(){
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.showModal(modal1, root, listener);
-        verify(modal1).addOnAppearedListener(any());
         verify(listener).onSuccess(modal1.getId());
         idleMainLooper();
         verify(modal1).onViewDidAppear();

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsViewControllerTest.java

@@ -24,6 +24,7 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.toptabs.TopTabsLayoutCreator;
 import com.reactnativenavigation.views.toptabs.TopTabsViewPager;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -123,6 +124,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     }
 
     @Test
+    @Ignore("TopTabs not yet well supported")
     public void lifecycleMethodsSentWhenSelectedTabChanges() {
         stack.ensureViewIsCreated();
         uut.ensureViewIsCreated();

package/lib/dist/Mock/Components/ComponentScreen.js

@@ -4,7 +4,7 @@ exports.ComponentScreen = void 0;
 const tslib_1 = require("tslib");
 const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
-const src_1 = require("../../src");
+const react_native_navigation_1 = require("react-native-navigation");
 const constants_1 = require("../constants");
 const LayoutStore_1 = require("../Stores/LayoutStore");
 const connect_1 = require("../connect");
@@ -43,7 +43,7 @@ exports.ComponentScreen = (0, connect_1.connect)(class extends react_1.Component
         return react_1.default.createElement(react_native_1.View, { testID: bottomTabsOptions?.testID }, buttons);
     }
     render() {
-        const Component = src_1.Navigation.mock.store.getWrappedComponent(this.props.layoutNode.data.name);
+        const Component = react_native_navigation_1.Navigation.mock.store.getWrappedComponent(this.props.layoutNode.data.name);
         if (!Component)
             throw new Error(`${this.props.layoutNode.data.name} has not been registered.`);
         return (react_1.default.createElement(react_native_1.View, { testID: this.isVisible() ? constants_1.VISIBLE_SCREEN_TEST_ID : undefined },

package/lib/dist/Mock/Components/NavigationButton.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { OptionsTopBarButton } from '../../src';
+import { OptionsTopBarButton } from 'react-native-navigation';
 interface ButtonProps {
     button: OptionsTopBarButton;
     componentId: string;

package/lib/dist/Mock/Components/NavigationButton.js

@@ -4,7 +4,7 @@ exports.NavigationButton = void 0;
 const tslib_1 = require("tslib");
 const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
-const src_1 = require("../../src");
+const react_native_navigation_1 = require("react-native-navigation");
 const EventsStore_1 = require("../Stores/EventsStore");
 const NavigationButton = class extends react_1.Component {
     ref = undefined;
@@ -23,8 +23,8 @@ const NavigationButton = class extends react_1.Component {
         //@ts-ignore
         const buttonComponentId = button.component.componentId;
         //@ts-ignore
-        const Component = src_1.Navigation.mock.store.getComponentClassForName(button.component.name)();
-        const props = src_1.Navigation.mock.store.getPropsForId(buttonComponentId);
+        const Component = react_native_navigation_1.Navigation.mock.store.getComponentClassForName(button.component.name)();
+        const props = react_native_navigation_1.Navigation.mock.store.getPropsForId(buttonComponentId);
         return (react_1.default.createElement(react_native_1.TouchableOpacity, { onPress: () => {
                 if (this.ref) {
                     // @ts-ignore

package/lib/dist/Mock/Components/TopBar.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
-import { OptionsTopBarButton } from '../../src';
-import { OptionsTopBar, OptionsTopBarBackButton } from '../../src/interfaces/Options';
+import { OptionsTopBar, OptionsTopBarBackButton, OptionsTopBarButton } from 'react-native-navigation';
 import ParentNode from '../Layouts/ParentNode';
 export interface TopBarProps {
     layoutNode: ParentNode;

package/lib/dist/Mock/Components/TopBar.js

@@ -4,7 +4,7 @@ exports.TopBar = void 0;
 const tslib_1 = require("tslib");
 const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
-const src_1 = require("../../src");
+const react_native_navigation_1 = require("react-native-navigation");
 const LayoutStore_1 = require("../Stores/LayoutStore");
 const NavigationButton_1 = require("./NavigationButton");
 const EventsStore_1 = require("../Stores/EventsStore");
@@ -54,8 +54,8 @@ const TopBar = class extends react_1.Component {
             } }));
     }
     renderComponent(id, name, testID) {
-        const Component = src_1.Navigation.mock.store.getComponentClassForName(name)();
-        const props = src_1.Navigation.mock.store.getPropsForId(id);
+        const Component = react_native_navigation_1.Navigation.mock.store.getComponentClassForName(name)();
+        const props = react_native_navigation_1.Navigation.mock.store.getPropsForId(id);
         return (react_1.default.createElement(react_native_1.View, { key: id, testID: testID },
             react_1.default.createElement(Component, { ...props, componentId: id })));
     }

package/lib/ios/RNNComponentRootView.m

@@ -2,20 +2,6 @@
 
 @implementation RNNComponentRootView
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                  eventEmitter:(RNNEventEmitter *)eventEmitter
-           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
-    self = [super initWithBridge:bridge
-                      moduleName:moduleName
-               initialProperties:initialProperties
-                    eventEmitter:eventEmitter
-             reactViewReadyBlock:reactViewReadyBlock];
-    [bridge.uiManager setAvailableSize:UIScreen.mainScreen.bounds.size forRootView:self];
-    return self;
-}
-
 - (NSString *)componentType {
     return ComponentTypeScreen;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.24.0",
+  "version": "7.24.3",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,