react-native-screens 4.7.0 → 4.9.0-beta.0

package/android/build.gradle

@@ -130,7 +130,8 @@ android {
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_shared",
-                        "-DRNS_NEW_ARCH_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}"
+                        "-DRNS_NEW_ARCH_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}",
+                        "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
             }
         }
     }

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

@@ -41,13 +41,26 @@ class NativeProxy {
         }
     }
 
+    // Called from native
     @DoNotStrip
     public fun notifyScreenRemoved(screenTag: Int) {
-        val screen = viewsMap[screenTag]?.get()
+        // Since RN 0.78 the screenTag we receive as argument here might not belong to a screen
+        // owned by native stack, but e.g. to one parented by plain ScreenContainer, for which we
+        // currently do not want to start exiting transitions. Therefore is it left to caller to
+        // ensure that NativeProxy.viewsMap is filled only with screens belonging to screen stacks.
+
+        val weakScreeRef = viewsMap[screenTag]
+
+        // `screenTag` belongs to not observed screen or screen with such tag no longer exists.
+        if (weakScreeRef == null) {
+            return
+        }
+
+        val screen = weakScreeRef.get()
         if (screen is Screen) {
             screen.startRemovalTransition()
         } else {
-            Log.w("[RNScreens]", "Did not find view with tag $screenTag.")
+            Log.w("[RNScreens]", "Reference stored in NativeProxy for tag $screenTag no longer points to valid object.")
         }
     }
 }

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

@@ -371,9 +371,12 @@ class ScreenStackFragment :
             ScreenAnimationDelegate(
                 this,
                 ScreenEventEmitter(this.screen),
-                if (enter) ScreenAnimationDelegate.AnimationType.ENTER
-                else ScreenAnimationDelegate.AnimationType.EXIT
-            )
+                if (enter) {
+                    ScreenAnimationDelegate.AnimationType.ENTER
+                } else {
+                    ScreenAnimationDelegate.AnimationType.EXIT
+                },
+            ),
         )
         return animatorSet
     }
@@ -793,7 +796,7 @@ class ScreenStackFragment :
         // We set pointer events to BOX_NONE, because we don't want the ScreensCoordinatorLayout
         // to be target of react gestures and effectively prevent interaction with screens
         // underneath the current screen (useful in `modal` & `formSheet` presentation).
-        override fun getPointerEvents(): PointerEvents = PointerEvents.BOX_NONE
+        override val pointerEvents: PointerEvents = PointerEvents.BOX_NONE
     }
 
     private class ScreensAnimation(

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

@@ -11,7 +11,10 @@ internal class ScreensShadowNode(
 ) : LayoutShadowNode() {
     override fun onBeforeLayout(nativeViewHierarchyOptimizer: NativeViewHierarchyOptimizer) {
         super.onBeforeLayout(nativeViewHierarchyOptimizer)
-        (context.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
+        (context.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager? ->
+            if (nativeViewHierarchyManager == null) {
+                return@addUIBlock
+            }
             val view = nativeViewHierarchyManager.resolveView(reactTag)
             if (view is ScreenContainer) {
                 view.performUpdates()

package/android/src/main/java/com/swmansion/rnscreens/bottomsheet/BottomSheetDialogRootView.kt

@@ -68,7 +68,7 @@ class BottomSheetDialogRootView(
     }
 
     override fun onChildStartedNativeGesture(
-        view: View,
+        view: View?,
         event: MotionEvent,
     ) {
         jsTouchDispatcher.onChildStartedNativeGesture(event, eventDispatcher)
@@ -92,7 +92,7 @@ class BottomSheetDialogRootView(
         // need to keep receiving events.
     }
 
-    override fun handleException(throwable: Throwable?) {
+    override fun handleException(throwable: Throwable) {
         // TODO: I need ThemedReactContext here.
         // TODO: Determine where it is initially created & verify its lifecycle
         //        reactContext?.reactApplicationContext?.handleException(RuntimeException(throwable))

package/android/src/main/java/com/swmansion/rnscreens/bottomsheet/DimmingView.kt

@@ -59,7 +59,8 @@ class DimmingView(
         y: Float,
     ) = blockGestures
 
-    override fun getPointerEvents(): PointerEvents = if (blockGestures) PointerEvents.AUTO else PointerEvents.NONE
+    override val pointerEvents: PointerEvents
+        get() = if (blockGestures) PointerEvents.AUTO else PointerEvents.NONE
 
     companion object {
         const val TAG = "DimmingView"

package/android/src/main/java/com/swmansion/rnscreens/bottomsheet/GestureTransparentViewGroup.kt

@@ -15,7 +15,7 @@ class GestureTransparentViewGroup(
     context: Context,
 ) : FrameLayout(context),
     ReactPointerEventsView {
-    override fun getPointerEvents(): PointerEvents = PointerEvents.BOX_NONE
+    override val pointerEvents: PointerEvents = PointerEvents.BOX_NONE
 
     companion object {
         const val TAG = "GestureTransparentFrameLayout"

package/android/src/main/jni/CMakeLists.txt

@@ -17,6 +17,7 @@ add_compile_options(
   -Wall
   -Wpedantic
   -Wno-gnu-zero-variadic-macro-arguments
+  -Wno-dollar-in-identifier-extension
 )
 
 file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_COMPONENTS_DIR}/*.cpp ${LIB_COMMON_COMPONENTS_DIR}/utils/*.cpp)

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContainerManagerInterface.java

@@ -10,7 +10,8 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSScreenContainerManagerInterface<T extends View> {
+public interface RNSScreenContainerManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   // No props
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContentWrapperManagerInterface.java

@@ -10,7 +10,8 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSScreenContentWrapperManagerInterface<T extends View> {
+public interface RNSScreenContentWrapperManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   // No props
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenFooterManagerInterface.java

@@ -10,7 +10,8 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSScreenFooterManagerInterface<T extends View> {
+public interface RNSScreenFooterManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   // No props
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerInterface.java

@@ -13,8 +13,9 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSScreenManagerInterface<T extends View> {
+public interface RNSScreenManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setSheetAllowedDetents(T view, @Nullable ReadableArray value);
   void setSheetLargestUndimmedDetent(T view, int value);
   void setSheetGrabberVisible(T view, boolean value);

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerInterface.java

@@ -11,8 +11,9 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> {
+public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setBackgroundColor(T view, @Nullable Integer value);
   void setBackTitle(T view, @Nullable String value);
   void setBackTitleFontFamily(T view, @Nullable String value);

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderSubviewManagerInterface.java

@@ -11,7 +11,8 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSScreenStackHeaderSubviewManagerInterface<T extends View> {
+public interface RNSScreenStackHeaderSubviewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setType(T view, @Nullable String value);
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackManagerInterface.java

@@ -10,7 +10,8 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSScreenStackManagerInterface<T extends View> {
+public interface RNSScreenStackManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   // No props
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSSearchBarManagerInterface.java

@@ -11,8 +11,9 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNSSearchBarManagerInterface<T extends View> {
+public interface RNSSearchBarManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setHideWhenScrolling(T view, boolean value);
   void setAutoCapitalize(T view, @Nullable String value);
   void setPlaceholder(T view, @Nullable String value);

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h

@@ -8,7 +8,6 @@
 #include <react/renderer/components/rnscreens/utils/RectUtil.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include "RNSScreenStackHeaderSubviewShadowNode.h"
-#include "utils/RectUtil.h"
 
 namespace facebook::react {
 

package/cpp/RNSScreenRemovalListener.cpp

@@ -10,8 +10,10 @@ std::optional<MountingTransaction> RNSScreenRemovalListener::pullTransaction(
   for (const ShadowViewMutation &mutation : mutations) {
     if (mutation.type == ShadowViewMutation::Type::Remove &&
         mutation.oldChildShadowView.componentName != nullptr &&
-        strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") ==
-            0) {
+        strcmp(mutation.oldChildShadowView.componentName, "RNSScreen") == 0) {
+      // We call the listener function even if this screen has not been owned
+      // by RNSScreenStack as since RN 0.78 we do not have enough information
+      // here. This final filter is applied later in NativeProxy.
       listenerFunction_(mutation.oldChildShadowView.tag);
     }
   }

package/ios/RNSScreenStack.mm

@@ -1232,7 +1232,7 @@ RNS_IGNORE_SUPER_CALL_END
                withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
 {
   for (const auto &mutation : transaction.getMutations()) {
-    if (mutation.parentShadowView.tag == self.tag &&
+    if (mutation.parentTag == self.tag &&
         (mutation.type == react::ShadowViewMutation::Type::Insert ||
          mutation.type == react::ShadowViewMutation::Type::Remove)) {
       // we need to wait until children have their layout set. At this point they don't have the layout

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.7.0",
+  "version": "4.9.0-beta.0",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",
@@ -81,15 +81,15 @@
     "@react-native-community/cli": "15.0.1",
     "@react-native-community/cli-platform-android": "15.0.1",
     "@react-native-community/cli-platform-ios": "15.0.1",
-    "@react-native/babel-preset": "0.77.0-rc.7",
-    "@react-native/eslint-config": "0.77.0-rc.7",
-    "@react-native/metro-config": "0.77.0-rc.7",
-    "@react-native/typescript-config": "0.77.0-rc.7",
+    "@react-native/babel-preset": "0.78.0-rc.5",
+    "@react-native/eslint-config": "0.78.0-rc.5",
+    "@react-native/metro-config": "0.78.0-rc.5",
+    "@react-native/typescript-config": "0.78.0-rc.5",
     "@react-navigation/native": "^5.8.0",
     "@react-navigation/stack": "^5.10.0",
     "@types/jest": "^29.5.13",
-    "@types/react": "^18.2.72",
-    "@types/react-test-renderer": "^18.0.0",
+    "@types/react": "^19.0.0",
+    "@types/react-test-renderer": "^19.0.0",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",
     "clang-format": "^1.8.0",
@@ -105,15 +105,15 @@
     "jest": "^29.6.3",
     "lint-staged": "^14.0.1",
     "prettier": "^2.8.8",
-    "react": "18.2.0",
-    "react-dom": "^18.2.0",
-    "react-native": "0.77.0-rc.7",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-native": "0.78.0-rc.5",
     "react-native-builder-bob": "^0.23.2",
     "react-native-gesture-handler": "^2.22.0",
     "react-native-reanimated": "3.16.7",
     "react-native-safe-area-context": "5.1.0",
     "react-native-windows": "^0.64.8",
-    "react-test-renderer": "^18.2.0",
+    "react-test-renderer": "^19.0.0",
     "release-it": "^15.6.0",
     "typescript": "5.4.3"
   },