Fabric: Controlling DifferentiatorMode via ReactNativeConfig

Summary: Now we can control the differentiator mode via MC. Changelog: [Internal] Fabric-specific internal change. Reviewed By: fkgozali Differential Revision: D20978857 fbshipit-source-id: 13264948762f02f874d8d051c873d378062d6db4
facebook · Apr 11, 2020 · d7d585f · d7d585f
1 parent be78673
commit d7d585f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h
@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak) id<RCTMountingManagerDelegate> delegate;
 @property (nonatomic, strong) RCTComponentViewRegistry *componentViewRegistry;
 
+@property (atomic, assign) BOOL useModernDifferentiatorMode;
+
 /**
  * Schedule a mounting transaction to be performed on the main thread.
  * Can be called from any thread.

diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -266,7 +266,10 @@ - (void)performTransaction:(MountingCoordinator::Shared const &)mountingCoordina
   SystraceSection s("-[RCTMountingManager performTransaction:]");
   RCTAssertMainQueue();
 
-  auto transaction = mountingCoordinator->pullTransaction(DifferentiatorMode::Classic);
+  auto differentiatorMode =
+      self.useModernDifferentiatorMode ? DifferentiatorMode::OptimizedMoves : DifferentiatorMode::Classic;
+
+  auto transaction = mountingCoordinator->pullTransaction(differentiatorMode);
   if (!transaction.has_value()) {
     return;
   }

diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
@@ -24,6 +24,7 @@
 #import <React/RCTUtils.h>
 
 #import <react/components/root/RootShadowNode.h>
+#import <react/config/ReactNativeConfig.h>
 #import <react/core/LayoutConstraints.h>
 #import <react/core/LayoutContext.h>
 #import <react/uimanager/ComponentDescriptorFactory.h>
@@ -299,6 +300,12 @@ - (RCTScheduler *)_createScheduler
   RCTScheduler *scheduler = [[RCTScheduler alloc] initWithToolbox:toolbox];
   scheduler.delegate = self;
 
+  auto reactNativeConfig = _contextContainer->at<std::shared_ptr<ReactNativeConfig const>>("ReactNativeConfig");
+  if (reactNativeConfig) {
+    _mountingManager.useModernDifferentiatorMode =
+        reactNativeConfig->getBool("react_fabric:enabled_optimized_moves_differ_ios");
+  }
+
   return scheduler;
 }