Handle feature flag for commit hook

Author: kmichalikk

FabricExample/App.tsx

@@ -4,5 +4,6 @@ import { featureFlags } from '../src';
 featureFlags.experiment.synchronousScreenUpdatesEnabled = false
 featureFlags.experiment.synchronousHeaderConfigUpdatesEnabled = false
 featureFlags.experiment.synchronousHeaderSubviewUpdatesEnabled = false
+featureFlags.experiment.earlyScreenOrientationChangeEnabled = true
 
 export default App;

android/CMakeLists.txt

@@ -5,6 +5,8 @@ project(rnscreens)
 if(${RNS_NEW_ARCH_ENABLED})
 add_library(rnscreens
     SHARED
+    ../common/cpp/react/renderer/components/rnscreens/utils/FeatureFlags.cpp
+    ../common/cpp/react/renderer/components/rnscreens/utils/FeatureFlagsJNI.cpp
     ../cpp/RNScreensTurboModule.cpp
     ../cpp/RNSScreenRemovalListener.cpp
     ./src/main/cpp/jni-adapter.cpp

android/src/main/cpp/OnLoad.cpp

@@ -1,6 +1,7 @@
 #include <fbjni/fbjni.h>
 
 #include "NativeProxy.h"
+#include "../../../../common/cpp/react/renderer/components/rnscreens/utils/FeatureFlagsJNIHelper.h"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(

android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt

@@ -23,6 +23,7 @@ import com.swmansion.rnscreens.events.ScreenTransitionProgressEvent
 import com.swmansion.rnscreens.events.ScreenWillAppearEvent
 import com.swmansion.rnscreens.events.ScreenWillDisappearEvent
 import com.swmansion.rnscreens.events.SheetDetentChangedEvent
+import com.swmansion.rnscreens.utils.FeatureFlags
 
 @ReactModule(name = ScreenViewManager.REACT_CLASS)
 open class ScreenViewManager :
@@ -342,6 +343,13 @@ open class ScreenViewManager :
 
     // END mark: iOS-only
 
+    override fun setEarlyScreenOrientationChangeEnabled(
+        view: Screen?,
+        value: Boolean,
+    ) {
+        FeatureFlags.setFlag("EARLY_SCREEN_ORIENTATION_CHANGE", value)
+    }
+
     @ReactProp(name = "sheetAllowedDetents")
     override fun setSheetAllowedDetents(
         view: Screen,

android/src/main/java/com/swmansion/rnscreens/utils/FeatureFlags.kt

@@ -0,0 +1,10 @@
+package com.swmansion.rnscreens.utils
+
+object FeatureFlags {
+    init {
+        System.loadLibrary("rnscreens")
+    }
+
+    external fun setFlag(name: String, value: Boolean)
+    external fun getFlag(name: String): Boolean
+}

apps/App.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { enableFreeze } from 'react-native-screens';
 import Example from './Example';
-import * as Test from './src/tests';
+// import * as Test from './src/tests';
 
 enableFreeze(true);
 
 export default function App() {
-  // return <Example />;
-  return <Test.Test3295 />;
+  return <Example />;
+  // return <Test.TestBottomTabs />;
 }

apps/src/tests/Test3212/ScrollViewTemplate.tsx

@@ -12,7 +12,7 @@ export function ScrollViewTemplate() {
         setConfig({ bottom: 'hidden', top: 'hidden', left: 'hidden', right: 'hidden' });
       }}/>
       <Text style={{ fontSize: 21 }}>
-        {Array.from({ length: 50000 }).map(_ => emoji[Math.floor(Math.random() * emoji.length)])}
+        {Array.from({ length: 1000 }).map(_ => emoji[Math.floor(Math.random() * emoji.length)])}
       </Text>
     </ScrollView>
   );

common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h

@@ -12,6 +12,7 @@
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/UIManagerCommitHook.h>
 #include "RNSScreenShadowNode.h"
+#include "utils/FeatureFlags.h"
 
 namespace facebook {
 namespace react {
@@ -47,11 +48,13 @@ class RNSScreenComponentDescriptor final
             shadowNode.getState());
     auto stateData = state->getData();
 #ifdef ANDROID
-    if (!commitHook_) {
-      // The hook couldn't be attached in constructor because UIManager was
-      // missing from ContextContainer. Instead, we do it here, on the first
-      // call to the function. We don't anticipate any orientation changes that
-      // we need to respond to prior to this.
+    if (!commitHook_ &&
+        FeatureFlags::getFlag("EARLY_SCREEN_ORIENTATION_CHANGE")) {
+      // I the developer needs to react to orientation change as early as
+      // possible, we attach a commit hook that checks the old vs new
+      // RootShadowNode for the change. The hook cannot be attached in the
+      // constructor because UIManager is still missing from ContextContainer.
+      // Instead, we do it here, on the first call to the function.
       commitHook_ =
           std::make_shared<RNSScreenShadowNodeCommitHook>(contextContainer_);
     }

common/cpp/react/renderer/components/rnscreens/utils/FeatureFlags.cpp

@@ -0,0 +1,12 @@
+#include "FeatureFlags.h"
+
+std::unordered_map<std::string, bool> FeatureFlags::flagValues_;
+
+void FeatureFlags::setFlag(const std::string name, bool value) {
+  flagValues_[name] = value;
+}
+
+bool FeatureFlags::getFlag(const std::string name) {
+  auto it = flagValues_.find(name);
+  return it != flagValues_.end() && it->second;
+}

common/cpp/react/renderer/components/rnscreens/utils/FeatureFlags.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <string>
+#include <unordered_map>
+
+using namespace facebook;
+using namespace facebook::jni;
+
+class FeatureFlags : public jni::HybridClass<FeatureFlags> {
+ public:
+  FeatureFlags() = delete;
+
+  static void registerNatives();
+
+  static void setFlag(const std::string name, bool value);
+  static bool getFlag(const std::string name);
+
+ private:
+  static std::unordered_map<std::string, bool> flagValues_;
+};