react-native-navigation 7.23.1 → 7.24.0

package/lib/dist/{components → src/components}/Store.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Store = void 0;
 class Store {
-    constructor() {
-        this.componentsByName = {};
-        this.propsById = {};
-        this.componentsInstancesById = {};
-        this.wrappedComponents = {};
-    }
+    componentsByName = {};
+    propsById = {};
+    pendingPropsById = {};
+    componentsInstancesById = {};
+    wrappedComponents = {};
+    lazyRegistratorFn;
     updateProps(componentId, props, callback) {
         this.mergeNewPropsForId(componentId, props);
         const component = this.componentsInstancesById[componentId];
@@ -15,7 +15,14 @@ class Store {
             component.setProps(props, callback);
         }
     }
+    setPendingProps(componentId, newProps) {
+        this.pendingPropsById[componentId] = newProps;
+    }
     getPropsForId(componentId) {
+        if (this.pendingPropsById[componentId]) {
+            this.propsById[componentId] = this.pendingPropsById[componentId];
+            delete this.pendingPropsById[componentId];
+        }
         return this.propsById[componentId] || {};
     }
     mergeNewPropsForId(componentId, newProps) {

package/lib/dist/{events → src/events}/CommandsObserver.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandsObserver = void 0;
 class CommandsObserver {
+    uniqueIdProvider;
+    listeners = {};
     constructor(uniqueIdProvider) {
         this.uniqueIdProvider = uniqueIdProvider;
-        this.listeners = {};
     }
     register(listener) {
         const id = this.uniqueIdProvider.generate();

package/lib/dist/{events → src/events}/ComponentEventsObserver.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import type { Component } from 'react';
 import { EventSubscription } from '../interfaces/EventSubscription';
 import { NavigationComponentListener } from '../interfaces/NavigationComponentListener';
 import { ComponentWillAppearEvent, ComponentDidAppearEvent, ComponentDidDisappearEvent, NavigationButtonPressedEvent, SearchBarUpdatedEvent, SearchBarCancelPressedEvent, PreviewCompletedEvent, ScreenPoppedEvent } from '../interfaces/ComponentEvents';
@@ -11,7 +11,9 @@ export declare class ComponentEventsObserver {
     private alreadyRegistered;
     constructor(nativeEventsReceiver: NativeEventsReceiver, store: Store);
     registerOnceForAllComponentEvents(): void;
-    bindComponent(component: React.Component<any>, componentId?: string): EventSubscription;
+    bindComponent(component: Component<{
+        componentId?: string;
+    }>, componentId?: string): EventSubscription;
     registerComponentListener(listener: NavigationComponentListener, componentId: string): EventSubscription;
     unmounted(componentId: string): void;
     notifyComponentWillAppear(event: ComponentWillAppearEvent): void;

package/lib/dist/{events → src/events}/ComponentEventsObserver.js

@@ -2,17 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentEventsObserver = void 0;
 const tslib_1 = require("tslib");
-const isString_1 = tslib_1.__importDefault(require("lodash/isString"));
-const isNil_1 = tslib_1.__importDefault(require("lodash/isNil"));
-const uniqueId_1 = tslib_1.__importDefault(require("lodash/uniqueId"));
-const unset_1 = tslib_1.__importDefault(require("lodash/unset"));
-const forEach_1 = tslib_1.__importDefault(require("lodash/forEach"));
+const isString_1 = (0, tslib_1.__importDefault)(require("lodash/isString"));
+const isNil_1 = (0, tslib_1.__importDefault)(require("lodash/isNil"));
+const uniqueId_1 = (0, tslib_1.__importDefault)(require("lodash/uniqueId"));
+const unset_1 = (0, tslib_1.__importDefault)(require("lodash/unset"));
+const forEach_1 = (0, tslib_1.__importDefault)(require("lodash/forEach"));
 class ComponentEventsObserver {
+    nativeEventsReceiver;
+    store;
+    listeners = {};
+    alreadyRegistered = false;
     constructor(nativeEventsReceiver, store) {
         this.nativeEventsReceiver = nativeEventsReceiver;
         this.store = store;
-        this.listeners = {};
-        this.alreadyRegistered = false;
         this.notifyComponentWillAppear = this.notifyComponentWillAppear.bind(this);
         this.notifyComponentDidAppear = this.notifyComponentDidAppear.bind(this);
         this.notifyComponentDidDisappear = this.notifyComponentDidDisappear.bind(this);
@@ -38,24 +40,24 @@ class ComponentEventsObserver {
     }
     bindComponent(component, componentId) {
         const computedComponentId = componentId || component.props.componentId;
-        if (!isString_1.default(computedComponentId)) {
+        if (!(0, isString_1.default)(computedComponentId)) {
             throw new Error(`bindComponent expects a component with a componentId in props or a componentId as the second argument`);
         }
         return this.registerComponentListener(component, computedComponentId);
     }
     registerComponentListener(listener, componentId) {
-        if (!isString_1.default(componentId)) {
+        if (!(0, isString_1.default)(componentId)) {
             throw new Error(`registerComponentListener expects a componentId as the second argument`);
         }
-        if (isNil_1.default(this.listeners[componentId])) {
+        if ((0, isNil_1.default)(this.listeners[componentId])) {
             this.listeners[componentId] = {};
         }
-        const key = uniqueId_1.default();
+        const key = (0, uniqueId_1.default)();
         this.listeners[componentId][key] = listener;
-        return { remove: () => unset_1.default(this.listeners[componentId], key) };
+        return { remove: () => (0, unset_1.default)(this.listeners[componentId], key) };
     }
     unmounted(componentId) {
-        unset_1.default(this.listeners, componentId);
+        (0, unset_1.default)(this.listeners, componentId);
     }
     notifyComponentWillAppear(event) {
         event.passProps = this.store.getPropsForId(event.componentId);
@@ -84,7 +86,7 @@ class ComponentEventsObserver {
         this.triggerOnAllListenersByComponentId(event, 'screenPopped');
     }
     triggerOnAllListenersByComponentId(event, method) {
-        forEach_1.default(this.listeners[event.componentId], (component) => {
+        (0, forEach_1.default)(this.listeners[event.componentId], (component) => {
             if (component && component[method]) {
                 component[method](event);
             }

package/lib/dist/{events → src/events}/EventsRegistry.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import type { Component } from 'react';
 import { EmitterSubscription } from 'react-native';
 import { NativeEventsReceiver } from '../adapters/NativeEventsReceiver';
 import { CommandsObserver } from './CommandsObserver';
@@ -27,7 +27,7 @@ export declare class EventsRegistry {
     registerSearchBarCancelPressedListener(callback: (event: SearchBarCancelPressedEvent) => void): EmitterSubscription;
     registerPreviewCompletedListener(callback: (event: PreviewCompletedEvent) => void): EmitterSubscription;
     registerCommandListener(callback: (name: string, params: any) => void): EventSubscription;
-    bindComponent(component: React.Component<any>, componentId?: string): EventSubscription;
+    bindComponent(component: Component<any>, componentId?: string): EventSubscription;
     registerComponentListener(listener: NavigationComponentListener, componentId: string): EventSubscription;
     registerScreenPoppedListener(callback: (event: ScreenPoppedEvent) => void): EmitterSubscription;
 }

package/lib/dist/{events → src/events}/EventsRegistry.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventsRegistry = void 0;
 class EventsRegistry {
+    nativeEventsReceiver;
+    commandsObserver;
+    componentEventsObserver;
     constructor(nativeEventsReceiver, commandsObserver, componentEventsObserver) {
         this.nativeEventsReceiver = nativeEventsReceiver;
         this.commandsObserver = commandsObserver;

package/lib/dist/src/index.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Navigation = void 0;
+const tslib_1 = require("tslib");
+const NavigationDelegate_1 = require("./NavigationDelegate");
+const navigationDelegate = new NavigationDelegate_1.NavigationDelegate();
+exports.Navigation = navigationDelegate;
+(0, tslib_1.__exportStar)(require("./components/Modal"), exports);
+(0, tslib_1.__exportStar)(require("./events/EventsRegistry"), exports);
+(0, tslib_1.__exportStar)(require("./adapters/Constants"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/ComponentEvents"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/Events"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/EventSubscription"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/Layout"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/Options"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/NavigationComponent"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/NavigationComponentProps"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/NavigationComponentListener"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/NavigationFunctionComponent"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/CommandName"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/Processors"), exports);
+(0, tslib_1.__exportStar)(require("./interfaces/ProcessorSubscription"), exports);

package/lib/dist/{interfaces → src/interfaces}/NavigationComponent.js

@@ -2,8 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NavigationComponent = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
+const react_1 = (0, tslib_1.__importDefault)(require("react"));
 class NavigationComponent extends react_1.default.Component {
+    /**
+     * Options used to apply a style configuration when the screen appears.
+     *
+     * This field can either contain the concrete options to be applied, or a generator function
+     * which accepts props and returns an Options object.
+     */
+    static options;
     componentWillAppear(_event) { }
     componentDidAppear(_event) { }
     componentDidDisappear(_event) { }

package/lib/dist/{interfaces → src/interfaces}/Options.d.ts

@@ -360,6 +360,10 @@ export interface HardwareBackButtonOptions {
      * @default true
      */
     popStackOnPress?: boolean;
+    /**
+     * Controls hardware back button bottom tab selection behaviour
+     */
+    bottomTabsOnPress?: 'exit' | 'first' | 'previous';
 }
 export interface OptionsTopBarScrollEdgeAppearanceBackground {
     /**
@@ -430,6 +434,11 @@ export interface OptionsTopBarButton {
      * Set the button icon
      */
     icon?: ImageResource;
+    /**
+     * Set the SF symbol as icon (will be used primarily)
+     * #### (iOS 13+ specific)
+     */
+    sfSymbol?: string;
     /**
      * Set the button icon insets
      */

package/lib/dist/{processors → src/processors}/LayoutProcessor.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutProcessor = void 0;
 class LayoutProcessor {
+    layoutProcessorsStore;
     constructor(layoutProcessorsStore) {
         this.layoutProcessorsStore = layoutProcessorsStore;
     }

package/lib/dist/{processors → src/processors}/LayoutProcessorsStore.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutProcessorsStore = void 0;
 class LayoutProcessorsStore {
-    constructor() {
-        this.layoutProcessors = [];
-    }
+    layoutProcessors = [];
     addProcessor(processor) {
         this.layoutProcessors.push(processor);
         return { remove: () => this.removeProcessor(processor) };

package/lib/dist/{processors → src/processors}/OptionProcessorsStore.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OptionProcessorsStore = void 0;
 class OptionProcessorsStore {
-    constructor() {
-        this.optionsProcessorsByObjectPath = {};
-    }
+    optionsProcessorsByObjectPath = {};
     addProcessor(optionPath, processor) {
         if (!this.optionsProcessorsByObjectPath[optionPath])
             this.optionsProcessorsByObjectPath[optionPath] = [];

package/lib/ios/AnimationObserver.h

@@ -0,0 +1,17 @@
+#import <Foundation/Foundation.h>
+
+typedef void (^RNNAnimationEndedBlock)(void);
+
+@interface AnimationObserver : NSObject
+
++ (AnimationObserver *)sharedObserver;
+
+@property(nonatomic) BOOL isAnimating;
+
+- (void)registerAnimationEndedBlock:(RNNAnimationEndedBlock)block;
+
+- (void)beginAnimation;
+
+- (void)endAnimation;
+
+@end

package/lib/ios/AnimationObserver.m

@@ -0,0 +1,41 @@
+#import "AnimationObserver.h"
+
+@implementation AnimationObserver {
+    NSMutableArray<RNNAnimationEndedBlock> *_animationEndedBlocks;
+}
+
+- (instancetype)init {
+    self = [super init];
+    _animationEndedBlocks = [NSMutableArray array];
+    return self;
+}
+
++ (AnimationObserver *)sharedObserver {
+    static AnimationObserver *_sharedObserver = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+      _sharedObserver = [[AnimationObserver alloc] init];
+    });
+
+    return _sharedObserver;
+}
+
+- (void)registerAnimationEndedBlock:(RNNAnimationEndedBlock)block {
+    [_animationEndedBlocks addObject:block];
+}
+
+- (void)beginAnimation {
+    _isAnimating = YES;
+}
+
+- (void)endAnimation {
+    _isAnimating = NO;
+
+    for (RNNAnimationEndedBlock block in _animationEndedBlocks) {
+        block();
+    }
+
+    [_animationEndedBlocks removeAllObjects];
+}
+
+@end

package/lib/ios/BottomTabPresenter.h

@@ -7,9 +7,6 @@
 
 - (void)applyOptions:(RNNNavigationOptions *)options child:(UIViewController *)child;
 
-- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options
-                                               child:(UIViewController *)child;
-
 - (void)createTabBarItem:(UIViewController *)child
         bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions;
 

package/lib/ios/BottomTabPresenter.m

@@ -17,14 +17,6 @@
 - (void)applyOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
     RNNNavigationOptions *withDefault = [options withDefault:self.defaultOptions];
 
-    [child setTabBarItemBadge:[withDefault.bottomTab.badge withDefault:[NSNull null]]];
-    [child setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor withDefault:nil]];
-}
-
-- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options
-                                               child:(UIViewController *)child {
-    RNNNavigationOptions *withDefault = [options withDefault:self.defaultOptions];
-
     [self createTabBarItem:child bottomTabOptions:withDefault.bottomTab];
     [child setTabBarItemBadge:[withDefault.bottomTab.badge withDefault:[NSNull null]]];
     [child setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor withDefault:nil]];

package/lib/ios/RNNAssert.h

@@ -12,8 +12,8 @@ extern BOOL RNNIsMainQueue(void);
         if ((condition) == 0) {                                                                    \
             if (RNN_NSASSERT) {                                                                    \
                 [[NSAssertionHandler currentHandler]                                               \
-                    handleFailureInFunction:(NSString * _Nonnull) @(__func__)                      \
-                                       file:(NSString * _Nonnull) @(__FILE__)                      \
+                    handleFailureInFunction:(NSString *_Nonnull)@(__func__)                        \
+                                       file:(NSString *_Nonnull)@(__FILE__)                        \
                                  lineNumber:__LINE__                                               \
                                 description:__VA_ARGS__];                                          \
             }                                                                                      \

package/lib/ios/RNNBasePresenter.h

@@ -24,8 +24,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (void)applyOptions:(RNNNavigationOptions *)options;
 
-- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options;
-
 - (void)mergeOptions:(RNNNavigationOptions *)options
      resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
 
@@ -42,8 +40,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (UINavigationItem *)currentNavigationItem;
 
-- (void)willMoveToParentViewController:(UIViewController *)parent;
-
 - (UIStatusBarStyle)getStatusBarStyle;
 
 - (UIInterfaceOrientationMask)getOrientation;

package/lib/ios/RNNBasePresenter.m

@@ -40,15 +40,6 @@
 - (void)componentDidDisappear {
 }
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    if (parent) {
-        RNNNavigationOptions *resolvedOptions = [self.boundViewController resolveOptions];
-        [self applyOptionsOnWillMoveToParentViewController:resolvedOptions];
-        [self.boundViewController onChildAddToParent:self.boundViewController
-                                             options:resolvedOptions];
-    }
-}
-
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions {
     UIViewController *viewController = self.boundViewController;
     RNNNavigationOptions *withDefault = [initialOptions withDefault:[self defaultOptions]];
@@ -66,9 +57,6 @@
 - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
 }
 
-- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
-}
-
 - (void)applyOptions:(RNNNavigationOptions *)options {
 }
 

package/lib/ios/RNNBottomTabOptions.m

@@ -84,7 +84,8 @@
            self.testID.hasValue || self.icon.hasValue || self.selectedIcon.hasValue ||
            self.iconColor.hasValue || self.selectedIconColor.hasValue ||
            self.selectedTextColor.hasValue || self.iconInsets.hasValue || self.textColor.hasValue ||
-           self.visible.hasValue || self.selectTabOnPress.hasValue || self.sfSymbol.hasValue || self.sfSelectedSymbol.hasValue;
+           self.visible.hasValue || self.selectTabOnPress.hasValue || self.sfSymbol.hasValue ||
+           self.sfSelectedSymbol.hasValue;
 }
 
 @end

package/lib/ios/RNNBottomTabsController.m

@@ -46,6 +46,8 @@
     }
 #endif
 
+    [self createTabBarItems:childViewControllers];
+
     self.longPressRecognizer =
         [[UILongPressGestureRecognizer alloc] initWithTarget:self
                                                       action:@selector(handleLongPressGesture:)];
@@ -54,16 +56,18 @@
     return self;
 }
 
+- (void)createTabBarItems:(NSArray<UIViewController *> *)childViewControllers {
+    for (UIViewController *child in childViewControllers) {
+        [_bottomTabPresenter applyOptions:child.resolveOptions child:child];
+    }
+}
+
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     _viewWillAppearOnce = YES;
     [self loadChildren:self.pendingChildViewControllers];
 }
 
-- (void)onChildAddToParent:(UIViewController *)child options:(RNNNavigationOptions *)options {
-    [_bottomTabPresenter applyOptionsOnWillMoveToParentViewController:options child:child];
-}
-
 - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
     [super mergeChildOptions:options child:child];
     UIViewController *childViewController = [self findViewController:child];
@@ -189,10 +193,6 @@
 
 #pragma mark - UIViewController overrides
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    [self.presenter willMoveToParentViewController:parent];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return [self.presenter getStatusBarStyle];
 }

package/lib/ios/RNNBridgeManager.mm

@@ -113,7 +113,6 @@
 - (void)onBridgeWillReload {
     dispatch_async(dispatch_get_main_queue(), ^{
       [self->_overlayManager dismissAllOverlays];
-      [self->_modalManager dismissAllModalsSynchronosly];
       [self->_componentRegistry clear];
       UIApplication.sharedApplication.delegate.window.rootViewController = nil;
     });

package/lib/ios/RNNButtonBuilder.m

@@ -31,6 +31,8 @@
         return [[RNNUIBarButtonItem alloc] initCustomIcon:button
                                               iconCreator:_iconCreator
                                                   onPress:onPress];
+    } else if (button.sfSymbol.hasValue) {
+        return [[RNNUIBarButtonItem alloc] initWithSFSymbol:button onPress:onPress];
     } else if (button.icon.hasValue) {
         return [[RNNUIBarButtonItem alloc] initWithIcon:button onPress:onPress];
     } else if (button.text.hasValue) {

package/lib/ios/RNNButtonOptions.h

@@ -16,6 +16,7 @@
 @property(nonatomic, strong) Color *color;
 @property(nonatomic, strong) Color *disabledColor;
 @property(nonatomic, strong) Image *icon;
+@property(nonatomic, strong) Text *sfSymbol;
 @property(nonatomic, strong) Bool *enabled;
 @property(nonatomic, strong) RNNInsetsOptions *iconInsets;
 @property(nonatomic, strong) Bool *selectTabOnPress;

package/lib/ios/RNNButtonOptions.m

@@ -11,6 +11,7 @@
     self.fontWeight = [TextParser parse:dict key:@"fontWeight"];
     self.fontSize = [NumberParser parse:dict key:@"fontSize"];
     self.text = [TextParser parse:dict key:@"text"];
+    self.sfSymbol = [TextParser parse:dict key:@"sfSymbol"];
     self.testID = [TextParser parse:dict key:@"testID"];
     self.accessibilityLabel = [TextParser parse:dict key:@"accessibilityLabel"];
     self.color = [ColorParser parse:dict key:@"color"];
@@ -39,6 +40,7 @@
     newOptions.color = self.color.copy;
     newOptions.disabledColor = self.disabledColor.copy;
     newOptions.icon = self.icon.copy;
+    newOptions.sfSymbol = self.sfSymbol.copy;
     newOptions.iconInsets = self.iconInsets.copy;
     newOptions.enabled = self.enabled.copy;
     newOptions.selectTabOnPress = self.selectTabOnPress.copy;
@@ -71,6 +73,8 @@
         self.disabledColor = options.disabledColor;
     if (options.icon.hasValue)
         self.icon = options.icon;
+    if (options.sfSymbol.hasValue)
+        self.sfSymbol = options.sfSymbol;
     if (options.enabled.hasValue) {
         self.enabled = options.enabled;
         [self.iconBackground setEnabled:self.enabled];

package/lib/ios/RNNCommandsHandler.m

@@ -1,4 +1,5 @@
 #import "RNNCommandsHandler.h"
+#import "AnimationObserver.h"
 #import "RNNAssert.h"
 #import "RNNComponentViewController.h"
 #import "RNNConvert.h"
@@ -82,10 +83,7 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
         }
     }
 
-    [_modalManager dismissAllModalsAnimated:NO
-                                 completion:^{
-
-                                 }];
+    [_modalManager reset];
 
     UIViewController *vc = [_controllerFactory createLayout:layout[@"root"]];
     [_layoutManager addPendingViewController:vc];
@@ -203,12 +201,16 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
             });
         }
     } else {
-        newVc.waitForRender = optionsWithDefault.animations.push.shouldWaitForRender;
+        BOOL animated = [optionsWithDefault.animations.push.enable withDefault:YES];
+        BOOL waitForRender = optionsWithDefault.animations.push.shouldWaitForRender;
+        newVc.waitForRender = waitForRender;
         __weak UIViewController *weakNewVC = newVc;
         [newVc setReactViewReadyCallback:^{
+          if (animated && !waitForRender)
+              [[AnimationObserver sharedObserver] beginAnimation];
           [fromVC.stack push:weakNewVC
                        onTop:fromVC
-                    animated:[optionsWithDefault.animations.push.enable withDefault:YES]
+                    animated:animated
                   completion:^{
                     [self->_layoutManager removePendingViewController:weakNewVC];
                     [self->_eventEmitter sendOnNavigationCommandCompletion:push
@@ -369,14 +371,19 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
     [_layoutManager addPendingViewController:newVc];
 
     __weak UIViewController *weakNewVC = newVc;
-    newVc.waitForRender = [withDefault.animations.showModal.enter shouldWaitForRender];
+    BOOL animated = [withDefault.animations.showModal.enter.enable withDefault:YES];
+    BOOL waitForRender = [withDefault.animations.showModal.enter shouldWaitForRender];
+    newVc.waitForRender = waitForRender;
     newVc.modalPresentationStyle = [RNNConvert
         UIModalPresentationStyle:[withDefault.modalPresentationStyle withDefault:@"default"]];
     newVc.modalTransitionStyle = [RNNConvert
         UIModalTransitionStyle:[withDefault.modalTransitionStyle withDefault:@"coverVertical"]];
+
+    if (animated && !waitForRender)
+        [[AnimationObserver sharedObserver] beginAnimation];
     [newVc setReactViewReadyCallback:^{
       [self->_modalManager showModal:weakNewVC
-                            animated:[withDefault.animations.showModal.enter.enable withDefault:YES]
+                            animated:animated
                           completion:^(NSString *componentId) {
                             [self->_layoutManager removePendingViewController:weakNewVC];
                             [self->_eventEmitter sendOnNavigationCommandCompletion:showModal