react-native-screens 5.0.0-alpha.1 → 5.0.0-alpha.3

package/android/src/main/java/com/swmansion/rnscreens/tabs/host/TabsHost.kt

@@ -161,6 +161,16 @@ class TabsHost(
         refreshLayout()
     }
 
+    // On window configuration changes ViewRootImpl calls forceLayout() recursively on every view
+    // in the hierarchy, bypassing requestLayout(). React views never lay out their children during
+    // framework traversals, so nothing would clear the force-layout flags in our subtree — and once
+    // they are set, any subsequent requestLayout() from a descendant short-circuits before reaching
+    // the override above, permanently disabling the manual pass. Schedule it from here as well.
+    override fun forceLayout() {
+        super.forceLayout()
+        refreshLayout()
+    }
+
     private fun forceSubtreeMeasureAndLayoutPass() {
         measure(
             MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),

package/android/src/main/java/com/swmansion/rnscreens/tabs/host/TabsHostA11yCoordinator.kt

@@ -3,6 +3,9 @@ package com.swmansion.rnscreens.tabs.host
 import android.os.Build
 import android.view.MenuItem
 import android.view.View
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.core.view.children
 import androidx.core.view.get
 import com.google.android.material.bottomnavigation.BottomNavigationView
@@ -23,8 +26,26 @@ class TabsHostA11yCoordinator(
             menuItem.contentDescription = tabsScreen.tabBarItemAccessibilityLabel
         }
 
-        // when matching view by id, espresso driver seems to look for tag property
-        findTabItemView(menuItem.itemId)?.tag = tabsScreen.tabBarItemTestID
+        findTabItemView(menuItem.itemId)?.let { tabItemView ->
+            // when matching view by id, espresso driver seems to look for tag property
+            tabItemView.tag = tabsScreen.tabBarItemTestID
+
+            // UiAutomator-based drivers (Maestro, Appium) read the node's viewIdResourceName instead,
+            // so expose the testID there as well — this is what React Native's ReactAccessibilityDelegate
+            // does for every other view. Read through to the screen so a prop update is reflected.
+            ViewCompat.setAccessibilityDelegate(
+                tabItemView,
+                object : AccessibilityDelegateCompat() {
+                    override fun onInitializeAccessibilityNodeInfo(
+                        host: View,
+                        info: AccessibilityNodeInfoCompat,
+                    ) {
+                        super.onInitializeAccessibilityNodeInfo(host, info)
+                        info.viewIdResourceName = tabsScreen.tabBarItemTestID
+                    }
+                },
+            )
+        }
     }
 
     // Third-party SDKs can freely assign their own ids to id-less views in CustomBottomNavigationView's subtree and there is no way to

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreen.kt

@@ -2,6 +2,8 @@ package com.swmansion.rnscreens.tabs.screen
 
 import android.content.res.Configuration
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
+import android.util.SparseArray
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.facebook.react.uimanager.ThemedReactContext
@@ -127,6 +129,17 @@ class TabsScreen(
         b: Int,
     ) = Unit
 
+    override fun dispatchSaveInstanceState(container: SparseArray<Parcelable>) {
+        // Do nothing. React Native owns this view hierarchy and keeps it alive, so there is no
+        // need to serialize/deserialize native view state. View ids in this subtree are react
+        // tags, which are not stable identities - restoring state by id can apply state saved
+        // by one view type to a different one, crashing e.g. in CompoundButton (see #4523).
+    }
+
+    override fun dispatchRestoreInstanceState(container: SparseArray<Parcelable>) {
+        // Ignore restoring instance state too, as we are not saving anything anyways.
+    }
+
     internal fun setTabsScreenDelegate(delegate: TabsScreenDelegate?) {
         tabsScreenDelegate = WeakReference(delegate)
     }
@@ -176,6 +189,10 @@ class TabsScreen(
 
     override fun findContentScrollView(): ViewGroup? = containerItemSupport.findContentScrollView(this)
 
+    // TabsScreen has no `preventNativeDismiss` flag of its own - it only forwards
+    // the question to its nested container.
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? = resolveNestedContainer()?.wantsToPreventStackNativeDismiss()
+
     // endregion
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreenFragment.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import com.swmansion.rnscreens.helpers.ViewIdGenerator
 
 class TabsScreenFragment(
     internal val tabsScreen: TabsScreen,
@@ -13,6 +14,8 @@ class TabsScreenFragment(
     internal val requireScreenKey: String by tabsScreen::requireScreenKey
     internal val isPreventNativeSelectionEnabled: Boolean by tabsScreen::preventNativeSelection
 
+    internal val menuItemId: Int = ViewIdGenerator.generateViewId()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

package/android/src/main/java/com/swmansion/rnscreens/utils/DimensionUtils.kt

@@ -49,6 +49,13 @@ internal fun dpToPx(
  */
 internal fun View.dpToPx(dp: Float): Float = dpToPx(dp, resources.displayMetrics.density)
 
+/**
+ * Converts an SP value to pixels using the density of the display this [View] is
+ * attached to (including the current font scale). Uses the view's own resources
+ * rather than the process-global density read by [PixelUtil]. See [pxToDp].
+ */
+internal fun View.spToPx(sp: Float): Float = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, resources.displayMetrics)
+
 internal fun resolveDimensionAttr(
     context: Context,
     attrId: Int,

package/android/src/main/java/com/swmansion/rnscreens/utils/StyleUtils.kt

@@ -0,0 +1,22 @@
+package com.swmansion.rnscreens.utils
+
+import android.content.Context
+import android.util.TypedValue
+import androidx.annotation.StyleRes
+
+/**
+ * Resolves a theme attribute pointing at a style (e.g. `?attr/textAppearanceTitleLarge`)
+ * to its concrete style resource id. Used to recover Material's default text
+ * appearances so they can be re-applied at runtime.
+ */
+@StyleRes
+internal fun resolveStyleResAttr(
+    context: Context,
+    attr: Int,
+): Int {
+    val typedValue = TypedValue()
+    require(context.theme.resolveAttribute(attr, typedValue, true)) {
+        "[RNScreens] Unable to resolve Material theme style attribute."
+    }
+    return typedValue.resourceId
+}

package/android/src/main/res/base/layout/rns_collapsing_toolbar_large_available_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutLargeStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+    app:collapsedTitleGravityMode="availableSpace" />

package/android/src/main/res/base/layout/rns_collapsing_toolbar_large_entire_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutLargeStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+    app:collapsedTitleGravityMode="entireSpace" />

package/android/src/main/res/base/layout/rns_collapsing_toolbar_medium_available_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutMediumStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+    app:collapsedTitleGravityMode="availableSpace" />

package/android/src/main/res/base/layout/rns_collapsing_toolbar_medium_entire_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutMediumStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+    app:collapsedTitleGravityMode="entireSpace" />

package/common/cpp/react/renderer/components/rnscreens/legacy/RNSScreenShadowNode.cpp

@@ -77,7 +77,11 @@ std::optional<float> findHeaderHeight(
   }
 
   jfloat headerHeight = env->CallFloatMethod(
-      packageInstance, computeDummyLayoutID, fontSize, isTitleEmpty, applyTopInset);
+      packageInstance,
+      computeDummyLayoutID,
+      fontSize,
+      isTitleEmpty,
+      applyTopInset);
 
   return {headerHeight};
 }
@@ -103,10 +107,11 @@ void RNSScreenShadowNode::appendChild(
               headerConfigChild->getProps());
 
       // The native CustomToolbar only pads itself with the top inset when
-      // `legacyTopInsetBehavior || consumeTopInset` holds (see CustomToolbar.kt).
-      // The dummy measurement must mirror that condition, otherwise the header
-      // height is over-reported by the top inset whenever a header opts out via
-      // `disableTopInsetApplication` (consumeTopInset == false).
+      // `legacyTopInsetBehavior || consumeTopInset` holds (see
+      // CustomToolbar.kt). The dummy measurement must mirror that condition,
+      // otherwise the header height is over-reported by the top inset whenever
+      // a header opts out via `disableTopInsetApplication` (consumeTopInset ==
+      // false).
       const bool applyTopInset =
           headerProps.legacyTopInsetBehavior || headerProps.consumeTopInset;
 

package/cpp/legacy/RNSScreenRemovalListener.cpp

@@ -1,12 +1,42 @@
 #include "RNSScreenRemovalListener.h"
 #include <react/renderer/mounting/ShadowViewMutation.h>
+#include <utility>
 using namespace facebook::react;
 
+uint64_t RNSScreenRemovalListener::setListener(
+    std::function<void(int)> &&listenerFunction) {
+  std::lock_guard<std::mutex> lock(listenerMutex_);
+  listenerFunction_ = std::move(listenerFunction);
+  return ++currentToken_;
+}
+
+void RNSScreenRemovalListener::clearListener(uint64_t token) {
+  std::lock_guard<std::mutex> lock(listenerMutex_);
+  if (token == currentToken_) {
+    listenerFunction_ = nullptr;
+  }
+}
+
 std::optional<MountingTransaction> RNSScreenRemovalListener::pullTransaction(
     SurfaceId surfaceId,
     MountingTransaction::Number transactionNumber,
     const TransactionTelemetry &telemetry,
     ShadowViewMutationList mutations) const {
+  // Copy under the lock, invoke outside it: the callback makes a JNI call and
+  // must not run while holding a lock the module thread also takes.
+  std::function<void(int)> listener;
+  {
+    std::lock_guard<std::mutex> lock(listenerMutex_);
+    listener = listenerFunction_;
+  }
+
+  if (!listener) {
+    // Orphaned between module teardown and the next install: pass the
+    // transaction through untouched.
+    return MountingTransaction{
+        surfaceId, transactionNumber, std::move(mutations), telemetry};
+  }
+
   for (const ShadowViewMutation &mutation : mutations) {
     // When using RNSModalScreen on Android it should be added here.
     if (mutation.type == ShadowViewMutation::Type::Remove &&
@@ -16,7 +46,7 @@ std::optional<MountingTransaction> RNSScreenRemovalListener::pullTransaction(
       // 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);
+      listener(mutation.oldChildShadowView.tag);
     }
   }
 

package/cpp/legacy/RNSScreenRemovalListener.h

@@ -4,12 +4,22 @@
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/ShadowView.h>
 
+#include <cstdint>
+#include <functional>
+#include <mutex>
+
 using namespace facebook::react;
 
 struct RNSScreenRemovalListener : public MountingOverrideDelegate {
-  std::function<void(int)> listenerFunction_;
-  RNSScreenRemovalListener(std::function<void(int)> &&listenerFunction_)
-      : listenerFunction_(std::move(listenerFunction_)) {}
+  RNSScreenRemovalListener() = default;
+
+  // RN core lacks a `removeMountingOverrideDelegate` API, so this instance is
+  // process-immortal and swaps its callback instead of being replaced. The
+  // ownership token keeps a stale proxy's teardown from clearing a newer
+  // proxy's listener.
+  // See https://github.com/software-mansion/react-native-screens/pull/4413
+  uint64_t setListener(std::function<void(int)> &&listenerFunction);
+  void clearListener(uint64_t token);
 
   bool shouldOverridePullTransaction() const override;
   std::optional<MountingTransaction> pullTransaction(
@@ -17,4 +27,9 @@ struct RNSScreenRemovalListener : public MountingOverrideDelegate {
       MountingTransaction::Number number,
       const TransactionTelemetry &telemetry,
       ShadowViewMutationList mutations) const override;
+
+ private:
+  mutable std::mutex listenerMutex_;
+  std::function<void(int)> listenerFunction_;
+  uint64_t currentToken_{0};
 };

package/ios/RNSEnums.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#import <UIKit/UIKit.h>
+
 typedef NS_ENUM(NSInteger, RNSScrollEdgeEffect) {
   RNSScrollEdgeEffectAutomatic,
   RNSScrollEdgeEffectHard,
@@ -54,8 +56,6 @@ typedef NS_ENUM(NSInteger, RNSTabsIconType) {
   RNSTabsIconTypeXcasset,
 };
 
-// TODO: investigate objc - swift interop and deduplicate this code
-// This enum needs to be compatible with the RNSOrientationSwift enum.
 typedef NS_ENUM(NSInteger, RNSOrientation) {
   RNSOrientationInherit,
   RNSOrientationAll,

package/ios/RNSOrientationProviding.h

@@ -4,8 +4,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-// TODO: investigate objc - swift interop and deduplicate this code
-// This class needs to be compatible with the RNSOrientationProvidingSwift.
 @protocol RNSOrientationProviding
 
 - (RNSOrientation)evaluateOrientation;

package/ios/RNSReactMountingTransactionObserving.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RNSReactMountingTransactionObserving
+
+- (void)reactMountingTransactionWillMount;
+
+- (void)reactMountingTransactionDidMount;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/conversion/RNSConversions.h

@@ -1,125 +1,24 @@
 #pragma once
 
 #if defined(__cplusplus)
-#import <React/RCTImageSource.h>
-#import <react/renderer/components/rnscreens/EventEmitters.h>
-#import <react/renderer/components/rnscreens/Props.h>
-#import <optional>
-#import "RNSDefines.h"
-#import "RNSEnums.h"
-#import "RNSTabsNavigationState.h"
-
+#import <UIKit/UIKit.h>
 #import <folly/dynamic.h>
+#import "RNSEnums.h"
 
 namespace rnscreens::conversion {
 
-namespace react = facebook::react;
-
 // copied from FollyConvert.mm
 id RNSConvertFollyDynamicToId(const folly::dynamic &dyn);
 
-std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromString(NSString *blurEffectString);
-
-UIBlurEffect *RNSUIBlurEffectFromString(NSString *blurEffectString);
-
-std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect);
-
-UIBlurEffect *RNSUIBlurEffectFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect);
-
-#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
-
-API_AVAILABLE(ios(26.0))
-UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabsHostTabBarMinimizeBehavior(
-    react::RNSTabsHostIOSTabBarMinimizeBehavior tabBarMinimizeBehavior);
-
-#endif // Check for iOS >= 26
-
-#if RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
-
-API_AVAILABLE(ios(18.0))
-UITabBarControllerMode UITabBarControllerModeFromRNSTabsHostTabBarControllerMode(
-    react::RNSTabsHostIOSTabBarControllerMode tabBarControllerMode);
-
-#endif // Check for iOS >= 18
-
-react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
-RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
-    RNSTabsNavigationStateRejectionReason reason);
-
-react::RNSTabsHostIOSEventEmitter::OnTabSelectedActionOrigin RNSOnTabSelectedActionOriginFromRNSTabsActionOrigin(
-    RNSTabsActionOrigin actionOrigin);
-
-RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType);
-
-RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
-    react::RNSTabsScreenIOSSystemItem systemItem);
-
-UITabBarSystemItem RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem);
-
-#if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
-
-API_AVAILABLE(ios(26.0))
-std::optional<react::RNSTabsBottomAccessoryEventEmitter::OnEnvironmentChangeEnvironment>
-RNSTabsBottomAccessoryOnEnvironmentChangePayloadFromUITabAccessoryEnvironment(UITabAccessoryEnvironment environment);
-
-RNSTabsBottomAccessoryEnvironment RNSTabsBottomAccessoryEnvironmentFromCppEquivalent(
-    react::RNSTabsBottomAccessoryContentEnvironment environment);
-
-#endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromTabsScreenCppEquivalent(
-    react::RNSTabsScreenIOSUserInterfaceStyle userInterfaceStyle);
-
-RCTImageSource *RCTImageSourceFromImageSourceAndIconType(const facebook::react::ImageSource *imageSource,
-                                                         RNSTabsIconType iconType);
-
-RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenIOSOrientation orientation);
-
 #if !TARGET_OS_TV
-UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(RNSOrientation orientation);
+UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(
+    RNSOrientation orientation);
 
-RNSOrientation RNSOrientationFromUIInterfaceOrientationMask(UIInterfaceOrientationMask orientationMask);
+// Currently unused in stack v5. Maybe remove after stopping support for v4.
+RNSOrientation RNSOrientationFromUIInterfaceOrientationMask(
+    UIInterfaceOrientationMask orientationMask);
 #endif // !TARGET_OS_TV
 
-UITraitEnvironmentLayoutDirection UITraitEnvironmentLayoutDirectionFromTabsHostCppEquivalent(
-    react::RNSTabsHostIOSLayoutDirection layoutDirection);
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSTabsHostIOSColorScheme colorScheme);
-
-#pragma mark SplitHost props
-
-UISplitViewControllerSplitBehavior SplitViewPreferredSplitBehaviorFromHostProp(
-    react::RNSSplitHostPreferredSplitBehavior behavior);
-
-UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(react::RNSSplitHostPrimaryEdge primaryEdge);
-
-UISplitViewControllerDisplayMode SplitViewPreferredDisplayModeFromHostProp(
-    react::RNSSplitHostPreferredDisplayMode displayMode);
-
-#if !TARGET_OS_TV
-UISplitViewControllerBackgroundStyle SplitViewPrimaryBackgroundStyleFromHostProp(
-    react::RNSSplitHostPrimaryBackgroundStyle primaryBackgroundStyle);
-#endif // !TARGET_OS_TV
-
-UISplitViewControllerDisplayModeButtonVisibility SplitViewDisplayModeButtonVisibilityFromHostProp(
-    react::RNSSplitHostDisplayModeButtonVisibility displayModeButtonVisibility);
-
-std::string UISplitViewControllerDisplayModeToString(UISplitViewControllerDisplayMode displayMode);
-
-std::optional<UISplitViewControllerColumn> SplitViewTopColumnForCollapsingFromHostProp(
-    react::RNSSplitHostTopColumnForCollapsing topColumnForCollapsing);
-
-RNSOrientation RNSOrientationFromRNSSplitHostOrientation(react::RNSSplitHostOrientation orientation);
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSSplitHostColorScheme colorScheme);
-
-#pragma mark SplitScreen props
-
-RNSSplitScreenColumnType RNSSplitScreenColumnTypeFromScreenProp(react::RNSSplitScreenColumnType columnType);
-
 }; // namespace rnscreens::conversion
 
-#import "RNSConversions-ScrollViewMarker.h"
-#import "RNSConversions-Stack.h"
-
 #endif // defined(__cplusplus)

package/ios/legacy/RNSBarButtonItem.mm

@@ -188,11 +188,18 @@ static UIMenuOptions RNSMakeUIMenuOptionsFromConfig(NSDictionary *config);
                  image = img;
                }];
 
-  return [UIMenu menuWithTitle:dict[@"title"]
-                         image:image
-                    identifier:nil
-                       options:RNSMakeUIMenuOptionsFromConfig(dict)
-                      children:elements];
+  UIMenu *menu = [UIMenu menuWithTitle:dict[@"title"]
+                                 image:image
+                            identifier:nil
+                               options:RNSMakeUIMenuOptionsFromConfig(dict)
+                              children:elements];
+
+  NSString *subtitle = dict[@"subtitle"];
+  if (subtitle != nil) {
+    menu.subtitle = subtitle;
+  }
+
+  return menu;
 }
 
 + (UIAction *)createActionItemFromConfig:(NSDictionary *)dict

package/ios/legacy/RNSFullWindowOverlay.mm

@@ -9,7 +9,7 @@
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <rnscreens/RNSFullWindowOverlayComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSFullWindowOverlayComponentDescriptor.h>
 
 @implementation RNSFullWindowOverlayContainer
 

package/ios/legacy/RNSModalScreen.mm

@@ -1,7 +1,7 @@
 #import "RNSModalScreen.h"
 
 #import <React/RCTFabricComponentsPlugins.h>
-#import <rnscreens/RNSModalScreenComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSModalScreenComponentDescriptor.h>
 
 @implementation RNSModalScreen
 

package/ios/legacy/RNSScreen.h

@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)calculateAndNotifyHeaderHeightChangeIsModal:(BOOL)isModal;
 - (void)notifyFinishTransitioning;
 - (RNSScreenView *)screenView;
-- (void)setViewToSnapshot;
+- (void)addSnapshotToView;
 - (CGFloat)calculateHeaderHeightIsModal:(BOOL)isModal;
 - (BOOL)isRemovedFromParent;
 - (void)notifyPresentedControllerDismissed;
@@ -87,9 +87,16 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) RNSScrollEdgeEffect rightScrollEdgeEffect;
 @property (nonatomic) RNSScrollEdgeEffect topScrollEdgeEffect;
 @property (nonatomic, readwrite) BOOL synchronousShadowStateUpdatesEnabled;
+@property (nonatomic, readwrite) BOOL iosOrientationInheritanceFixEnabled;
 
 @property (nonatomic, retain) NSNumber *transitionDuration;
 @property (nonatomic, readonly) BOOL dismissed;
+
+/**
+ * Whether React has already deleted this component. The view may still be part of the view
+ * hierarchy at that point, backing the remainder of an ongoing native transition.
+ */
+@property (nonatomic, readonly, getter=isInvalidated) BOOL invalidated;
 @property (nonatomic) BOOL hideKeyboardOnSwipe;
 @property (nonatomic) BOOL customAnimationOnSwipe;
 @property (nonatomic) BOOL preventNativeDismiss;