react-native-screens 3.32.0 → 3.34.0

package/README.md

@@ -51,6 +51,7 @@ public class MainActivity extends ReactActivity {
     }
 }
 ```
+
 </details>
 
 <details>
@@ -69,6 +70,7 @@ class MainActivity: ReactActivity() {
     }
 }
 ```
+
 </details>
 
 For people that must handle cases like this, there is [a more detailed discussion of the difficulties in a series of related comments](https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704633).
@@ -105,12 +107,13 @@ Screens are already integrated with the React Native's most popular navigation l
 ## Supported react-native version
 
 | library version | react-native version |
-| ------- | -------------------- |
-| 3.32.0+ | 0.71.0+              |
-| 3.30.0+ | 0.68.0+              |
-| 3.14.0+ | 0.64.0+              |
-| 3.0.0+  | 0.62.0+              |
-| 2.0.0+  | 0.60.0+              |
+| --------------- | -------------------- |
+| 3.33.0+         | 0.72.0+
+| 3.32.0+         | 0.71.0+              |
+| 3.30.0+         | 0.68.0+              |
+| 3.14.0+         | 0.64.0+              |
+| 3.0.0+          | 0.62.0+              |
+| 2.0.0+          | 0.60.0+              |
 
 ### Support for Fabric
 
@@ -119,13 +122,14 @@ Screens are already integrated with the React Native's most popular navigation l
 Here's a table with summary of supported `react-native` versions when Fabric is turned on.
 
 | library version | react-native version |
-| ------- | -------------------- |
-| 3.32.0+ | 0.74.0+              |
-| 3.28.0+ | 0.73.0+              |
-| 3.21.0+ | 0.72.0+              |
-| 3.19.0+ | 0.71.0+              |
-| 3.18.0+ | 0.70.0+              |
-| 3.14.0+ | 0.69.0+              |
+| --------------- | -------------------- |
+| 3.33.0+         | 0.75.0+              |
+| 3.32.0+         | 0.74.0+              |
+| 3.28.0+         | 0.73.0+              |
+| 3.21.0+         | 0.72.0+              |
+| 3.19.0+         | 0.71.0+              |
+| 3.18.0+         | 0.70.0+              |
+| 3.14.0+         | 0.69.0+              |
 
 ## Usage with [react-navigation](https://github.com/react-navigation/react-navigation)
 

package/RNScreens.podspec

@@ -4,51 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 platform = new_arch_enabled ? "11.0" : "9.0"
-source_files = new_arch_enabled ? 'ios/**/*.{h,m,mm,cpp}' : ["ios/**/*.{h,m,mm}", "cpp/**/*.{cpp,h}"]
-
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-
-# Helper class to avoid clashing with Cocoapods install_dependencies function
-class RNScreensDependencyHelper
-  # Helper class to add the Common subspec
-  def self.add_common_subspec(s, new_arch_enabled)
-    unless new_arch_enabled
-      return
-    end
-
-    s.subspec "common" do |ss|
-      ss.source_files         = ["common/cpp/**/*.{cpp,h}", "cpp/**/*.{cpp,h}"]
-      ss.header_dir           = "rnscreens"
-      ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
-    end
-  end
-
-  # Function to support older versions of React Native which do not provide the
-  # install_modules_dependencies function
-  def self.install_dependencies(s, new_arch_enabled)
-    if new_arch_enabled
-      s.pod_target_xcconfig = {
-        'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly"',
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-      }
-
-      s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED'
-
-      s.dependency "React"
-      s.dependency "React-RCTFabric"
-      s.dependency "React-Codegen"
-      s.dependency "RCT-Folly"
-      s.dependency "RCTRequired"
-      s.dependency "RCTTypeSafety"
-      s.dependency "ReactCommon/turbomodule/core"
-
-      self.add_common_subspec(s, new_arch_enabled)
-    else
-      s.dependency "React-Core"
-      s.dependency "React-RCTImage"
-    end
-  end
-end
+source_files = new_arch_enabled ? 'ios/**/*.{h,m,mm,cpp}' : ["ios/**/*.{h,m,mm}", "cpp/RNScreensTurboModule.cpp", "cpp/RNScreensTurboModule.h"]
 
 Pod::Spec.new do |s|
   s.name         = "RNScreens"
@@ -66,12 +22,14 @@ Pod::Spec.new do |s|
   s.project_header_files = "cpp/**/*.h" # Don't expose C++ headers publicly to allow importing framework into Swift files
   s.requires_arc = true
 
-  if defined?(install_modules_dependencies()) != nil
-    install_modules_dependencies(s)
-    # Add missing dependencies, that were not included in install_modules_dependencies
-    s.dependency "React-RCTImage"
-    RNScreensDependencyHelper.add_common_subspec(s, new_arch_enabled)
-  else
-    RNScreensDependencyHelper.install_dependencies(s, new_arch_enabled)
+  install_modules_dependencies(s)
+  if new_arch_enabled
+    s.subspec "common" do |ss|
+      ss.source_files         = ["common/cpp/**/*.{cpp,h}", "cpp/**/*.{cpp,h}"]
+      ss.header_dir           = "rnscreens"
+      ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
+    end
   end
+
+  s.dependency "React-RCTImage"
 end

package/android/CMakeLists.txt

@@ -2,11 +2,22 @@ cmake_minimum_required(VERSION 3.9.0)
 
 project(rnscreens)
 
+if(${RNS_NEW_ARCH_ENABLED})
 add_library(rnscreens
     SHARED
     ../cpp/RNScreensTurboModule.cpp
+    ../cpp/RNSScreenRemovalListener.cpp
     ./src/main/cpp/jni-adapter.cpp
+    ./src/main/cpp/NativeProxy.cpp
+    ./src/main/cpp/OnLoad.cpp
 )
+else()
+add_library(rnscreens
+    SHARED
+    ../cpp/RNScreensTurboModule.cpp
+    ./src/main/cpp/jni-adapter.cpp
+)
+endif()
 
 include_directories(
     ../cpp
@@ -19,9 +30,42 @@ set_target_properties(rnscreens PROPERTIES
     POSITION_INDEPENDENT_CODE ON
 )
 
+target_compile_definitions(
+    rnscreens
+    PRIVATE
+    -DFOLLY_NO_CONFIG=1
+)
+
 find_package(ReactAndroid REQUIRED CONFIG)
 
-target_link_libraries(rnscreens
-    ReactAndroid::jsi
-    android
-)
+if(${RNS_NEW_ARCH_ENABLED})
+    find_package(fbjni REQUIRED CONFIG)
+    
+    target_link_libraries(
+        rnscreens
+            ReactAndroid::jsi
+            ReactAndroid::react_nativemodule_core
+            ReactAndroid::react_utils
+            ReactAndroid::reactnativejni
+            ReactAndroid::fabricjni
+            ReactAndroid::react_debug
+            ReactAndroid::react_render_core
+            ReactAndroid::runtimeexecutor
+            ReactAndroid::react_render_graphics
+            ReactAndroid::rrc_view
+            ReactAndroid::yoga
+            ReactAndroid::rrc_text
+            ReactAndroid::glog
+            ReactAndroid::react_render_componentregistry
+            ReactAndroid::react_render_consistency
+            ReactAndroid::react_performance_timeline
+            ReactAndroid::react_render_observers_events
+            fbjni::fbjni
+            android
+    )
+else()
+    target_link_libraries(rnscreens
+        ReactAndroid::jsi
+        android
+    )
+endif()

package/android/build.gradle

@@ -18,7 +18,7 @@ buildscript {
     dependencies {
         classpath('com.android.tools.build:gradle:4.2.2')
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', rnsDefaultKotlinVersion)}"
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:6.11.0"
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
     }
 }
 
@@ -81,6 +81,7 @@ def reactProperties = new Properties()
 file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
+def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', rnsDefaultCompileSdkVersion)
@@ -106,13 +107,14 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', rnsDefaultTargetSdkVersion)
         versionCode 1
         versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
         ndk {
             abiFilters (*reactNativeArchitectures())
         }
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_STL=c++_shared"
+                arguments "-DANDROID_STL=c++_shared",
+                        "-DRNS_NEW_ARCH_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}"
             }
         }
     }
@@ -143,13 +145,15 @@ android {
                 "META-INF/**",
                 "**/libjsi.so",
                 "**/libc++_shared.so",
-                "**/libreact_render*.so"
+                "**/libreact_render*.so",
+                "**/libreactnativejni.so",
+                "**/libreact_performance_timeline.so"
         ]
     }
     sourceSets.main {
         ext.androidResDir = "src/main/res"
         java {
-            if (isNewArchitectureEnabled()) {
+            if (IS_NEW_ARCHITECTURE_ENABLED) {
                 srcDirs += [
                     "src/fabric/java",
                 ]
@@ -196,79 +200,3 @@ dependencies {
         }
     }
 }
-
-def isScreensExampleApp() {
-    return project.hasProperty('isScreensExampleApp') && project.property('isScreensExampleApp') == "true"
-}
-
-def getAbsoluteCodegenArtifactsPaperDestination() {
-    if (!project.hasProperty('codegenArtifactsPaperDestination')) {
-        throw new Exception('[RNScreens] Please fill codegenArtifactsPaperDestination variable in android/gradle.properties correct path to paper paper destination')
-    }
-
-    return "${project.rootDir}/../../${project.property('codegenArtifactsPaperDestination')}"
-}
-
-def getAbsoluteCodegenArtifactsSource() {
-    if (!project.hasProperty('codegenArtifactsSource')) {
-        throw new Exception('[RNScreens] Please fill codegenArtifactsSource variable in android/gradle.properties correct path to codegenerated artifacts')
-    }
-
-    return "${project.rootDir}/../../${project.property('codegenArtifactsSource')}"
-}
-
-
-tasks.register("copyCodegenArtifacts") {
-    group 'After build tasks'
-    description 'Tasks which copy codegen artifacts to paper architecture'
-    
-    if (!isScreensExampleApp() || !isNewArchitectureEnabled()) {
-        return
-    }
-
-    dependsOn tasks.generateCodegenArtifactsFromSchema
-
-    doLast {
-
-        def absoluteCodegenArtifactsPaperDestination = getAbsoluteCodegenArtifactsPaperDestination()
-        def absoluteCodegenArtifactsSource = getAbsoluteCodegenArtifactsSource()
-
-        def existingFiles = fileTree(absoluteCodegenArtifactsPaperDestination).matching {
-            include '**/*.java'
-        }
-
-        def generatedFiles = fileTree(absoluteCodegenArtifactsSource).matching {
-            include '**/*.java'
-        }
-
-        def existingFilesMap = [:]
-
-        existingFiles.forEach { existingFile ->
-            existingFilesMap[existingFile.name] = 1
-        }
-
-        generatedFiles.forEach { generatedFile -> 
-            if (!existingFilesMap.containsKey(generatedFile.name)) {
-                logger.warn("[RNScreens] ${generatedFile.name} not found in paper dir, if it's used in Android you need to copy it manually and implement yourself before using auto-copy feature")
-            }
-        }
-
-        if (existingFiles.size() == 0) {
-            logger.warn("[RNScreens] Paper destination with codegen interfaces is empty. This might be okay if you don't have any interfaces/delegates used in Android, if that's not the case please check if codegenArtifactsPaperDestination in android/gradle.properties is correct")
-        }
-
-        if (existingFiles.size() > generatedFiles.size()) {
-            throw new Exception("[RNScreens] Number od generated artifacts should be greather then or equal to paper interfaces. Please check if codegenArtifactsSource in android/gradle.properties is correct")
-        }
-
-        copy {
-            from absoluteCodegenArtifactsSource
-            include existingFiles.collect { it.name }
-            into absoluteCodegenArtifactsPaperDestination
-        }
-    }
-}
-
-if (isScreensExampleApp() && isNewArchitectureEnabled()) {
-    tasks.generateCodegenArtifactsFromSchema.finalizedBy('copyCodegenArtifacts')
-}

package/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt

@@ -5,26 +5,36 @@ import androidx.annotation.UiThread
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
-import com.facebook.react.uimanager.FabricViewStateManager
 import com.facebook.react.uimanager.PixelUtil
+import com.facebook.react.uimanager.StateWrapper
 import kotlin.math.abs
 
-abstract class FabricEnabledViewGroup constructor(context: ReactContext?) : ViewGroup(context), FabricViewStateManager.HasFabricViewStateManager {
-    private val mFabricViewStateManager: FabricViewStateManager = FabricViewStateManager()
+abstract class FabricEnabledViewGroup(
+    context: ReactContext?,
+) : ViewGroup(context) {
+    private var mStateWrapper: StateWrapper? = null
 
     private var lastSetWidth = 0f
     private var lastSetHeight = 0f
 
-    override fun getFabricViewStateManager(): FabricViewStateManager {
-        return mFabricViewStateManager
+    fun setStateWrapper(wrapper: StateWrapper?) {
+        mStateWrapper = wrapper
     }
 
-    protected fun updateScreenSizeFabric(width: Int, height: Int, headerHeight: Double) {
+    protected fun updateScreenSizeFabric(
+        width: Int,
+        height: Int,
+        headerHeight: Double,
+    ) {
         updateState(width, height, headerHeight)
     }
 
     @UiThread
-    fun updateState(width: Int, height: Int, headerHeight: Double) {
+    fun updateState(
+        width: Int,
+        height: Int,
+        headerHeight: Double,
+    ) {
         val realWidth: Float = PixelUtil.toDIPFromPixel(width.toFloat())
         val realHeight: Float = PixelUtil.toDIPFromPixel(height.toFloat())
 
@@ -39,14 +49,13 @@ abstract class FabricEnabledViewGroup constructor(context: ReactContext?) : View
 
         lastSetWidth = realWidth
         lastSetHeight = realHeight
-
-        mFabricViewStateManager.setState {
-            val map: WritableMap = WritableNativeMap()
-            map.putDouble("frameWidth", realWidth.toDouble())
-            map.putDouble("frameHeight", realHeight.toDouble())
-            map.putDouble("contentOffsetX", 0.0)
-            map.putDouble("contentOffsetY", headerHeight)
-            map
-        }
+        val map: WritableMap =
+            WritableNativeMap().apply {
+                putDouble("frameWidth", realWidth.toDouble())
+                putDouble("frameHeight", realHeight.toDouble())
+                putDouble("contentOffsetX", 0.0)
+                putDouble("contentOffsetY", headerHeight)
+            }
+        mStateWrapper?.updateState(map)
     }
 }

package/android/src/fabric/java/com/swmansion/rnscreens/NativeProxy.kt

@@ -0,0 +1,53 @@
+package com.swmansion.rnscreens
+
+import android.util.Log
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.fabric.FabricUIManager
+import java.lang.ref.WeakReference
+import java.util.concurrent.ConcurrentHashMap
+
+class NativeProxy {
+    @DoNotStrip
+    @Suppress("unused")
+    private val mHybridData: HybridData
+
+    init {
+        mHybridData = initHybrid()
+    }
+
+    private external fun initHybrid(): HybridData
+
+    external fun nativeAddMutationsListener(fabricUIManager: FabricUIManager)
+
+    companion object {
+        // we use ConcurrentHashMap here since it will be read on the JS thread,
+        // and written to on the UI thread.
+        private val viewsMap = ConcurrentHashMap<Int, WeakReference<Screen>>()
+
+        fun addScreenToMap(
+            tag: Int,
+            view: Screen,
+        ) {
+            viewsMap[tag] = WeakReference(view)
+        }
+
+        fun removeScreenFromMap(tag: Int) {
+            viewsMap.remove(tag)
+        }
+
+        fun clearMapOnInvalidate() {
+            viewsMap.clear()
+        }
+    }
+
+    @DoNotStrip
+    public fun notifyScreenRemoved(screenTag: Int) {
+        val screen = viewsMap[screenTag]?.get()
+        if (screen is Screen) {
+            screen.startRemovalTransition()
+        } else {
+            Log.w("[RNScreens]", "Did not find view with tag $screenTag.")
+        }
+    }
+}

package/android/src/main/cpp/NativeProxy.cpp

@@ -0,0 +1,51 @@
+#include <fbjni/fbjni.h>
+#include <react/fabric/Binding.h>
+#include <react/renderer/scheduler/Scheduler.h>
+
+#include <string>
+
+#include "NativeProxy.h"
+
+using namespace facebook;
+using namespace react;
+
+namespace rnscreens {
+
+NativeProxy::NativeProxy(jni::alias_ref<NativeProxy::javaobject> jThis)
+    : javaPart_(jni::make_global(jThis)) {}
+
+NativeProxy::~NativeProxy() {}
+
+void NativeProxy::registerNatives() {
+  registerHybrid(
+      {makeNativeMethod("initHybrid", NativeProxy::initHybrid),
+       makeNativeMethod(
+           "nativeAddMutationsListener",
+           NativeProxy::nativeAddMutationsListener)});
+}
+
+void NativeProxy::nativeAddMutationsListener(
+    jni::alias_ref<facebook::react::JFabricUIManager::javaobject>
+        fabricUIManager) {
+  auto uiManager =
+      fabricUIManager->getBinding()->getScheduler()->getUIManager();
+  screenRemovalListener_ =
+      std::make_shared<RNSScreenRemovalListener>([this](int tag) {
+        static const auto method =
+            javaPart_->getClass()->getMethod<void(jint)>("notifyScreenRemoved");
+        method(javaPart_, tag);
+      });
+
+  uiManager->getShadowTreeRegistry().enumerate(
+      [this](const facebook::react::ShadowTree &shadowTree, bool &stop) {
+        shadowTree.getMountingCoordinator()->setMountingOverrideDelegate(
+            screenRemovalListener_);
+      });
+}
+
+jni::local_ref<NativeProxy::jhybriddata> NativeProxy::initHybrid(
+    jni::alias_ref<jhybridobject> jThis) {
+  return makeCxxInstance(jThis);
+}
+
+} // namespace rnscreens

package/android/src/main/cpp/NativeProxy.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/fabric/JFabricUIManager.h>
+#include "RNSScreenRemovalListener.h"
+
+#include <string>
+
+namespace rnscreens {
+using namespace facebook;
+using namespace facebook::jni;
+
+class NativeProxy : public jni::HybridClass<NativeProxy> {
+ public:
+  std::shared_ptr<RNSScreenRemovalListener> screenRemovalListener_;
+  static auto constexpr kJavaDescriptor =
+      "Lcom/swmansion/rnscreens/NativeProxy;";
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jhybridobject> jThis);
+  static void registerNatives();
+
+  ~NativeProxy();
+
+ private:
+  friend HybridBase;
+  jni::global_ref<NativeProxy::javaobject> javaPart_;
+
+  explicit NativeProxy(jni::alias_ref<NativeProxy::javaobject> jThis);
+
+  void nativeAddMutationsListener(
+      jni::alias_ref<facebook::react::JFabricUIManager::javaobject>
+          fabricUIManager);
+};
+
+} // namespace rnscreens

package/android/src/main/cpp/OnLoad.cpp

@@ -0,0 +1,8 @@
+#include <fbjni/fbjni.h>
+
+#include "NativeProxy.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(
+      vm, [] { rnscreens::NativeProxy::registerNatives(); });
+}

package/android/src/main/java/com/swmansion/rnscreens/CustomSearchView.kt

@@ -7,14 +7,17 @@ import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
 
 @SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
-class CustomSearchView(context: Context, fragment: Fragment) : SearchView(context) {
+class CustomSearchView(
+    context: Context,
+    fragment: Fragment,
+) : SearchView(context) {
     /*
         CustomSearchView uses some variables from SearchView. They are listed below with links to documentation
         isIconified - https://developer.android.com/reference/android/widget/SearchView#setIconified(boolean)
         maxWidth - https://developer.android.com/reference/android/widget/SearchView#setMaxWidth(int)
         setOnSearchClickListener - https://developer.android.com/reference/android/widget/SearchView#setOnSearchClickListener(android.view.View.OnClickListener)
         setOnCloseListener - https://developer.android.com/reference/android/widget/SearchView#setOnCloseListener(android.widget.SearchView.OnCloseListener)
-    */
+     */
     private var onCloseListener: OnCloseListener? = null
     private var onSearchClickedListener: OnClickListener? = null
 

package/android/src/main/java/com/swmansion/rnscreens/CustomToolbar.kt

@@ -6,4 +6,7 @@ import androidx.appcompat.widget.Toolbar
 
 // This class is used to store config closer to search bar
 @SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
-open class CustomToolbar(context: Context, val config: ScreenStackHeaderConfig) : Toolbar(context)
+open class CustomToolbar(
+    context: Context,
+    val config: ScreenStackHeaderConfig,
+) : Toolbar(context)

package/android/src/main/java/com/swmansion/rnscreens/FragmentBackPressOverrider.kt

@@ -5,7 +5,7 @@ import androidx.fragment.app.Fragment
 
 class FragmentBackPressOverrider(
     private val fragment: Fragment,
-    private val onBackPressedCallback: OnBackPressedCallback
+    private val onBackPressedCallback: OnBackPressedCallback,
 ) {
     private var isCallbackAdded: Boolean = false
     var overrideBackAction: Boolean = true
@@ -14,7 +14,7 @@ class FragmentBackPressOverrider(
         if (!isCallbackAdded && overrideBackAction) {
             fragment.activity?.onBackPressedDispatcher?.addCallback(
                 fragment,
-                onBackPressedCallback
+                onBackPressedCallback,
             )
             isCallbackAdded = true
         }