Fixing pr

Author: gosha212

e2e/Modals.test.js

@@ -26,9 +26,9 @@ describe('modal', () => {
     await elementById(TestIDs.MODAL_LIFECYCLE_BTN).tap();
     await expect(elementByLabel('didAppear')).toBeVisible();
     await elementById(TestIDs.DISMISS_MODAL_BTN).tap();
-    await waitFor(elementByLabel('componentWillUnmount')).toBeVisible().withTimeout(1000);
+    await expect(elementByLabel('componentWillUnmount')).toBeVisible();
     await elementByLabel('OK').atIndex(0).tap();
-    await waitFor(elementByLabel('didDisappear')).toBeVisible().withTimeout(1000);
+    await expect(elementByLabel('didDisappear')).toBeVisible();
     await elementByLabel('OK').atIndex(0).tap();
   });
 
@@ -148,9 +148,9 @@ describe('modal', () => {
     await elementById(TestIDs.MODAL_COMMANDS_BTN).tap();
     await elementById(TestIDs.MODAL_BTN).tap();
 
-    await waitFor(elementByLabel('showModal promise resolved with: UniqueStackId')).toBeVisible().withTimeout(1000);
-    await waitFor(elementByLabel('modalDismissed listener called with with: UniqueStackId')).toBeVisible().withTimeout(1000);
-    await waitFor(elementByLabel('dismissModal promise resolved with: UniqueStackId')).toBeVisible().withTimeout(1000);
+    await expect(elementByLabel('showModal promise resolved with: UniqueStackId')).toBeVisible();
+    await expect(elementByLabel('modalDismissed listener called with with: UniqueStackId')).toBeVisible();
+    await expect(elementByLabel('dismissModal promise resolved with: UniqueStackId')).toBeVisible();
   });
 
   it.e2e('should show declared modal', async () => {

e2e/Stack.test.js

@@ -134,7 +134,7 @@ describe('Stack', () => {
   it.e2e('unmount is called on pop', async () => {
     await elementById(TestIDs.PUSH_LIFECYCLE_BTN).tap();
     await elementById(TestIDs.POP_BTN).tap();
-    await waitFor(elementByLabel('componentWillUnmount')).toBeVisible().withTimeout(1000);
+    await expect(elementByLabel('componentWillUnmount')).toBeVisible();
     await elementByLabel('OK').atIndex(0).tap();
     await expect(elementByLabel('didDisappear')).toBeVisible();
   });
@@ -179,7 +179,7 @@ describe('Stack', () => {
   it.e2e('push promise is resolved with pushed ViewController id', async () => {
     await elementById(TestIDs.STACK_COMMANDS_BTN).tap();
     await elementById(TestIDs.PUSH_BTN).tap();
-    await waitFor(elementByLabel('push promise resolved with: ChildId')).toBeVisible().withTimeout(1000);
+    await expect(elementByLabel('push promise resolved with: ChildId')).toBeVisible();
     await expect(elementByLabel('pop promise resolved with: ChildId')).toBeVisible();
   });
 

e2e/StaticLifecycleEvents.test.js

@@ -10,6 +10,7 @@ describe('static lifecycle events', () => {
     await elementById(TestIDs.SHOW_STATIC_EVENTS_SCREEN).tap();
     await elementById(TestIDs.STATIC_EVENTS_OVERLAY_BTN).tap();
     await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();
+    await expect(elementByLabel('componentWillAppear | EventsOverlay | Component')).toBeVisible();
     await expect(elementByLabel('componentDidAppear | EventsOverlay | Component')).toBeVisible();
     await elementById(TestIDs.CLEAR_OVERLAY_EVENTS_BTN).tap();
   });

lib/ios/AnimatedTextView.mm

@@ -45,6 +45,7 @@ - (void)layoutSubviews {
 
 - (void)reset {
     [super reset];
+    _fromTextContainer.size = _fromSize;
 }
 
 - (NSTextContainer *)container:(NSTextStorage *)fromTextStorage {

lib/ios/RNNCommandsHandler.mm

@@ -300,6 +300,7 @@ - (void)pop:(NSString *)componentId
                    completion:^{
                      [self->_eventEmitter sendOnNavigationCommandCompletion:pop
                                                                   commandId:commandId];
+                NSLog(@"Pop commandshandler completed");
                      completion();
                    }
                     rejection:rejection];

lib/ios/RNNCustomTitleView.h

@@ -4,6 +4,7 @@
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceDelegate.h>
+#import <React/RCTSurface.h>
 #endif
 
 @interface RNNCustomTitleView : UIView <

lib/ios/RNNCustomTitleView.mm

@@ -55,8 +55,15 @@ - (NSString *)alignment {
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)surface:(RCTSurface *)surface didChangeIntrinsicSize:(CGSize)intrinsicSize {
-	// TODO: FILL WITH DATA
+    if ([self.alignment isEqualToString:@"center"]) {
+        [self setFrame:CGRectMake(self.frame.origin.x, self.frame.origin.y,
+                                  self.subView.intrinsicContentSize.width,
+                                  self.subView.intrinsicContentSize.height)];
+        [self.subView setFrame:CGRectMake(0, 0, surface.intrinsicSize.width,
+                                          surface.intrinsicSize.height)];
+    }
 }
+
 #else
 - (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView {
     if ([self.alignment isEqualToString:@"center"]) {

lib/ios/UINavigationController+RNNCommands.mm

@@ -21,6 +21,7 @@ - (void)push:(UIViewController *)newTop
 
     [self
         performBlock:^{
+        NSLog(@"About to push a controller %@", newTop);
           [self pushViewController:newTop animated:animated];
         }
             animated:animated
@@ -38,9 +39,12 @@ - (void)popAnimated:(BOOL)animated
         }
         animated:animated
         completion:^{
+        NSLog(@"Pop popAnimated completed");
           if (poppedVC) {
+              NSLog(@"Pop popAnimated completion invokation");
               completion();
           } else {
+              NSLog(@"Pop rejection");
               [RNNErrorHandler reject:rejection
                         withErrorCode:1012
                      errorDescription:@"popping component failed"];

playground/src/screens/StackCommandsScreen.tsx

@@ -47,10 +47,8 @@ export default class StackCommandsScreen extends NavigationComponent<NavigationP
         this.setState({
           pushPromiseResult: `push promise resolved with: ${pushId}`,
         });
-        return 'ChildId';
+        return Navigation.pop('ChildId');
       })
-      .then((popId) => new Promise<string>((resolve) => setTimeout(() => resolve(popId), 500)))
-      .then((popId) => Navigation.pop(popId))
       .then((popId) => {
         this.setState({
           popPromiseResult: `pop promise resolved with: ${popId}`,