react-native-screens 4.24.0 → 4.25.0-beta.1

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

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/graphics/Float.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif // ANDROID
+
+namespace facebook::react {
+
+class JSI_EXPORT RNSStackHeaderSubviewState final {
+ public:
+  using Shared = std::shared_ptr<const RNSStackHeaderSubviewState>;
+
+  RNSStackHeaderSubviewState() {}
+
+#ifdef ANDROID
+  RNSStackHeaderSubviewState(
+      RNSStackHeaderSubviewState const &previousState,
+      folly::dynamic data)
+      : contentOffset(
+            Point{
+                (Float)data["contentOffsetX"].getDouble(),
+                (Float)data["contentOffsetY"].getDouble()}) {}
+
+  Point contentOffset{};
+
+  folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  }
+#endif // ANDROID
+};
+
+} // namespace facebook::react

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

@@ -0,0 +1,42 @@
+#pragma once
+
+#ifdef ANDROID
+#include <fbjni/fbjni.h>
+#endif // ANDROID
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include "RNSStackScreenShadowNode.h"
+
+namespace facebook::react {
+
+class RNSStackScreenComponentDescriptor final
+    : public ConcreteComponentDescriptor<RNSStackScreenShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+
+  void adopt(ShadowNode &shadowNode) const override {
+#ifdef ANDROID
+    react_native_assert(dynamic_cast<RNSStackScreenShadowNode *>(&shadowNode));
+    auto &screenShadowNode =
+        static_cast<RNSStackScreenShadowNode &>(shadowNode);
+    react_native_assert(
+        dynamic_cast<YogaLayoutableShadowNode *>(&screenShadowNode));
+    auto &layoutableShadowNode =
+        static_cast<YogaLayoutableShadowNode &>(screenShadowNode);
+
+    auto state =
+        std::static_pointer_cast<const RNSStackScreenShadowNode::ConcreteState>(
+            shadowNode.getState());
+    auto stateData = state->getData();
+
+    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
+      layoutableShadowNode.setSize(
+          Size{stateData.frameSize.width, stateData.frameSize.height});
+    }
+#endif // ANDROID
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSStackScreenShadowNode.cpp

@@ -0,0 +1,15 @@
+#include "RNSStackScreenShadowNode.h"
+
+namespace facebook::react {
+
+extern const char RNSStackScreenComponentName[] = "RNSStackScreen";
+
+#ifdef ANDROID
+Point RNSStackScreenShadowNode::getContentOriginOffset(
+    bool /*includeTransform*/) const {
+  auto stateData = getStateData();
+  return stateData.contentOffset;
+}
+#endif // ANDROID
+
+} // namespace facebook::react

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

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/rnscreens/EventEmitters.h>
+#include <react/renderer/components/rnscreens/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include "RNSStackScreenState.h"
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char RNSStackScreenComponentName[];
+
+class JSI_EXPORT RNSStackScreenShadowNode final
+    : public ConcreteViewShadowNode<
+          RNSStackScreenComponentName,
+          RNSStackScreenProps,
+          RNSStackScreenEventEmitter,
+          RNSStackScreenState> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+  using StateData = ConcreteViewShadowNode::ConcreteStateData;
+
+#pragma mark - ShadowNode overrides
+
+#ifdef ANDROID
+  Point getContentOriginOffset(bool includeTransform) const override;
+#endif // ANDROID
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSStackScreenState.cpp

@@ -0,0 +1,13 @@
+#include "RNSStackScreenState.h"
+
+namespace facebook::react {
+
+#ifdef ANDROID
+folly::dynamic RNSStackScreenState::getDynamic() const {
+  return folly::dynamic::object("frameWidth", frameSize.width)(
+      "frameHeight", frameSize.height)("contentOffsetX", contentOffset.x)(
+      "contentOffsetY", contentOffset.y);
+}
+#endif // ANDROID
+
+} // namespace facebook::react

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

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/graphics/Float.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif // ANDROID
+
+namespace facebook::react {
+
+class JSI_EXPORT RNSStackScreenState final {
+ public:
+  using Shared = std::shared_ptr<const RNSStackScreenState>;
+
+  RNSStackScreenState() {};
+
+#ifdef ANDROID
+  RNSStackScreenState(
+      RNSStackScreenState const &previousState,
+      folly::dynamic data)
+      : frameSize(
+            Size{
+                (Float)data["frameWidth"].getDouble(),
+                (Float)data["frameHeight"].getDouble()}),
+        contentOffset(
+            Point{
+                (Float)data["contentOffsetX"].getDouble(),
+                (Float)data["contentOffsetY"].getDouble()}) {};
+
+  Size frameSize{};
+  Point contentOffset{};
+
+  folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif // ANDROID
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSTabsBottomAccessoryShadowNode.cpp

@@ -11,4 +11,21 @@ Point RNSTabsBottomAccessoryShadowNode::getContentOriginOffset(
   return stateData.contentOffset;
 }
 
+void RNSTabsBottomAccessoryShadowNode::layout(
+    facebook::react::LayoutContext layoutContext) {
+  YogaLayoutableShadowNode::layout(layoutContext);
+  applyFrameCorrections();
+}
+
+// When calculating content origin offset for bottom accessory we rely on the
+// fact that it's positioned at (0,0). In RTL, this is not the case. As we don't
+// want to change `direction` (as this change would propagate further down the
+// hierarchy), we force x=0 in the shadow node. If this approach turns out to be
+// problematic, we can consider adjusting content origin offset to account for
+// the "incorrect" layout in RTL.
+void RNSTabsBottomAccessoryShadowNode::applyFrameCorrections() {
+  ensureUnsealed();
+  layoutMetrics_.frame.origin.x = 0;
+}
+
 } // namespace facebook::react

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

@@ -4,6 +4,7 @@
 #include <react/renderer/components/rnscreens/EventEmitters.h>
 #include <react/renderer/components/rnscreens/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/core/LayoutContext.h>
 #include "RNSTabsBottomAccessoryState.h"
 
 namespace facebook::react {
@@ -20,7 +21,15 @@ class JSI_EXPORT RNSTabsBottomAccessoryShadowNode final
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
   using StateData = ConcreteViewShadowNode::ConcreteStateData;
 
+#pragma mark - ShadowNode overrides
+
   Point getContentOriginOffset(bool includeTransform) const override;
+
+  void layout(LayoutContext layoutContext) override;
+
+#pragma mark - Custom interface
+ private:
+  void applyFrameCorrections();
 };
 
 } // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSTabsHostShadowNode.cpp

@@ -2,7 +2,11 @@
 
 namespace facebook::react {
 
-extern const char RNSTabsHostComponentName[] = "RNSTabsHost";
+#if !defined(ANDROID)
+extern const char RNSTabsHostComponentName[] = "RNSTabsHostIOS";
+#else // !defined(ANDROID)
+extern const char RNSTabsHostComponentName[] = "RNSTabsHostAndroid";
+#endif // !defined(ANDROID)
 
 #if !defined(ANDROID)
 void RNSTabsHostShadowNode::setImageLoader(std::weak_ptr<void> imageLoader) {
@@ -15,5 +19,5 @@ RNSTabsHostShadowNode::StateData &RNSTabsHostShadowNode::getStateDataMutable() {
   ensureUnsealed();
   return const_cast<RNSTabsHostShadowNode::StateData &>(getStateData());
 }
-#endif // !ANDROID
+#endif // !defined(ANDROID)
 } // namespace facebook::react

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

@@ -12,8 +12,13 @@ JSI_EXPORT extern const char RNSTabsHostComponentName[];
 
 class JSI_EXPORT RNSTabsHostShadowNode final : public ConcreteViewShadowNode<
                                                    RNSTabsHostComponentName,
-                                                   RNSTabsHostProps,
-                                                   RNSTabsHostEventEmitter,
+#if !defined(ANDROID)
+                                                   RNSTabsHostIOSProps,
+                                                   RNSTabsHostIOSEventEmitter,
+#else // !defined(ANDROID)
+                                                   RNSTabsHostAndroidProps,
+                                                   RNSTabsHostAndroidEventEmitter,
+#endif // !defined(ANDROID)
                                                    RNSTabsHostState> {
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;

package/ios/RCTConvert+RNScreens.h

@@ -1,15 +1,5 @@
 #pragma once
 
-#if !RCT_NEW_ARCH_ENABLED
-
-#import <React/RCTConvert.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RCTConvert (RNScreens)
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // !RCT_NEW_ARCH_ENABLED
+// This file is intentionally empty — all content was Paper-only and has been
+// removed as part of the Paper architecture removal. The file will be deleted
+// at the very end of the removal.

package/ios/RCTConvert+RNScreens.mm

@@ -1,69 +1,4 @@
 #import "RCTConvert+RNScreens.h"
 
-#if !RCT_NEW_ARCH_ENABLED
-
-#import "RNSEnums.h"
-
-@implementation RCTConvert (RNScreens)
-
-+ (NSMutableDictionary *)blurEffectsForIOSVersion
-{
-  NSMutableDictionary *blurEffects = [NSMutableDictionary new];
-  [blurEffects addEntriesFromDictionary:@{
-    @"none" : @(RNSBlurEffectStyleNone),
-    @"systemDefault" : @(RNSBlurEffectStyleSystemDefault),
-    @"extraLight" : @(RNSBlurEffectStyleExtraLight),
-    @"light" : @(RNSBlurEffectStyleLight),
-    @"dark" : @(RNSBlurEffectStyleDark),
-    @"regular" : @(RNSBlurEffectStyleRegular),
-    @"prominent" : @(RNSBlurEffectStyleProminent),
-  }];
-
-#if !TARGET_OS_TV
-  [blurEffects addEntriesFromDictionary:@{
-    @"systemUltraThinMaterial" : @(RNSBlurEffectStyleSystemUltraThinMaterial),
-    @"systemThinMaterial" : @(RNSBlurEffectStyleSystemThinMaterial),
-    @"systemMaterial" : @(RNSBlurEffectStyleSystemMaterial),
-    @"systemThickMaterial" : @(RNSBlurEffectStyleSystemThickMaterial),
-    @"systemChromeMaterial" : @(RNSBlurEffectStyleSystemChromeMaterial),
-    @"systemUltraThinMaterialLight" : @(RNSBlurEffectStyleSystemUltraThinMaterialLight),
-    @"systemThinMaterialLight" : @(RNSBlurEffectStyleSystemThinMaterialLight),
-    @"systemMaterialLight" : @(RNSBlurEffectStyleSystemMaterialLight),
-    @"systemThickMaterialLight" : @(RNSBlurEffectStyleSystemThickMaterialLight),
-    @"systemChromeMaterialLight" : @(RNSBlurEffectStyleSystemChromeMaterialLight),
-    @"systemUltraThinMaterialDark" : @(RNSBlurEffectStyleSystemUltraThinMaterialDark),
-    @"systemThinMaterialDark" : @(RNSBlurEffectStyleSystemThinMaterialDark),
-    @"systemMaterialDark" : @(RNSBlurEffectStyleSystemMaterialDark),
-    @"systemThickMaterialDark" : @(RNSBlurEffectStyleSystemThickMaterialDark),
-    @"systemChromeMaterialDark" : @(RNSBlurEffectStyleSystemChromeMaterialDark),
-  }];
-#endif
-  return blurEffects;
-}
-
-RCT_ENUM_CONVERTER(RNSBlurEffectStyle, ([self blurEffectsForIOSVersion]), RNSBlurEffectStyleSystemDefault, integerValue)
-
-RCT_ENUM_CONVERTER(
-    RNSOptionalBoolean,
-    (@{
-      @"undefined" : @(RNSOptionalBooleanUndefined),
-      @"true" : @(RNSOptionalBooleanTrue),
-      @"false" : @(RNSOptionalBooleanFalse),
-    }),
-    RNSOptionalBooleanUndefined,
-    integerValue)
-
-RCT_ENUM_CONVERTER(
-    RNSScrollEdgeEffect,
-    (@{
-      @"automatic" : @(RNSScrollEdgeEffectAutomatic),
-      @"hard" : @(RNSScrollEdgeEffectHard),
-      @"soft" : @(RNSScrollEdgeEffectSoft),
-      @"hidden" : @(RNSScrollEdgeEffectHidden),
-    }),
-    RNSScrollEdgeEffectAutomatic,
-    integerValue)
-
-@end
-
-#endif // !RCT_NEW_ARCH_ENABLED
+// This file is intentionally empty — all content was Paper-only and has been removed
+// as part of the Paper architecture removal. The file will be deleted at the very end of the removal.

package/ios/RCTImageComponentView+RNSScreenStackHeaderConfig.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 
 #include <React/RCTImageComponentView.h>
 
@@ -10,4 +10,4 @@
 
 @end
 
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RCTImageComponentView+RNSScreenStackHeaderConfig.mm

@@ -1,5 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #include "RCTImageComponentView+RNSScreenStackHeaderConfig.h"
 
 @implementation RCTImageComponentView (RNSScreenStackHeaderConfig)
@@ -10,5 +8,3 @@
 }
 
 @end
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSConvert.h

@@ -1,18 +1,18 @@
 #pragma once
 
 #import <UIKit/UIKit.h>
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 #import <react/renderer/components/rnscreens/Props.h>
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 #import "RNSEnums.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 namespace react = facebook::react;
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 @interface RNSConvert : NSObject
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 
 + (UISemanticContentAttribute)UISemanticContentAttributeFromCppEquivalent:
     (react::RNSScreenStackHeaderConfigDirection)direction;
@@ -71,7 +71,7 @@ namespace react = facebook::react;
     (react::RNSScreenTopScrollEdgeEffect)edgeEffect;
 + (id)idFromFollyDynamic:(const folly::dynamic &)dyn;
 
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 /// This method fails (by assertion) when `blurEffect == RNSBlurEffectStyleNone` or `blurEffect ==
 /// RNSBlurEffectStyleSystemDefault` which have no counter parts in the UIKit types.

package/ios/RNSConvert.mm

@@ -1,13 +1,7 @@
 #import "RNSConvert.h"
 #import <React/RCTLog.h>
 
-#ifndef RCT_NEW_ARCH_ENABLED
-#import <React/RCTAssert.h>
-#endif // !RCT_NEW_ARCH_ENABLED
-
 @implementation RNSConvert
-
-#ifdef RCT_NEW_ARCH_ENABLED
 + (UISemanticContentAttribute)UISemanticContentAttributeFromCppEquivalent:
     (react::RNSScreenStackHeaderConfigDirection)direction
 {
@@ -386,17 +380,9 @@
   return nil;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED
-
 + (UIBlurEffectStyle)tryConvertRNSBlurEffectStyleToUIBlurEffectStyle:(RNSBlurEffectStyle)blurEffect
 {
-#ifdef RCT_NEW_ARCH_ENABLED
   react_native_assert(blurEffect != RNSBlurEffectStyleNone && blurEffect != RNSBlurEffectStyleSystemDefault);
-#else
-  RCTAssert(
-      blurEffect != RNSBlurEffectStyleNone && blurEffect != RNSBlurEffectStyleSystemDefault,
-      @"RNSBlurEffectStyleNone and RNSBlurEffectStyleSystemDefault variants are not convertible to UIBlurEffectStyle");
-#endif // RCT_NEW_ARCH_ENABLED
 
   // Cast safety: RNSBlurEffectStyle is defined in such way that its values map 1:1 with
   // UIBlurEffectStyle, except RNSBlurEffectStyleNone and RNSBlurEffectStyleSystemDefault which are excluded above.

package/ios/RNSEnums.h

@@ -85,9 +85,9 @@ typedef NS_ENUM(NSInteger, RNSSearchBarPlacement) {
   RNSSearchBarPlacementIntegratedCentered,
 };
 
-typedef NS_ENUM(NSInteger, RNSSplitViewScreenColumnType) {
-  RNSSplitViewScreenColumnTypeColumn,
-  RNSSplitViewScreenColumnTypeInspector,
+typedef NS_ENUM(NSInteger, RNSSplitScreenColumnType) {
+  RNSSplitScreenColumnTypeColumn,
+  RNSSplitScreenColumnTypeInspector,
 };
 
 // Redefinition of UIBlurEffectStyle. We need to represent additional cases of `None` and `SystemDefault`.

package/ios/RNSFullWindowOverlay.h

@@ -1,17 +1,11 @@
 #pragma once
 
 #import <React/RCTViewManager.h>
+#import "RNSReactBaseView.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTInvalidating.h>
-#import <React/RCTView.h>
-#endif
-
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 namespace react = facebook::react;
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 @interface RNSFullWindowOverlayManager : RCTViewManager
 
@@ -21,18 +15,13 @@ namespace react = facebook::react;
 
 @end
 
-@interface RNSFullWindowOverlay :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView
-#else
-    RCTView <RCTInvalidating>
-#endif // RCT_NEW_ARCH_ENABLED
+@interface RNSFullWindowOverlay : RNSReactBaseView
 
 @property (nonatomic) BOOL accessibilityContainerViewIsModal;
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 @property (nonatomic) react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 @end

package/ios/RNSFullWindowOverlay.mm

@@ -3,7 +3,6 @@
 #import "RNSDefines.h"
 #import "RNSFullWindowOverlay.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTSurfaceTouchHandler.h>
@@ -11,9 +10,6 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import <rnscreens/RNSFullWindowOverlayComponentDescriptor.h>
-#else
-#import <React/RCTTouchHandler.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSFullWindowOverlayContainer
 
@@ -70,23 +66,11 @@
 @end
 
 @implementation RNSFullWindowOverlay {
-  __weak RCTBridge *_bridge;
   RNSFullWindowOverlayContainer *_container;
   CGRect _reactFrame;
-#ifdef RCT_NEW_ARCH_ENABLED
   RCTSurfaceTouchHandler *_touchHandler;
-#else
-  RCTTouchHandler *_touchHandler;
-#endif // RCT_NEW_ARCH_ENABLED
 }
 
-// Needed because of this: https://github.com/facebook/react-native/pull/37274
-+ (void)load
-{
-  [super load];
-}
-
-#ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)init
 {
   if (self = [super init]) {
@@ -96,17 +80,6 @@
   }
   return self;
 }
-#else
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-{
-  if (self = [super init]) {
-    _bridge = bridge;
-    [self initCommonProps];
-  }
-
-  return self;
-}
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)initCommonProps
 {
@@ -154,11 +127,7 @@
       UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, _container);
     }
     if (_touchHandler == nil) {
-#ifdef RCT_NEW_ARCH_ENABLED
       _touchHandler = [RCTSurfaceTouchHandler new];
-#else
-      _touchHandler = [[RCTTouchHandler alloc] initWithBridge:_bridge];
-#endif
     }
     [_touchHandler attachToView:_container];
 
@@ -193,7 +162,6 @@
   }
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #pragma mark - Fabric Specific
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
@@ -228,7 +196,7 @@ RNS_IGNORE_SUPER_CALL_BEGIN
 {
   CGRect frame = RCTCGRectFromRect(layoutMetrics.frame);
 
-  // Due to view flattening on new architecture there are situations
+  // Due to view flattening there are situations
   // when we receive frames with origin different from (0, 0).
   // We account for this frame manipulation in shadow node by setting
   // RootNodeKind trait for the shadow node making state consistent
@@ -253,44 +221,23 @@ RNS_IGNORE_SUPER_CALL_END
   [super updateProps:props oldProps:oldProps];
 }
 
-#else
-#pragma mark - Paper specific
-
-- (void)reactSetFrame:(CGRect)frame
-{
-  _reactFrame = frame;
-  [_container setFrame:frame];
-}
+#pragma mark - Dynamic frameworks support
 
-- (void)invalidate
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
 {
-  [_container removeFromSuperview];
-  _container = nil;
+  [super load];
 }
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
 Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void)
 {
   return RNSFullWindowOverlay.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSFullWindowOverlayManager
 
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_VIEW_PROPERTY(accessibilityContainerViewIsModal, BOOL)
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-- (UIView *)view
-{
-  return [[RNSFullWindowOverlay alloc] initWithBridge:self.bridge];
-}
-#endif // RCT_NEW_ARCH_ENABLED
-
 @end