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

package/ios/gamma/{split-view/RNSSplitViewHostComponentView.mm → split/RNSSplitHostComponentView.mm}

@@ -1,4 +1,4 @@
-#import "RNSSplitViewHostComponentView.h"
+#import "RNSSplitHostComponentView.h"
 #import <React/RCTAssert.h>
 #import <React/RCTMountingTransactionObserving.h>
 #import <React/UIView+React.h>
@@ -7,7 +7,7 @@
 
 #import "RNSConversions.h"
 #import "RNSDefines.h"
-#import "RNSSplitViewScreenComponentView.h"
+#import "RNSSplitScreenComponentView.h"
 #import "Swift-Bridging.h"
 
 namespace react = facebook::react;
@@ -17,19 +17,19 @@ static const CGFloat epsilon = 1e-6;
 #define COLUMN_METRIC_CHANGED(OLD, NEW, PROPERTY_NAME, EPSILON) \
   (fabs((OLD).columnMetrics.PROPERTY_NAME - (NEW).columnMetrics.PROPERTY_NAME) > (EPSILON))
 
-@interface RNSSplitViewHostComponentView () <RCTMountingTransactionObserving, RCTRNSSplitViewHostViewProtocol>
+@interface RNSSplitHostComponentView () <RCTMountingTransactionObserving, RCTRNSSplitHostViewProtocol>
 @end
 
-@implementation RNSSplitViewHostComponentView {
-  RNSSplitViewHostComponentEventEmitter *_Nonnull _reactEventEmitter;
-  RNSSplitViewHostController *_Nonnull _controller;
-  NSMutableArray<RNSSplitViewScreenComponentView *> *_Nonnull _reactSubviews;
+@implementation RNSSplitHostComponentView {
+  RNSSplitHostComponentEventEmitter *_Nonnull _reactEventEmitter;
+  RNSSplitHostController *_Nonnull _controller;
+  NSMutableArray<RNSSplitScreenComponentView *> *_Nonnull _reactSubviews;
 
   bool _hasModifiedReactSubviewsInCurrentTransaction;
-  bool _needsSplitViewAppearanceUpdate;
-  bool _needsSplitViewSecondaryScreenNavBarUpdate;
-  bool _needsSplitViewDisplayModeUpdate;
-  bool _needsSplitViewOrientationUpdate;
+  bool _needsSplitAppearanceUpdate;
+  bool _needsSplitSecondaryScreenNavBarUpdate;
+  bool _needsSplitDisplayModeUpdate;
+  bool _needsSplitOrientationUpdate;
   // We need this information to warn users about dynamic changes to behavior being currently unsupported.
   bool _isShowSecondaryToggleButtonSet;
 }
@@ -46,19 +46,19 @@ static const CGFloat epsilon = 1e-6;
 {
   [self resetProps];
 
-  _reactEventEmitter = [RNSSplitViewHostComponentEventEmitter new];
+  _reactEventEmitter = [RNSSplitHostComponentEventEmitter new];
 
   _hasModifiedReactSubviewsInCurrentTransaction = false;
-  _needsSplitViewAppearanceUpdate = false;
-  _needsSplitViewSecondaryScreenNavBarUpdate = false;
-  _needsSplitViewDisplayModeUpdate = false;
-  _needsSplitViewOrientationUpdate = false;
+  _needsSplitAppearanceUpdate = false;
+  _needsSplitSecondaryScreenNavBarUpdate = false;
+  _needsSplitDisplayModeUpdate = false;
+  _needsSplitOrientationUpdate = false;
   _reactSubviews = [NSMutableArray new];
 }
 
 - (void)resetProps
 {
-  static const auto defaultProps = std::make_shared<const react::RNSSplitViewHostProps>();
+  static const auto defaultProps = std::make_shared<const react::RNSSplitHostProps>();
   _props = defaultProps;
 
   _preferredSplitBehavior = UISplitViewControllerSplitBehaviorAutomatic;
@@ -99,8 +99,8 @@ static const CGFloat epsilon = 1e-6;
 - (int)getNumberOfColumns
 {
   int numberOfColumns = 0;
-  for (RNSSplitViewScreenComponentView *component in _reactSubviews) {
-    if (component.columnType == RNSSplitViewScreenColumnTypeColumn) {
+  for (RNSSplitScreenComponentView *component in _reactSubviews) {
+    if (component.columnType == RNSSplitScreenColumnTypeColumn) {
       numberOfColumns++;
     }
   }
@@ -115,8 +115,7 @@ static const CGFloat epsilon = 1e-6;
   if (_controller == nil) {
     int numberOfColumns = [self getNumberOfColumns];
 
-    _controller = [[RNSSplitViewHostController alloc] initWithSplitViewHostComponentView:self
-                                                                         numberOfColumns:numberOfColumns];
+    _controller = [[RNSSplitHostController alloc] initWithSplitHostComponentView:self numberOfColumns:numberOfColumns];
   }
 }
 
@@ -124,7 +123,7 @@ static const CGFloat epsilon = 1e-6;
 {
   [self setupController];
   RCTAssert(_controller != nil, @"[RNScreens] Controller must not be nil while attaching to window");
-  [self requestSplitViewHostControllerForAppearanceUpdate];
+  [self requestSplitHostControllerForAppearanceUpdate];
   [self reactAddControllerToClosestParent:_controller];
 }
 
@@ -146,17 +145,17 @@ static const CGFloat epsilon = 1e-6;
 }
 
 RNS_IGNORE_SUPER_CALL_BEGIN
-- (nonnull NSMutableArray<RNSSplitViewScreenComponentView *> *)reactSubviews
+- (nonnull NSMutableArray<RNSSplitScreenComponentView *> *)reactSubviews
 {
   RCTAssert(
       _reactSubviews != nil,
-      @"[RNScreens] Attempt to work with non-initialized list of RNSSplitViewScreenComponentView subviews. (for: %@)",
+      @"[RNScreens] Attempt to work with non-initialized list of RNSSplitScreenComponentView subviews. (for: %@)",
       self);
   return _reactSubviews;
 }
 RNS_IGNORE_SUPER_CALL_END
 
-- (nonnull RNSSplitViewHostController *)splitViewHostController
+- (nonnull RNSSplitHostController *)splitHostController
 {
   RCTAssert(_controller != nil, @"[RNScreens] Controller must not be nil");
   return _controller;
@@ -167,13 +166,13 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   RCTAssert(
-      [childComponentView isKindOfClass:RNSSplitViewScreenComponentView.class],
+      [childComponentView isKindOfClass:RNSSplitScreenComponentView.class],
       @"[RNScreens] Attempt to mount child of unsupported type: %@, expected %@",
       childComponentView.class,
-      RNSSplitViewScreenComponentView.class);
+      RNSSplitScreenComponentView.class);
 
-  auto *childScreen = static_cast<RNSSplitViewScreenComponentView *>(childComponentView);
-  childScreen.splitViewHost = self;
+  auto *childScreen = static_cast<RNSSplitScreenComponentView *>(childComponentView);
+  childScreen.splitHost = self;
   [_reactSubviews insertObject:childScreen atIndex:index];
   _hasModifiedReactSubviewsInCurrentTransaction = true;
 }
@@ -181,20 +180,20 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   RCTAssert(
-      [childComponentView isKindOfClass:RNSSplitViewScreenComponentView.class],
+      [childComponentView isKindOfClass:RNSSplitScreenComponentView.class],
       @"[RNScreens] Attempt to unmount child of unsupported type: %@, expected %@",
       childComponentView.class,
-      RNSSplitViewScreenComponentView.class);
+      RNSSplitScreenComponentView.class);
 
-  auto *childScreen = static_cast<RNSSplitViewScreenComponentView *>(childComponentView);
-  childScreen.splitViewHost = nil;
+  auto *childScreen = static_cast<RNSSplitScreenComponentView *>(childComponentView);
+  childScreen.splitHost = nil;
   [_reactSubviews removeObject:childScreen];
   _hasModifiedReactSubviewsInCurrentTransaction = true;
 }
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return react::concreteComponentDescriptorProvider<react::RNSSplitViewHostComponentDescriptor>();
+  return react::concreteComponentDescriptorProvider<react::RNSSplitHostComponentDescriptor>();
 }
 
 + (BOOL)shouldBeRecycled
@@ -207,112 +206,112 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)updateProps:(const facebook::react::Props::Shared &)props
            oldProps:(const facebook::react::Props::Shared &)oldProps
 {
-  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSSplitViewHostProps>(_props);
-  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSSplitViewHostProps>(props);
+  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSSplitHostProps>(_props);
+  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSSplitHostProps>(props);
 
   if (oldComponentProps.preferredSplitBehavior != newComponentProps.preferredSplitBehavior) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _preferredSplitBehavior =
         rnscreens::conversion::SplitViewPreferredSplitBehaviorFromHostProp(newComponentProps.preferredSplitBehavior);
   }
 
   if (oldComponentProps.primaryEdge != newComponentProps.primaryEdge) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _primaryEdge = rnscreens::conversion::SplitViewPrimaryEdgeFromHostProp(newComponentProps.primaryEdge);
   }
 
   if (oldComponentProps.preferredDisplayMode != newComponentProps.preferredDisplayMode) {
-    _needsSplitViewAppearanceUpdate = true;
-    _needsSplitViewDisplayModeUpdate = true;
+    _needsSplitAppearanceUpdate = true;
+    _needsSplitDisplayModeUpdate = true;
     _preferredDisplayMode =
         rnscreens::conversion::SplitViewPreferredDisplayModeFromHostProp(newComponentProps.preferredDisplayMode);
   }
 
 #if !TARGET_OS_TV
   if (oldComponentProps.primaryBackgroundStyle != newComponentProps.primaryBackgroundStyle) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _primaryBackgroundStyle =
         rnscreens::conversion::SplitViewPrimaryBackgroundStyleFromHostProp(newComponentProps.primaryBackgroundStyle);
   }
 #endif // !TARGET_OS_TV
 
   if (oldComponentProps.presentsWithGesture != newComponentProps.presentsWithGesture) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _presentsWithGesture = newComponentProps.presentsWithGesture;
   }
 
   if (oldComponentProps.showSecondaryToggleButton != newComponentProps.showSecondaryToggleButton) {
-    _needsSplitViewAppearanceUpdate = true;
-    _needsSplitViewSecondaryScreenNavBarUpdate = true;
+    _needsSplitAppearanceUpdate = true;
+    _needsSplitSecondaryScreenNavBarUpdate = true;
     _showSecondaryToggleButton = newComponentProps.showSecondaryToggleButton;
   }
 
   if (oldComponentProps.showInspector != newComponentProps.showInspector) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _showInspector = newComponentProps.showInspector;
   }
 
   if (oldComponentProps.displayModeButtonVisibility != newComponentProps.displayModeButtonVisibility) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _displayModeButtonVisibility = rnscreens::conversion::SplitViewDisplayModeButtonVisibilityFromHostProp(
         newComponentProps.displayModeButtonVisibility);
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, minimumPrimaryColumnWidth, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _minimumPrimaryColumnWidth = newComponentProps.columnMetrics.minimumPrimaryColumnWidth;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, maximumPrimaryColumnWidth, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _maximumPrimaryColumnWidth = newComponentProps.columnMetrics.maximumPrimaryColumnWidth;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, preferredPrimaryColumnWidthOrFraction, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _preferredPrimaryColumnWidthOrFraction = newComponentProps.columnMetrics.preferredPrimaryColumnWidthOrFraction;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, minimumSupplementaryColumnWidth, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _minimumSupplementaryColumnWidth = newComponentProps.columnMetrics.minimumSupplementaryColumnWidth;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, maximumSupplementaryColumnWidth, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _maximumSupplementaryColumnWidth = newComponentProps.columnMetrics.maximumSupplementaryColumnWidth;
   }
 
   if (COLUMN_METRIC_CHANGED(
           oldComponentProps, newComponentProps, preferredSupplementaryColumnWidthOrFraction, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _preferredSupplementaryColumnWidthOrFraction =
         newComponentProps.columnMetrics.preferredSupplementaryColumnWidthOrFraction;
   }
 
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, minimumSecondaryColumnWidth, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _minimumSecondaryColumnWidth = newComponentProps.columnMetrics.minimumSecondaryColumnWidth;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, preferredSecondaryColumnWidthOrFraction, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _preferredSecondaryColumnWidthOrFraction = newComponentProps.columnMetrics.preferredSecondaryColumnWidthOrFraction;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, minimumInspectorColumnWidth, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _minimumInspectorColumnWidth = newComponentProps.columnMetrics.minimumInspectorColumnWidth;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, maximumInspectorColumnWidth, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _maximumInspectorColumnWidth = newComponentProps.columnMetrics.maximumInspectorColumnWidth;
   }
 
   if (COLUMN_METRIC_CHANGED(oldComponentProps, newComponentProps, preferredInspectorColumnWidthOrFraction, epsilon)) {
-    _needsSplitViewAppearanceUpdate = true;
+    _needsSplitAppearanceUpdate = true;
     _preferredInspectorColumnWidthOrFraction = newComponentProps.columnMetrics.preferredInspectorColumnWidthOrFraction;
   }
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
@@ -327,8 +326,8 @@ RNS_IGNORE_SUPER_CALL_END
   }
 
   if (oldComponentProps.orientation != newComponentProps.orientation) {
-    _needsSplitViewOrientationUpdate = true;
-    _orientation = rnscreens::conversion::RNSOrientationFromRNSSplitViewHostOrientation(newComponentProps.orientation);
+    _needsSplitOrientationUpdate = true;
+    _orientation = rnscreens::conversion::RNSOrientationFromRNSSplitHostOrientation(newComponentProps.orientation);
   }
 
   // This flag is set to true when showsSecondaryOnlyButton prop is assigned for the first time.
@@ -341,29 +340,29 @@ RNS_IGNORE_SUPER_CALL_END
 
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 {
-  [self requestSplitViewHostControllerForAppearanceUpdate];
+  [self requestSplitHostControllerForAppearanceUpdate];
   [super finalizeUpdates:updateMask];
 }
 
-- (void)requestSplitViewHostControllerForAppearanceUpdate
+- (void)requestSplitHostControllerForAppearanceUpdate
 {
-  if (_needsSplitViewAppearanceUpdate && _controller != nil) {
-    _needsSplitViewAppearanceUpdate = false;
+  if (_needsSplitAppearanceUpdate && _controller != nil) {
+    _needsSplitAppearanceUpdate = false;
     [_controller setNeedsAppearanceUpdate];
   }
 
-  if (_needsSplitViewDisplayModeUpdate && _controller != nil) {
-    _needsSplitViewDisplayModeUpdate = false;
+  if (_needsSplitDisplayModeUpdate && _controller != nil) {
+    _needsSplitDisplayModeUpdate = false;
     [_controller setNeedsDisplayModeUpdate];
   }
 
-  if (_needsSplitViewSecondaryScreenNavBarUpdate && _controller != nil) {
-    _needsSplitViewSecondaryScreenNavBarUpdate = false;
+  if (_needsSplitSecondaryScreenNavBarUpdate && _controller != nil) {
+    _needsSplitSecondaryScreenNavBarUpdate = false;
     [_controller setNeedsSecondaryScreenNavBarUpdate];
   }
 
-  if (_needsSplitViewOrientationUpdate && _controller != nil) {
-    _needsSplitViewOrientationUpdate = false;
+  if (_needsSplitOrientationUpdate && _controller != nil) {
+    _needsSplitOrientationUpdate = false;
     [_controller setNeedsOrientationUpdate];
   }
 }
@@ -389,15 +388,14 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)updateEventEmitter:(const facebook::react::EventEmitter::Shared &)eventEmitter
 {
   [super updateEventEmitter:eventEmitter];
-  [_reactEventEmitter
-      updateEventEmitter:std::static_pointer_cast<const react::RNSSplitViewHostEventEmitter>(eventEmitter)];
+  [_reactEventEmitter updateEventEmitter:std::static_pointer_cast<const react::RNSSplitHostEventEmitter>(eventEmitter)];
 }
 
 #pragma mark - Commands
 
 - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
 {
-  RCTRNSSplitViewHostHandleCommand(self, commandName, args);
+  RCTRNSSplitHostHandleCommand(self, commandName, args);
 }
 
 - (void)showColumn:(NSString *)column
@@ -411,17 +409,27 @@ RNS_IGNORE_SUPER_CALL_END
 
 #pragma mark - Events
 
-- (nonnull RNSSplitViewHostComponentEventEmitter *)reactEventEmitter
+- (nonnull RNSSplitHostComponentEventEmitter *)reactEventEmitter
 {
   RCTAssert(_reactEventEmitter != nil, @"[RNScreens] Attempt to access uninitialized _reactEventEmitter");
   return _reactEventEmitter;
 }
 
+#pragma mark - Dynamic frameworks support
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 @end
 
-Class<RCTComponentViewProtocol> RNSSplitViewHostCls(void)
+Class<RCTComponentViewProtocol> RNSSplitHostCls(void)
 {
-  return RNSSplitViewHostComponentView.class;
+  return RNSSplitHostComponentView.class;
 }
 
 #undef COLUMN_METRIC_CHANGED

package/ios/gamma/{split-view/RNSSplitViewHostComponentViewManager.h → split/RNSSplitHostComponentViewManager.h}

@@ -4,7 +4,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNSSplitViewHostComponentViewManager : RCTViewManager
+@interface RNSSplitHostComponentViewManager : RCTViewManager
 
 @end
 

package/ios/gamma/split/RNSSplitHostComponentViewManager.mm

@@ -0,0 +1,7 @@
+#import "RNSSplitHostComponentViewManager.h"
+
+@implementation RNSSplitHostComponentViewManager
+
+RCT_EXPORT_MODULE(RNSSplitHostComponentViewManager)
+
+@end