react-native-navigation 7.23.1-snapshot.440 → 7.23.1-snapshot.449

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/RNNCommandsHandler.m

@@ -1,4 +1,5 @@
 #import "RNNCommandsHandler.h"
+#import "AnimationObserver.h"
 #import "RNNAssert.h"
 #import "RNNComponentViewController.h"
 #import "RNNConvert.h"
@@ -200,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
@@ -366,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

package/lib/ios/RNNComponentViewController.m

@@ -1,4 +1,5 @@
 #import "RNNComponentViewController.h"
+#import "AnimationObserver.h"
 
 @implementation RNNComponentViewController {
     NSArray *_reactViewConstraints;
@@ -36,6 +37,7 @@
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+    [[AnimationObserver sharedObserver] endAnimation];
     [self.reactView componentDidAppear];
     [self componentDidAppear];
 }

package/lib/ios/RNNExternalViewController.m

@@ -1,4 +1,5 @@
 #import "RNNExternalViewController.h"
+#import "AnimationObserver.h"
 
 @implementation RNNExternalViewController {
     UIViewController *_boundViewController;
@@ -49,6 +50,7 @@
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+    [[AnimationObserver sharedObserver] endAnimation];
     [self.eventEmitter sendComponentDidAppear:self.layoutInfo.componentId
                                 componentName:self.layoutInfo.name
                                 componentType:ComponentTypeScreen];

package/lib/ios/RNNSwizzles.m

@@ -7,11 +7,13 @@
 //
 
 #import "RNNSwizzles.h"
+#import "AnimationObserver.h"
 @import ObjectiveC;
 @import UIKit;
 
 static id (*__SWZ_initWithEventDispatcher_orig)(id self, SEL _cmd, id eventDispatcher);
 static void (*__SWZ_setFrame_orig)(id self, SEL _cmd, CGRect frame);
+static void (*__SWZ_didMoveToWindow_orig)(id self, SEL _cmd);
 
 static void __RNN_setFrame_orig(UIScrollView *self, SEL _cmd, CGRect frame) {
     CGPoint originalOffset = self.contentOffset;
@@ -37,6 +39,16 @@ static void __RNN_setFrame_orig(UIScrollView *self, SEL _cmd, CGRect frame) {
     }
 }
 
+static void __RNN_didMoveToWindow(UIView *self, SEL _cmd) {
+    if (![[AnimationObserver sharedObserver] isAnimating] || !self.window) {
+        __SWZ_didMoveToWindow_orig(self, _cmd);
+    } else {
+        [[AnimationObserver sharedObserver] registerAnimationEndedBlock:^{
+          __SWZ_didMoveToWindow_orig(self, _cmd);
+        }];
+    }
+}
+
 @implementation RNNSwizzles
 
 - (id)__swz_initWithEventDispatcher:(id)eventDispatcher {
@@ -72,6 +84,14 @@ static void __RNN_setFrame_orig(UIScrollView *self, SEL _cmd, CGRect frame) {
     m1 = class_getInstanceMethod(cls, @selector(setFrame:));
     __SWZ_setFrame_orig = (void *)method_getImplementation(m1);
     method_setImplementation(m1, (IMP)__RNN_setFrame_orig);
+
+    cls = NSClassFromString(@"RCTBaseTextInputView");
+    if (cls == NULL) {
+        return;
+    }
+    Method m4 = class_getInstanceMethod(cls, NSSelectorFromString(@"didMoveToWindow"));
+    __SWZ_didMoveToWindow_orig = (void *)method_getImplementation(m4);
+    method_setImplementation(m4, (IMP)__RNN_didMoveToWindow);
 }
 
 @end

package/lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -355,6 +355,8 @@
 		50D3A37723BB5CD900717F95 /* OptionsArrayParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 50D3A37523BB5CD900717F95 /* OptionsArrayParser.m */; };
 		50D4656D23CE2553005A84B2 /* Transition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D4656B23CE2553005A84B2 /* Transition.h */; };
 		50D4656E23CE2553005A84B2 /* Transition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50D4656C23CE2553005A84B2 /* Transition.m */; };
+		50DD9154274FC6E200B4C917 /* AnimationObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 50DD9152274FC6E200B4C917 /* AnimationObserver.h */; };
+		50DD9155274FC6E200B4C917 /* AnimationObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 50DD9153274FC6E200B4C917 /* AnimationObserver.m */; };
 		50DE2E45238EA14E005CD5F4 /* NSArray+utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50DE2E43238EA14E005CD5F4 /* NSArray+utils.h */; };
 		50DE2E46238EA14E005CD5F4 /* NSArray+utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 50DE2E44238EA14E005CD5F4 /* NSArray+utils.m */; };
 		50E02BD821A6EE0F00A43942 /* SideMenuOpenMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E02BD621A6EE0F00A43942 /* SideMenuOpenMode.h */; };
@@ -885,6 +887,8 @@
 		50D4656B23CE2553005A84B2 /* Transition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Transition.h; sourceTree = "<group>"; };
 		50D4656C23CE2553005A84B2 /* Transition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Transition.m; sourceTree = "<group>"; };
 		50DA74CF232F80FE004A00C1 /* RCTConvert+UIFontWeight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+UIFontWeight.h"; sourceTree = "<group>"; };
+		50DD9152274FC6E200B4C917 /* AnimationObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnimationObserver.h; sourceTree = "<group>"; };
+		50DD9153274FC6E200B4C917 /* AnimationObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnimationObserver.m; sourceTree = "<group>"; };
 		50DE2E43238EA14E005CD5F4 /* NSArray+utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+utils.h"; sourceTree = "<group>"; };
 		50DE2E44238EA14E005CD5F4 /* NSArray+utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+utils.m"; sourceTree = "<group>"; };
 		50E02BD521A6E54B00A43942 /* RCTConvert+SideMenuOpenGestureMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+SideMenuOpenGestureMode.h"; sourceTree = "<group>"; };
@@ -1120,6 +1124,8 @@
 				5053CE7E2175FB1900D0386B /* RNNDefaultOptionsHelper.m */,
 				C2A57A1A21E815F80066711C /* InteractivePopGestureDelegate.h */,
 				C2A57A1B21E815F80066711C /* InteractivePopGestureDelegate.m */,
+				50DD9152274FC6E200B4C917 /* AnimationObserver.h */,
+				50DD9153274FC6E200B4C917 /* AnimationObserver.m */,
 			);
 			name = Helpers;
 			sourceTree = "<group>";
@@ -1931,6 +1937,7 @@
 				50CED44D239EA78700C42EE2 /* TopBarAppearancePresenter.h in Headers */,
 				50D3A37223B8D77C00717F95 /* SharedElementTransitionOptions.h in Headers */,
 				50C085F325939F6200B0502C /* RNNButtonBuilder.h in Headers */,
+				50DD9154274FC6E200B4C917 /* AnimationObserver.h in Headers */,
 				50887C1520ECC5C200D06111 /* RNNButtonOptions.h in Headers */,
 				5049593E216F5D73006D2B81 /* BoolParser.h in Headers */,
 				E5F6C3A522DB4D0F0093C2CE /* UIViewController+Utils.h in Headers */,
@@ -2219,6 +2226,7 @@
 				509416AC23A11CB20036092C /* NullEnum.m in Sources */,
 				503A8A1A23BCB2ED0094D1C4 /* RNNReactButtonView.m in Sources */,
 				50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */,
+				50DD9155274FC6E200B4C917 /* AnimationObserver.m in Sources */,
 				263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */,
 				5082CC3423CDC3B800FD2B6A /* HorizontalTranslationTransition.m in Sources */,
 				50495957216F6B3D006D2B81 /* DictionaryParser.m in Sources */,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.23.1-snapshot.440",
+  "version": "7.23.1-snapshot.449",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,