react-native-screens 3.29.0 → 3.30.0

package/README.md

@@ -11,6 +11,7 @@ To learn about how to use `react-native-screens` with Fabric architecture, head
 - [x] iOS
 - [x] Android
 - [x] tvOS
+- [x] visionOS
 - [x] Windows
 - [x] Web
 
@@ -103,8 +104,9 @@ Screens are already integrated with the React Native's most popular navigation l
 
 ## Supported react-native version
 
-| version | react-native version |
+| library version | react-native version |
 | ------- | -------------------- |
+| 3.30.0+ | 0.68.0+              |
 | 3.14.0+ | 0.64.0+              |
 | 3.0.0+  | 0.62.0+              |
 | 2.0.0+  | 0.60.0+              |
@@ -113,13 +115,11 @@ Screens are already integrated with the React Native's most popular navigation l
 
 [Fabric](https://reactnative.dev/architecture/fabric-renderer) is React Native's new rendering system.
 
-- As of [version `3.21.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.21.0) of this project, Fabric is supported only for react-native 0.72+. Support for lower versions has been dropped.
-- As of [version `3.19.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.19.0) of this project, Fabric is supported only for react-native 0.71+. Support for lower versions has been dropped.
-- As of [version `3.18.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.18.0) of this project, Fabric is supported only for react-native 0.70+. Support for lower versions has been dropped.
-- As of [version `3.14.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.14.0) of this project, Fabric is supported only for react-native 0.69+. Support for lower versions has been dropped.
+Here's a table with summary of supported `react-native` versions when Fabric is turned on.
 
-| version | react-native version |
+| library version | react-native version |
 | ------- | -------------------- |
+| 3.28.0+ | 0.73.0+              |
 | 3.21.0+ | 0.72.0+              |
 | 3.19.0+ | 0.71.0+              |
 | 3.18.0+ | 0.70.0+              |
@@ -145,7 +145,7 @@ You are all set 🎉 – when screens are enabled in your application code react
 
 ### Experimental support for `react-freeze`
 
-> You have to use React Native 0.64 or higher, react-navigation 5.x or 6.x and react-native-screens >= v3.9.0
+> You have to use React Native 0.68 or higher, react-navigation 5.x or 6.x and react-native-screens >= v3.9.0
 
 Since `v3.9.0`, `react-native-screens` comes with experimental support for [`react-freeze`](https://github.com/software-mansion-labs/react-freeze). It uses the React `Suspense` mechanism to prevent parts of the React component tree from rendering, while keeping its state untouched.
 

package/RNScreens.podspec

@@ -4,7 +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}"
+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'
 
@@ -17,7 +17,7 @@ class RNScreensDependencyHelper
     end
 
     s.subspec "common" do |ss|
-      ss.source_files         = "common/cpp/**/*.{cpp,h}"
+      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
@@ -60,7 +60,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/software-mansion/react-native-screens"
   s.license      = "MIT"
   s.author       = { "author" => "author@domain.cn" }
-  s.platforms    = { :ios => platform, :tvos => "11.0" }
+  s.platforms    = { :ios => platform, :tvos => "11.0", :visionos => "1.0" }
   s.source       = { :git => "https://github.com/software-mansion/react-native-screens.git", :tag => "#{s.version}" }
   s.source_files = source_files
   s.requires_arc = true

package/android/CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.9.0)
+
+project(rnscreens)
+
+add_library(rnscreens
+    SHARED
+    ../cpp/RNScreensTurboModule.cpp
+    ./src/main/cpp/jni-adapter.cpp
+)
+
+include_directories(
+    ../cpp
+)
+
+set_target_properties(rnscreens PROPERTIES
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS OFF
+    POSITION_INDEPENDENT_CODE ON
+)
+
+find_package(ReactAndroid REQUIRED CONFIG)
+
+target_link_libraries(rnscreens
+    ReactAndroid::jsi
+    android
+)

package/android/build.gradle

@@ -1,4 +1,5 @@
 import com.android.Version
+import groovy.json.JsonSlurper
 
 buildscript {
     ext {
@@ -73,6 +74,19 @@ android {
         ndk {
             abiFilters (*reactNativeArchitectures())
         }
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+    }
+    buildFeatures {
+        prefab true
+    }
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
     }
     lintOptions {
         abortOnError false
@@ -86,7 +100,13 @@ android {
         // while there are more libraries copied in intermediates folder of the lib build directory, we exclude
         // only the ones that make the build fail (ideally we should only include librnscreens_modules but we
         // are only allowed to specify exclude patterns)
-        exclude "**/libreact_render*.so"
+        excludes = [
+                "META-INF",
+                "META-INF/**",
+                "**/libjsi.so",
+                "**/libc++_shared.so",
+                "**/libreact_render*.so"
+        ]
     }
     sourceSets.main {
         ext.androidResDir = "src/main/res"
@@ -101,7 +121,6 @@ android {
                     "build/generated/source/codegen/java"
                 ]
             }
-
         }
         res {
             if (safeExtGet('compileSdkVersion', rnsDefaultCompileSdkVersion) >= 33) {

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

@@ -3,7 +3,6 @@ package com.swmansion.rnscreens
 import android.view.ViewGroup
 import androidx.annotation.UiThread
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.FabricViewStateManager
@@ -13,36 +12,40 @@ import kotlin.math.abs
 abstract class FabricEnabledViewGroup constructor(context: ReactContext?) : ViewGroup(context), FabricViewStateManager.HasFabricViewStateManager {
     private val mFabricViewStateManager: FabricViewStateManager = FabricViewStateManager()
 
+    private var lastSetWidth = 0f
+    private var lastSetHeight = 0f
+
     override fun getFabricViewStateManager(): FabricViewStateManager {
         return mFabricViewStateManager
     }
 
-    protected fun updateScreenSizeFabric(width: Int, height: Int) {
-        updateState(width, height)
+    protected fun updateScreenSizeFabric(width: Int, height: Int, headerHeight: Double) {
+        updateState(width, height, headerHeight)
     }
 
     @UiThread
-    fun updateState(width: Int, height: Int) {
+    fun updateState(width: Int, height: Int, headerHeight: Double) {
         val realWidth: Float = PixelUtil.toDIPFromPixel(width.toFloat())
         val realHeight: Float = PixelUtil.toDIPFromPixel(height.toFloat())
 
         // Check incoming state values. If they're already the correct value, return early to prevent
         // infinite UpdateState/SetState loop.
-        val currentState: ReadableMap? = mFabricViewStateManager.getStateData()
-        if (currentState != null) {
-            val delta = 0.9f
-            val stateFrameHeight: Float = if (currentState.hasKey("frameHeight")) currentState.getDouble("frameHeight").toFloat() else 0f
-            val stateFrameWidth: Float = if (currentState.hasKey("frameWidth")) currentState.getDouble("frameWidth").toFloat() else 0f
-            if (abs(stateFrameWidth - realWidth) < delta &&
-                abs(stateFrameHeight - realHeight) < delta
-            ) {
-                return
-            }
+        val delta = 0.9f
+        if (abs(lastSetWidth - realWidth) < delta &&
+            abs(lastSetHeight - realHeight) < delta
+        ) {
+            return
         }
+
+        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
         }
     }

package/android/src/main/cpp/jni-adapter.cpp

@@ -0,0 +1,110 @@
+#include <array>
+#include <mutex>
+#include <jni.h>
+#include <jsi/jsi.h>
+#include "RNScreensTurboModule.h"
+
+using namespace facebook;
+
+jobject globalThis;
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_swmansion_rnscreens_ScreensModule_nativeInstall(JNIEnv *env, jobject thiz, jlong jsiPtr) {
+    auto runtime = reinterpret_cast<jsi::Runtime*>(jsiPtr);
+    if (!runtime) {
+        return;
+    }
+    jsi::Runtime &rt = *runtime;
+    globalThis = env->NewGlobalRef(thiz);
+    JavaVM* jvm;
+    env->GetJavaVM(&jvm);
+
+    const auto &startTransition = [jvm](int stackTag) -> std::array<int, 2> {
+        JNIEnv* currentEnv;
+        if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
+            return {0, 0};
+        }
+        jclass javaClass = currentEnv->GetObjectClass(globalThis);
+        jmethodID methodID = currentEnv->GetMethodID(
+                javaClass,
+                "startTransition",
+                "(Ljava/lang/Integer;)[I"
+        );
+        jclass integerClass = currentEnv->FindClass("java/lang/Integer");
+        jmethodID integerConstructor = currentEnv->GetMethodID(integerClass, "<init>", "(I)V");
+        jobject integerArg = currentEnv->NewObject(integerClass, integerConstructor, stackTag);
+        jintArray resultArray = (jintArray) currentEnv->CallObjectMethod(
+                globalThis,
+                methodID,
+                integerArg
+        );
+        std::array<int, 2> result = {-1, -1};
+        jint* elements = currentEnv->GetIntArrayElements(resultArray, nullptr);
+        if (elements != nullptr) {
+            result[0] = elements[0];
+            result[1] = elements[1];
+            currentEnv->ReleaseIntArrayElements(resultArray, elements, JNI_ABORT);
+        }
+        return result;
+    };
+
+    const auto &updateTransition = [jvm](int stackTag, double progress){
+        JNIEnv* currentEnv;
+        if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
+            return;
+        }
+        jclass javaClass = currentEnv->GetObjectClass(globalThis);
+        jmethodID methodID = currentEnv->GetMethodID(
+                javaClass,
+                "updateTransition",
+                "(D)V"
+        );
+        currentEnv->CallVoidMethod(globalThis, methodID, progress);
+    };
+
+    const auto &finishTransition = [jvm](int stackTag, bool canceled){
+        JNIEnv* currentEnv;
+        if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
+            return;
+        }
+        jclass javaClass = currentEnv->GetObjectClass(globalThis);
+        jmethodID methodID = currentEnv->GetMethodID(
+                javaClass,
+                "finishTransition",
+                "(Ljava/lang/Integer;Z)V"
+        );
+        jclass integerClass = currentEnv->FindClass("java/lang/Integer");
+        jmethodID integerConstructor = currentEnv->GetMethodID(integerClass, "<init>", "(I)V");
+        jobject integerArg = currentEnv->NewObject(integerClass, integerConstructor, stackTag);
+        currentEnv->CallVoidMethod(globalThis, methodID, integerArg, canceled);
+    };
+
+    const auto &disableSwipeBackForTopScreen = [](int _stackTag){
+        // no implementation for Android
+    };
+
+    auto rnScreensModule = std::make_shared<RNScreens::RNScreensTurboModule>(
+        startTransition,
+        updateTransition,
+        finishTransition,
+        disableSwipeBackForTopScreen
+    );
+    auto rnScreensModuleHostObject = jsi::Object::createFromHostObject(rt, rnScreensModule);
+    rt.global().setProperty(
+        rt,
+        RNScreens::RNScreensTurboModule::MODULE_NAME,
+        std::move(rnScreensModuleHostObject)
+    );
+}
+
+void JNICALL JNI_OnUnload(JavaVM *jvm, void *) {
+    JNIEnv *env;
+    if (jvm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+        return;
+    }
+    if (globalThis != nullptr) {
+        env->DeleteGlobalRef(globalThis);
+        globalThis = nullptr;
+    }
+}

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

@@ -13,17 +13,17 @@ class CustomSearchView(context: Context, fragment: Fragment) : SearchView(contex
         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 mCustomOnCloseListener: OnCloseListener? = null
-    private var mCustomOnSearchClickedListener: OnClickListener? = null
+    private var onCloseListener: OnCloseListener? = null
+    private var onSearchClickedListener: OnClickListener? = null
 
-    private var mOnBackPressedCallback: OnBackPressedCallback =
+    private var onBackPressedCallback: OnBackPressedCallback =
         object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 isIconified = true
             }
         }
 
-    private val backPressOverrider = FragmentBackPressOverrider(fragment, mOnBackPressedCallback)
+    private val backPressOverrider = FragmentBackPressOverrider(fragment, onBackPressedCallback)
 
     var overrideBackAction: Boolean
         set(value) {
@@ -40,12 +40,17 @@ class CustomSearchView(context: Context, fragment: Fragment) : SearchView(contex
 
     fun setText(text: String) = setQuery(text, false)
 
+    fun cancelSearch() {
+        clearText()
+        setIconified(true)
+    }
+
     override fun setOnCloseListener(listener: OnCloseListener?) {
-        mCustomOnCloseListener = listener
+        onCloseListener = listener
     }
 
     override fun setOnSearchClickListener(listener: OnClickListener?) {
-        mCustomOnSearchClickedListener = listener
+        onSearchClickedListener = listener
     }
 
     override fun onAttachedToWindow() {
@@ -62,12 +67,12 @@ class CustomSearchView(context: Context, fragment: Fragment) : SearchView(contex
 
     init {
         super.setOnSearchClickListener { v ->
-            mCustomOnSearchClickedListener?.onClick(v)
+            onSearchClickedListener?.onClick(v)
             backPressOverrider.maybeAddBackCallback()
         }
 
         super.setOnCloseListener {
-            val result = mCustomOnCloseListener?.onClose() ?: false
+            val result = onCloseListener?.onClose() ?: false
             backPressOverrider.removeBackCallbackIfAdded()
             result
         }

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

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

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

@@ -0,0 +1,12 @@
+package com.swmansion.rnscreens
+
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = ModalScreenViewManager.REACT_CLASS)
+class ModalScreenViewManager : ScreenViewManager() {
+    override fun getName() = REACT_CLASS
+
+    companion object {
+        const val REACT_CLASS = "RNSModalScreen"
+    }
+}

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

@@ -1,21 +1,54 @@
 package com.swmansion.rnscreens
 
-import com.facebook.react.ReactPackage
+import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModuleList
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 
-class RNScreensPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
-        emptyList()
-
+@ReactModuleList(
+    nativeModules = [
+        ScreensModule::class
+    ]
+)
+class RNScreensPackage : TurboReactPackage() {
     override fun createViewManagers(reactContext: ReactApplicationContext) =
         listOf<ViewManager<*, *>>(
             ScreenContainerViewManager(),
             ScreenViewManager(),
+            ModalScreenViewManager(),
             ScreenStackViewManager(),
             ScreenStackHeaderConfigViewManager(),
             ScreenStackHeaderSubviewManager(),
             SearchBarManager()
         )
+
+    override fun getModule(
+        s: String,
+        reactApplicationContext: ReactApplicationContext
+    ): NativeModule? {
+        when (s) {
+            ScreensModule.NAME -> return ScreensModule(reactApplicationContext)
+        }
+        return null
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+            val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+            moduleInfos[ScreensModule.NAME] = ReactModuleInfo(
+                ScreensModule.NAME,
+                ScreensModule.NAME,
+                false, // canOverrideExistingModule
+                false, // needsEagerInit
+                true, // hasConstants
+                false, // isCxxModule
+                isTurboModule
+            )
+            moduleInfos
+        }
+    }
 }