[Fabric] Let surface presenter manage start of surface

zhongwuzw · Mar 29, 2019 · e7cda3b · shergin · Mar 29, 2019 · shergin
1 parent 6345fcf
commit e7cda3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
@@ -55,6 +55,7 @@ @implementation RCTSurfacePresenter {
   std::shared_ptr<const ReactNativeConfig> _reactNativeConfig;
   better::shared_mutex _observerListMutex;
   NSMutableArray<id<RCTSurfacePresenterObserver>> *_observers;
+  BOOL _isFirstJavaScriptLoaded;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge config:(std::shared_ptr<const ReactNativeConfig>)config
@@ -76,6 +77,8 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge config:(std::shared_ptr<const
     }
 
     _observers = [NSMutableArray array];
+
+    _isFirstJavaScriptLoaded = YES;
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleBridgeWillReloadNotification:)
@@ -394,8 +397,9 @@ - (void)handleBridgeWillReloadNotification:(NSNotification *)notification
 - (void)handleJavaScriptDidLoadNotification:(NSNotification *)notification
 {
   RCTBridge *bridge = notification.userInfo[@"bridge"];
-  if (bridge != _batchedBridge) {
+  if (bridge != _batchedBridge || _isFirstJavaScriptLoaded) {
     _batchedBridge = bridge;
+    _isFirstJavaScriptLoaded = NO;
 
     [self _startAllSurfaces];
   }

diff --git a/React/Fabric/Surface/RCTFabricSurface.mm b/React/Fabric/Surface/RCTFabricSurface.mm
@@ -55,8 +55,6 @@ - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
     _touchHandler = [RCTSurfaceTouchHandler new];
 
     _stage = RCTSurfaceStageSurfaceDidInitialize;
-
-    [_surfacePresenter registerSurface:self];
   }
 
   return self;
@@ -67,8 +65,7 @@ - (BOOL)start
   if (![self _setStage:RCTSurfaceStageStarted]) {
     return NO;
   }
-
-  [_surfacePresenter startSurface:self];
+  [_surfacePresenter registerSurface:self];
 
   return YES;
 }