react-native-navigation 7.22.0 → 7.22.2

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

@@ -47,12 +47,12 @@ class RootPresenterTest : BaseTest() {
 
         root = object : SimpleViewController(activity, ChildControllersRegistry(), "child1", Options()) {
             override fun createView(): SimpleView {
-                return root1View;
+                return root1View
             }
         }
         root2 = object : SimpleViewController(activity, ChildControllersRegistry(), "child1", Options()) {
             override fun createView(): SimpleView {
-                return root2View;
+                return root2View
             }
         }
         setupWithAnimator(Mockito.spy(createAnimator()))

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/parent/ParentControllerTest.java

@@ -41,8 +41,8 @@ public class ParentControllerTest extends BaseTest {
     private static final String INITIAL_TITLE = "initial title";
     private Activity activity;
     private ChildControllersRegistry childRegistry;
-    private List<ViewController> children;
-    private ParentController uut;
+    private List<ViewController<?>> children;
+    private ParentController<?> uut;
     private Presenter presenter;
 
     @Override
@@ -54,10 +54,10 @@ public class ParentControllerTest extends BaseTest {
         Options initialOptions = new Options();
         initialOptions.topBar.title.text = new Text(INITIAL_TITLE);
         presenter = spy(new Presenter(activity, new Options()));
-        uut = spy(new ParentController(activity, childRegistry, "uut", presenter, initialOptions) {
+        uut = spy(new ParentController<ViewGroup>(activity, childRegistry, "uut", presenter, initialOptions) {
 
             @Override
-            public ViewController getCurrentChild() {
+            public ViewController<?> getCurrentChild() {
                 return children.get(0);
             }
 
@@ -65,7 +65,7 @@ public class ParentControllerTest extends BaseTest {
             @Override
             public ViewGroup createView() {
                 FrameLayout layout = new FrameLayout(activity);
-                for (ViewController child : children) {
+                for (ViewController<?> child : children) {
                     child.setParentController(this);
                     layout.addView(child.getView());
                 }
@@ -79,7 +79,7 @@ public class ParentControllerTest extends BaseTest {
 
             @NonNull
             @Override
-            public Collection<ViewController> getChildControllers() {
+            public Collection<ViewController<?>> getChildControllers() {
                 return children;
             }
         });
@@ -89,10 +89,10 @@ public class ParentControllerTest extends BaseTest {
     public void onConfigurationChange_shouldCallConfigurationChangeForPresenterAndChildren() {
         children.add(spy(new SimpleViewController(activity, childRegistry, "child1", new Options())));
         children.add(spy(new SimpleViewController(activity, childRegistry, "child2", new Options())));
-        ParentController spyUUT = spy(uut);
+        ParentController<?> spyUUT = spy(uut);
         spyUUT.onConfigurationChanged(mockConfiguration);
         verify(presenter).onConfigurationChanged(any(),any());
-        for (ViewController controller : children) {
+        for (ViewController<?> controller : children) {
             verify(controller).onConfigurationChanged(any());
         }
     }
@@ -158,7 +158,7 @@ public class ParentControllerTest extends BaseTest {
 
     @Test
     public void destroy_DestroysChildren() {
-        ViewController child1 = spy(new SimpleViewController(activity, childRegistry, "child1", new Options()));
+        ViewController<?> child1 = spy(new SimpleViewController(activity, childRegistry, "child1", new Options()));
         children.add(child1);
 
         verify(child1, times(0)).destroy();
@@ -181,7 +181,7 @@ public class ParentControllerTest extends BaseTest {
     public void mergeOptions_optionsAreMergedWhenChildAppears() {
         Options options = new Options();
         options.topBar.title.text = new Text("new title");
-        ViewController child1 = spy(new SimpleViewController(activity, childRegistry, "child1", options));
+        ViewController<?> child1 = spy(new SimpleViewController(activity, childRegistry, "child1", options));
         children.add(child1);
         uut.ensureViewIsCreated();
 
@@ -197,7 +197,7 @@ public class ParentControllerTest extends BaseTest {
     public void mergeOptions_initialParentOptionsAreNotMutatedWhenChildAppears() {
         Options options = new Options();
         options.topBar.title.text = new Text("new title");
-        ViewController child1 = spy(new SimpleViewController(activity, childRegistry, "child1", options));
+        ViewController<?> child1 = spy(new SimpleViewController(activity, childRegistry, "child1", options));
         children.add(child1);
 
         uut.ensureViewIsCreated();
@@ -243,7 +243,7 @@ public class ParentControllerTest extends BaseTest {
 
         Options defaultOptions = new Options();
         Options currentOptions = spy(new Options());
-        ParentController spy = spy(uut);
+        ParentController<?> spy = spy(uut);
         Mockito.when(spy.resolveCurrentOptions()).thenReturn(currentOptions);
         spy.resolveCurrentOptions(defaultOptions);
         verify(currentOptions).withDefaultOptions(defaultOptions);
@@ -263,7 +263,7 @@ public class ParentControllerTest extends BaseTest {
 
     @Test
     public void getTopInsetForChild() {
-        ParentController parent = Mockito.mock(ParentController.class);
+        ParentController<?> parent = Mockito.mock(ParentController.class);
         when(parent.getTopInset(any())).thenReturn(123);
         uut.setParentController(parent);
 
@@ -279,14 +279,14 @@ public class ParentControllerTest extends BaseTest {
 
     @Test
     public void getBottomInsetForChild() {
-        ParentController parent = Mockito.mock(ParentController.class);
+        ParentController<?> parent = Mockito.mock(ParentController.class);
         when(parent.getBottomInset(any())).thenReturn(123);
         uut.setParentController(parent);
 
         assertThat(uut.getBottomInset(Mockito.mock(ViewController.class))).isEqualTo(123);
     }
 
-    private List<ViewController> createChildren() {
+    private List<ViewController<?>> createChildren() {
         return Arrays.asList(
                 spy(new SimpleViewController(activity, childRegistry, "child1", new Options())),
                 spy(new SimpleViewController(activity, childRegistry, "child2", new Options()))

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java

@@ -46,11 +46,11 @@ public class SideMenuControllerTest extends BaseTest {
     private Activity activity;
     private ChildControllersRegistry childRegistry;
     private SideMenuPresenter presenter;
-    private ViewController left;
-    private ViewController right;
-    private ViewController center;
-    private ViewController child;
-    private ParentController parent;
+    private ViewController<?> left;
+    private ViewController<?> right;
+    private ViewController<?> center;
+    private ViewController<?> child;
+    private ParentController<?> parent;
     private Options resolvedOptions;
 
     @Override
@@ -118,12 +118,12 @@ public class SideMenuControllerTest extends BaseTest {
 
     @Test
     public void onViewAppeared() {
-        ViewController left = spy(this.left);
+        ViewController<?> left = spy(this.left);
         ViewGroup leftView = spy(left.getView());
         when(left.findController(leftView)).thenReturn(left);
         Mockito.doReturn(leftView).when(left).getView();
 
-        ViewController right = spy(this.right);
+        ViewController<?> right = spy(this.right);
         ViewGroup rightView = spy(right.getView());
         when(right.findController(rightView)).thenReturn(right);
         Mockito.doReturn(rightView).when(right).getView();
@@ -373,7 +373,7 @@ public class SideMenuControllerTest extends BaseTest {
         forEach(uut.getChildControllers(), c -> verify(c).applyTopInset());
     }
 
-    private void openDrawerAndAssertVisibility(ViewController side, Functions.FuncR1<ViewController, SideMenuOptions> opt) {
+    private void openDrawerAndAssertVisibility(ViewController<?> side, Functions.FuncR1<ViewController<?>, SideMenuOptions> opt) {
         Options options = new Options();
         (side == left ? options.sideMenuRootOptions.left : options.sideMenuRootOptions.right).visible = new Bool(true);
         uut.mergeOptions(options);
@@ -381,7 +381,7 @@ public class SideMenuControllerTest extends BaseTest {
         assertThat(opt.run(side).visible.isFalseOrUndefined()).isTrue();
     }
 
-    private void closeDrawerAndAssertVisibility(ViewController side, Functions.FuncR1<ViewController, SideMenuOptions> opt) {
+    private void closeDrawerAndAssertVisibility(ViewController<?> side, Functions.FuncR1<ViewController<?>, SideMenuOptions> opt) {
         Options options = new Options();
         (side == left ? options.sideMenuRootOptions.left : options.sideMenuRootOptions.right).visible = new Bool(false);
         uut.mergeOptions(options);
@@ -389,7 +389,7 @@ public class SideMenuControllerTest extends BaseTest {
         assertThat(opt.run(side).visible.isTrue()).isFalse();
     }
 
-    private int getGravity(ViewController side) {
+    private int getGravity(ViewController<?> side) {
         return side == left ? Gravity.LEFT : Gravity.RIGHT;
     }
 
@@ -433,7 +433,7 @@ public class SideMenuControllerTest extends BaseTest {
         return activity;
     }
 
-    private void setLeftRight(ViewController left, ViewController right) {
+    private void setLeftRight(ViewController<?> left, ViewController<?> right) {
         uut.setLeftController(left);
         uut.setRightController(right);
         left.setParentController(uut);

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

@@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify;
 public class BackButtonHelperTest extends BaseTest {
     private BackButtonHelper uut;
     private StackController stack;
-    private ChildController child1;
-    private ChildController child2;
+    private ChildController<?> child1;
+    private ChildController<?> child2;
 
     @Override
     public void beforeEach() {

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

@@ -3,9 +3,6 @@ package com.reactnativenavigation.viewcontrollers.stack
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.app.Activity
-import android.os.Looper
-import android.view.View
-import android.view.ViewGroup
 import android.widget.FrameLayout
 import com.nhaarman.mockitokotlin2.*
 import com.reactnativenavigation.BaseTest
@@ -19,7 +16,6 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController
 import com.reactnativenavigation.views.element.TransitionAnimatorCreator
 import org.assertj.core.api.Java6Assertions.assertThat
 import org.junit.Test
-import org.robolectric.Shadows
 
 class StackAnimatorTest : BaseTest() {
     private lateinit var uut: StackAnimator

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

@@ -73,7 +73,7 @@ class StackControllerTest : BaseTest() {
                 TypefaceLoaderMock(),
                 RenderChecker(),
                 Options()
-            )
+        )
         )
         createChildren()
         uut = createStack()
@@ -182,7 +182,7 @@ class StackControllerTest : BaseTest() {
         child2.options.topBar.buttons.left = ArrayList(setOf(TitleBarHelper.iconButton("someButton", "icon.png")))
         uut.push(child2, CommandListenerAdapter())
         ShadowLooper.idleMainLooper()
-        assertThat(topBarController.leftButtonCount).isOne();
+        assertThat(topBarController.leftButtonCount).isOne()
         verify(topBarController.view, never()).setBackButton(any())
     }
 
@@ -562,7 +562,7 @@ class StackControllerTest : BaseTest() {
         val captor = argumentCaptor<Options>()
         verify(animator).pop(any(), any(), captor.capture(), any(), any())
         val animator = captor.firstValue.animations.pop.content.exit
-            .getAnimation(mockView(activity))
+                .getAnimation(mockView(activity))
         assertThat((animator as AnimatorSet).childAnimations.first().duration).isEqualTo(123)
     }
 
@@ -579,7 +579,7 @@ class StackControllerTest : BaseTest() {
         val captor = argumentCaptor<Options>()
         verify(animator).pop(any(), any(), captor.capture(), any(), any())
         val animator = captor.firstValue.animations.pop.content.exit
-            .getAnimation(mockView(activity))
+                .getAnimation(mockView(activity))
         assertThat((animator as AnimatorSet).childAnimations.first().duration).isEqualTo(123)
     }
 
@@ -980,8 +980,8 @@ class StackControllerTest : BaseTest() {
     @Test
     fun mergeChildOptions_updatesParentControllerWithNewOptions() {
         val uut = TestUtils.newStackController(activity)
-            .setId("stack")
-            .build()
+                .setId("stack")
+                .build()
         val parentController = mock<ParentController<*>>()
         uut.parentController = parentController
         uut.ensureViewIsCreated()
@@ -1119,7 +1119,7 @@ class StackControllerTest : BaseTest() {
     private fun assertContainsOnlyId(vararg ids: String) {
         assertThat(uut.size()).isEqualTo(ids.size)
         assertThat(uut.childControllers).extracting(Extractor { obj: ViewController<*> -> obj.id } as Extractor<ViewController<*>, String>)
-            .containsOnly(*ids)
+                .containsOnly(*ids)
     }
 
     private fun createStack(): StackController {
@@ -1137,14 +1137,14 @@ class StackControllerTest : BaseTest() {
     private fun createStackBuilder(id: String, children: List<ViewController<*>>): StackControllerBuilder {
         createTopBarController()
         return TestUtils.newStackController(activity)
-            .setEventEmitter(eventEmitter)
-            .setChildren(children)
-            .setId(id)
-            .setTopBarController(topBarController)
-            .setChildRegistry(childRegistry)
-            .setAnimator(animator)
-            .setStackPresenter(presenter)
-            .setBackButtonHelper(backButtonHelper)
+                .setEventEmitter(eventEmitter)
+                .setChildren(children)
+                .setId(id)
+                .setTopBarController(topBarController)
+                .setChildRegistry(childRegistry)
+                .setAnimator(animator)
+                .setStackPresenter(presenter)
+                .setBackButtonHelper(backButtonHelper)
     }
 
     private fun createTopBarController() {

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

@@ -76,21 +76,21 @@ class StackPresenterTest : BaseTest() {
         iconResolver = IconResolverFake(activity)
         buttonCreator = TitleBarButtonCreatorMock()
         ogUut = StackPresenter(
-            activity,
-            titleViewCreator,
-            TopBarBackgroundViewCreatorMock(),
-            buttonCreator,
-            iconResolver,
-            typefaceLoader,
-            renderChecker,
-            Options()
+                activity,
+                titleViewCreator,
+                TopBarBackgroundViewCreatorMock(),
+                buttonCreator,
+                iconResolver,
+                typefaceLoader,
+                renderChecker,
+                Options()
         )
         uut = spy(ogUut)
         createTopBarController()
         parent = TestUtils.newStackController(activity)
-            .setTopBarController(topBarController)
-            .setStackPresenter(uut)
-            .build()
+                .setTopBarController(topBarController)
+                .setStackPresenter(uut)
+                .build()
         childRegistry = ChildControllersRegistry()
         child = spy(SimpleViewController(activity, childRegistry, "child1", Options.EMPTY))
         otherChild = spy(SimpleViewController(activity, childRegistry, "child1", Options.EMPTY))
@@ -768,9 +768,9 @@ class StackPresenterTest : BaseTest() {
         uut.setComponentsButtonController(child.view, rightController, leftController)
         uut.mergeChildOptions(mergeOptions, initialOptions, parent, child)
 
-        verify(rightController, never()).applyColor(any(), any());
-        verify(leftController, never()).applyColor(any(), any());
-        verify(leftController, never()).applyDisabledColor(any(), any());
+        verify(rightController, never()).applyColor(any(), any())
+        verify(leftController, never()).applyColor(any(), any())
+        verify(leftController, never()).applyDisabledColor(any(), any())
         verify(leftController, never()).applyDisabledColor(any(), any())
 
     }
@@ -837,7 +837,7 @@ class StackPresenterTest : BaseTest() {
         val rightCaptor = argumentCaptor<List<ButtonController>>()
         val leftCaptor = argumentCaptor<List<ButtonController>>()
         verify(topBarController).applyRightButtons(rightCaptor.capture())
-        verify(topBarController).applyLeftButtons(leftCaptor.capture());
+        verify(topBarController).applyLeftButtons(leftCaptor.capture())
         assertThat(rightCaptor.firstValue.size).isOne()
         assertThat(leftCaptor.firstValue.size).isOne()
     }
@@ -897,8 +897,8 @@ class StackPresenterTest : BaseTest() {
         val options = Options().apply {
             topBar.buttons.right = ArrayList(listOf(componentBtn1))
             topBar.buttons.left = ArrayList(listOf(componentBtn2))
-            topBar.animateLeftButtons = Bool(false);
-            topBar.animateRightButtons = Bool(true);
+            topBar.animateLeftButtons = Bool(false)
+            topBar.animateRightButtons = Bool(true)
         }
 
         uut.applyChildOptions(options, parent, child)

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

@@ -107,10 +107,10 @@ class TopBarControllerTest : BaseTest() {
     fun setLeftButtons_emptyButtonsListClearsLeftButton() {
         uut.applyLeftButtons(leftButton(leftButton))
         uut.applyRightButtons(rightButtons(componentButton)!!)
-        assertThat(uut.leftButtonCount).isNotZero();
+        assertThat(uut.leftButtonCount).isNotZero()
         uut.applyLeftButtons(emptyList())
         uut.applyRightButtons(rightButtons(textButton1)!!)
-        assertThat(uut.leftButtonCount).isZero();
+        assertThat(uut.leftButtonCount).isZero()
     }
 
     @Test
@@ -142,7 +142,7 @@ class TopBarControllerTest : BaseTest() {
         uut.view.setBackButton(TitleBarHelper.createButtonController(activity, backButton))
         assertThat(uut.view.navigationIcon).isNotNull()
         val initialButtons = leftButton(leftButton)
-        uut.applyLeftButtons(initialButtons!!)
+        uut.applyLeftButtons(initialButtons)
         uut.mergeLeftButtons(initialButtons, emptyList())
         assertThat(uut.view.navigationIcon).isNull()
     }

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

@@ -44,7 +44,7 @@ public class TopTabsViewControllerTest extends BaseTest {
 
     private StackController stack;
     private TopTabsController uut;
-    private List<ViewController> tabControllers = new ArrayList<>(SIZE);
+    private List<ViewController<?>> tabControllers = new ArrayList<>(SIZE);
     private final Options options = new Options();
     private TopTabsViewPager topTabsLayout;
     private Activity activity;
@@ -73,7 +73,7 @@ public class TopTabsViewControllerTest extends BaseTest {
 
     @NonNull
     private ArrayList<Options> createOptions() {
-        ArrayList result = new ArrayList();
+        ArrayList<Options> result = new ArrayList<>();
         for (int i = 0; i < SIZE; i++) {
             final Options options = new Options();
             options.topTabOptions.title = new Text("Tab " + i);
@@ -83,8 +83,8 @@ public class TopTabsViewControllerTest extends BaseTest {
         return result;
     }
 
-    private List<ViewController> createTabsControllers(Activity activity, List<Options> tabOptions) {
-        List<ViewController> tabControllers = new ArrayList<>(SIZE);
+    private List<ViewController<?>> createTabsControllers(Activity activity, List<Options> tabOptions) {
+        List<ViewController<?>> tabControllers = new ArrayList<>(SIZE);
         for (int i = 0; i < SIZE; i++) {
             ComponentViewController viewController = new ComponentViewController(
                     activity,
@@ -117,7 +117,7 @@ public class TopTabsViewControllerTest extends BaseTest {
             verify(tab(topTabs, i), times(0)).destroy();
         }
         uut.destroy();
-        for (ViewController tabController : tabControllers) {
+        for (ViewController<?> tabController : tabControllers) {
             verify(tabController, times(1)).destroy();
         }
     }
@@ -162,7 +162,7 @@ public class TopTabsViewControllerTest extends BaseTest {
         verify(tabControllers.get(0), times(1)).onViewWillAppear();
         verify(tabControllers.get(1), times(0)).onViewWillAppear();
 
-        ViewController comp = tabControllers.get(0);
+        ViewController<?> comp = tabControllers.get(0);
         verify(uut, times(1)).applyChildOptions(any(Options.class), eq(comp));
     }
 
@@ -174,7 +174,7 @@ public class TopTabsViewControllerTest extends BaseTest {
         tabControllers.get(1).ensureViewIsCreated();
 
         uut.onViewWillAppear();
-        ViewController currentTab = tab(0);
+        ViewController<?> currentTab = tab(0);
         verify(uut, times(1)).applyChildOptions(any(Options.class), eq(currentTab));
         assertThat(uut.options.topBar.title.text.get()).isEqualTo(createTabTopBarTitle(0));
 
@@ -208,7 +208,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     public void applyOptions_tabsAreRemovedAfterViewDisappears() {
         StackController stackController = TestUtils.newStackController(activity).build();
         stackController.ensureViewIsCreated();
-        ViewController first = new SimpleViewController(activity, childRegistry, "first", Options.EMPTY);
+        ViewController<?> first = new SimpleViewController(activity, childRegistry, "first", Options.EMPTY);
         disablePushAnimation(first, uut);
         stackController.push(first, new CommandListenerAdapter());
         stackController.push(uut, new CommandListenerAdapter());
@@ -241,7 +241,7 @@ public class TopTabsViewControllerTest extends BaseTest {
         return "Title " + i;
     }
 
-    private ViewController tab(int index) {
+    private ViewController<?> tab(int index) {
         return tabControllers.get(index);
     }
 }

package/lib/dist/components/Modal.js

@@ -4,7 +4,6 @@ exports.Modal = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const react_native_1 = require("react-native");
-const react_native_ui_lib_1 = require("react-native-ui-lib");
 const RNNModalViewManager = react_native_1.requireNativeComponent('RNNModalViewManager');
 class Modal extends react_1.default.Component {
     constructor(props) {
@@ -14,7 +13,7 @@ class Modal extends react_1.default.Component {
         const processed = this.proccessProps();
         if (this.props.visible) {
             return (react_1.default.createElement(RNNModalViewManager, Object.assign({}, processed),
-                react_1.default.createElement(react_native_ui_lib_1.View, { style: styles.container, collapsable: false }, this.props.children)));
+                react_1.default.createElement(react_native_1.View, { style: styles.container, collapsable: false }, this.props.children)));
         }
         else {
             return null;

package/lib/src/components/Modal.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
-import { requireNativeComponent, ViewProps, StyleSheet, Dimensions } from 'react-native';
+import { requireNativeComponent, View, ViewProps, StyleSheet, Dimensions } from 'react-native';
 import { AnimationOptions, ViewAnimationOptions } from 'react-native-navigation/interfaces/Options';
-import { View } from 'react-native-ui-lib';
 export interface RNNModalProps extends ViewProps {
   visible: boolean;
   transparent: boolean;

package/package.json

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