@depup/react-native 0.86.2-depup.0 → 0.87.1-depup.0

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/RCTComponentViewHelpers.h

@@ -13,17 +13,79 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@protocol RCTVirtualViewExperimentalViewProtocol <NSObject>
+@protocol RCTActivityIndicatorViewViewProtocol <NSObject>
 
 @end
 
-@protocol RCTVirtualViewViewProtocol <NSObject>
-
+@protocol RCTDebuggingOverlayViewProtocol <NSObject>
+- (void)highlightTraceUpdates:(const NSArray *)updates;
+- (void)highlightElements:(const NSArray *)elements;
+- (void)clearElementsHighlights;
 @end
 
-@protocol RCTActivityIndicatorViewViewProtocol <NSObject>
+RCT_EXTERN inline void RCTDebuggingOverlayHandleCommand(
+  id<RCTDebuggingOverlayViewProtocol> componentView,
+  NSString const *commandName,
+  NSArray const *args)
+{
+  if ([commandName isEqualToString:@"highlightTraceUpdates"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"DebuggingOverlay", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
 
-@end
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSArray class], @"array", @"DebuggingOverlay", commandName, @"1st")) {
+    return;
+  }
+#endif
+  const NSArray * updates = (NSArray *)arg0;
+
+  [componentView highlightTraceUpdates:updates];
+  return;
+}
+
+if ([commandName isEqualToString:@"highlightElements"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"DebuggingOverlay", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSArray class], @"array", @"DebuggingOverlay", commandName, @"1st")) {
+    return;
+  }
+#endif
+  const NSArray * elements = (NSArray *)arg0;
+
+  [componentView highlightElements:elements];
+  return;
+}
+
+if ([commandName isEqualToString:@"clearElementsHighlights"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"DebuggingOverlay", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView clearElementsHighlights];
+  return;
+}
+
+#if RCT_DEBUG
+  RCTLogError(@"%@ received command %@, which is not a supported command.", @"DebuggingOverlay", commandName);
+#endif
+}
 
 @protocol RCTAndroidDrawerLayoutViewProtocol <NSObject>
 - (void)openDrawer;
@@ -68,7 +130,15 @@ if ([commandName isEqualToString:@"closeDrawer"]) {
 #endif
 }
 
-@protocol RCTAndroidHorizontalScrollContentViewViewProtocol <NSObject>
+@protocol RCTInputAccessoryViewProtocol <NSObject>
+
+@end
+
+@protocol RCTModalHostViewViewProtocol <NSObject>
+
+@end
+
+@protocol RCTAndroidProgressBarViewProtocol <NSObject>
 
 @end
 
@@ -106,160 +176,82 @@ RCT_EXTERN inline void RCTAndroidSwipeRefreshLayoutHandleCommand(
 #endif
 }
 
-@protocol RCTAndroidSwitchViewProtocol <NSObject>
-- (void)setNativeValue:(BOOL)value;
-@end
-
-RCT_EXTERN inline void RCTAndroidSwitchHandleCommand(
-  id<RCTAndroidSwitchViewProtocol> componentView,
-  NSString const *commandName,
-  NSArray const *args)
-{
-  if ([commandName isEqualToString:@"setNativeValue"]) {
-#if RCT_DEBUG
-  if ([args count] != 1) {
-    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"AndroidSwitch", commandName, (int)[args count], 1);
-    return;
-  }
-#endif
-
-  NSObject *arg0 = args[0];
-#if RCT_DEBUG
-  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"boolean", @"AndroidSwitch", commandName, @"1st")) {
-    return;
-  }
-#endif
-  BOOL value = [(NSNumber *)arg0 boolValue];
-
-  [componentView setNativeValue:value];
-  return;
-}
-
-#if RCT_DEBUG
-  RCTLogError(@"%@ received command %@, which is not a supported command.", @"AndroidSwitch", commandName);
-#endif
-}
-
-@protocol RCTDebuggingOverlayViewProtocol <NSObject>
-- (void)highlightTraceUpdates:(const NSArray *)updates;
-- (void)highlightElements:(const NSArray *)elements;
-- (void)clearElementsHighlights;
+@protocol RCTPullToRefreshViewViewProtocol <NSObject>
+- (void)setNativeRefreshing:(BOOL)refreshing;
 @end
 
-RCT_EXTERN inline void RCTDebuggingOverlayHandleCommand(
-  id<RCTDebuggingOverlayViewProtocol> componentView,
+RCT_EXTERN inline void RCTPullToRefreshViewHandleCommand(
+  id<RCTPullToRefreshViewViewProtocol> componentView,
   NSString const *commandName,
   NSArray const *args)
 {
-  if ([commandName isEqualToString:@"highlightTraceUpdates"]) {
+  if ([commandName isEqualToString:@"setNativeRefreshing"]) {
 #if RCT_DEBUG
   if ([args count] != 1) {
-    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"DebuggingOverlay", commandName, (int)[args count], 1);
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"PullToRefreshView", commandName, (int)[args count], 1);
     return;
   }
 #endif
 
   NSObject *arg0 = args[0];
 #if RCT_DEBUG
-  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSArray class], @"array", @"DebuggingOverlay", commandName, @"1st")) {
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"boolean", @"PullToRefreshView", commandName, @"1st")) {
     return;
   }
 #endif
-  const NSArray * updates = (NSArray *)arg0;
+  BOOL refreshing = [(NSNumber *)arg0 boolValue];
 
-  [componentView highlightTraceUpdates:updates];
+  [componentView setNativeRefreshing:refreshing];
   return;
 }
 
-if ([commandName isEqualToString:@"highlightElements"]) {
-#if RCT_DEBUG
-  if ([args count] != 1) {
-    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"DebuggingOverlay", commandName, (int)[args count], 1);
-    return;
-  }
-#endif
-
-  NSObject *arg0 = args[0];
 #if RCT_DEBUG
-  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSArray class], @"array", @"DebuggingOverlay", commandName, @"1st")) {
-    return;
-  }
+  RCTLogError(@"%@ received command %@, which is not a supported command.", @"PullToRefreshView", commandName);
 #endif
-  const NSArray * elements = (NSArray *)arg0;
-
-  [componentView highlightElements:elements];
-  return;
 }
 
-if ([commandName isEqualToString:@"clearElementsHighlights"]) {
-#if RCT_DEBUG
-  if ([args count] != 0) {
-    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"DebuggingOverlay", commandName, (int)[args count], 0);
-    return;
-  }
-#endif
-
-  
-
-  [componentView clearElementsHighlights];
-  return;
-}
+@protocol RCTSafeAreaViewViewProtocol <NSObject>
 
-#if RCT_DEBUG
-  RCTLogError(@"%@ received command %@, which is not a supported command.", @"DebuggingOverlay", commandName);
-#endif
-}
+@end
 
-@protocol RCTAndroidProgressBarViewProtocol <NSObject>
+@protocol RCTAndroidHorizontalScrollContentViewViewProtocol <NSObject>
 
 @end
 
-@protocol RCTPullToRefreshViewViewProtocol <NSObject>
-- (void)setNativeRefreshing:(BOOL)refreshing;
+@protocol RCTAndroidSwitchViewProtocol <NSObject>
+- (void)setNativeValue:(BOOL)value;
 @end
 
-RCT_EXTERN inline void RCTPullToRefreshViewHandleCommand(
-  id<RCTPullToRefreshViewViewProtocol> componentView,
+RCT_EXTERN inline void RCTAndroidSwitchHandleCommand(
+  id<RCTAndroidSwitchViewProtocol> componentView,
   NSString const *commandName,
   NSArray const *args)
 {
-  if ([commandName isEqualToString:@"setNativeRefreshing"]) {
+  if ([commandName isEqualToString:@"setNativeValue"]) {
 #if RCT_DEBUG
   if ([args count] != 1) {
-    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"PullToRefreshView", commandName, (int)[args count], 1);
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"AndroidSwitch", commandName, (int)[args count], 1);
     return;
   }
 #endif
 
   NSObject *arg0 = args[0];
 #if RCT_DEBUG
-  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"boolean", @"PullToRefreshView", commandName, @"1st")) {
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"boolean", @"AndroidSwitch", commandName, @"1st")) {
     return;
   }
 #endif
-  BOOL refreshing = [(NSNumber *)arg0 boolValue];
+  BOOL value = [(NSNumber *)arg0 boolValue];
 
-  [componentView setNativeRefreshing:refreshing];
+  [componentView setNativeValue:value];
   return;
 }
 
 #if RCT_DEBUG
-  RCTLogError(@"%@ received command %@, which is not a supported command.", @"PullToRefreshView", commandName);
+  RCTLogError(@"%@ received command %@, which is not a supported command.", @"AndroidSwitch", commandName);
 #endif
 }
 
-@protocol RCTInputAccessoryViewProtocol <NSObject>
-
-@end
-
-@protocol RCTModalHostViewViewProtocol <NSObject>
-
-@end
-
-@protocol RCTSafeAreaViewViewProtocol <NSObject>
-
-@end
-
 @protocol RCTSwitchViewProtocol <NSObject>
 - (void)setValue:(BOOL)value;
 @end
@@ -298,4 +290,12 @@ RCT_EXTERN inline void RCTSwitchHandleCommand(
 
 @end
 
+@protocol RCTVirtualViewExperimentalViewProtocol <NSObject>
+
+@end
+
+@protocol RCTVirtualViewViewProtocol <NSObject>
+
+@end
+
 NS_ASSUME_NONNULL_END

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/ShadowNodes.cpp

@@ -13,9 +13,9 @@
 namespace facebook::react {
 
 extern const char ActivityIndicatorViewComponentName[] = "ActivityIndicatorView";
+extern const char DebuggingOverlayComponentName[] = "DebuggingOverlay";
 extern const char AndroidDrawerLayoutComponentName[] = "AndroidDrawerLayout";
 extern const char AndroidSwipeRefreshLayoutComponentName[] = "AndroidSwipeRefreshLayout";
-extern const char DebuggingOverlayComponentName[] = "DebuggingOverlay";
 extern const char PullToRefreshViewComponentName[] = "PullToRefreshView";
 extern const char UnimplementedNativeViewComponentName[] = "UnimplementedNativeView";
 

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/ShadowNodes.h

@@ -29,6 +29,17 @@ using ActivityIndicatorViewShadowNode = ConcreteViewShadowNode<
     ActivityIndicatorViewEventEmitter,
     ActivityIndicatorViewState>;
 
+JSI_EXPORT extern const char DebuggingOverlayComponentName[];
+
+/*
+ * `ShadowNode` for <DebuggingOverlay> component.
+ */
+using DebuggingOverlayShadowNode = ConcreteViewShadowNode<
+    DebuggingOverlayComponentName,
+    DebuggingOverlayProps,
+    DebuggingOverlayEventEmitter,
+    DebuggingOverlayState>;
+
 JSI_EXPORT extern const char AndroidDrawerLayoutComponentName[];
 
 /*
@@ -51,17 +62,6 @@ using AndroidSwipeRefreshLayoutShadowNode = ConcreteViewShadowNode<
     AndroidSwipeRefreshLayoutEventEmitter,
     AndroidSwipeRefreshLayoutState>;
 
-JSI_EXPORT extern const char DebuggingOverlayComponentName[];
-
-/*
- * `ShadowNode` for <DebuggingOverlay> component.
- */
-using DebuggingOverlayShadowNode = ConcreteViewShadowNode<
-    DebuggingOverlayComponentName,
-    DebuggingOverlayProps,
-    DebuggingOverlayEventEmitter,
-    DebuggingOverlayState>;
-
 JSI_EXPORT extern const char PullToRefreshViewComponentName[];
 
 /*

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/States.h

@@ -17,12 +17,12 @@ namespace facebook::react {
 
 using ActivityIndicatorViewState = StateData;
 
+using DebuggingOverlayState = StateData;
+
 using AndroidDrawerLayoutState = StateData;
 
 using AndroidSwipeRefreshLayoutState = StateData;
 
-using DebuggingOverlayState = StateData;
-
 using PullToRefreshViewState = StateData;
 
 using UnimplementedNativeViewState = StateData;

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
+
 #import <UIKit/UIKit.h>
 
 #import <React/RCTViewComponentView.h>
@@ -30,3 +32,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm

@@ -7,6 +7,8 @@
 
 #import "RCTLegacyViewManagerInteropComponentView.h"
 
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
+
 #import <React/RCTAssert.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTConstants.h>
@@ -299,3 +301,5 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
 }
 
 @end
+
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
+
 #import <Foundation/Foundation.h>
 #import <react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h>
 
@@ -25,3 +27,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm

@@ -6,6 +6,9 @@
  */
 
 #import "RCTLegacyViewManagerInteropCoordinatorAdapter.h"
+
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
+
 #import <React/UIView+React.h>
 #import <react/utils/FollyConvert.h>
 
@@ -146,3 +149,5 @@
 }
 
 @end
+
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP

package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -8,7 +8,6 @@
 #import "RCTModalHostViewComponentView.h"
 
 #import <React/RCTBridge+Private.h>
-#import <React/RCTModalManager.h>
 #import <React/UIView+React.h>
 #import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
 #import <react/renderer/components/FBReactNativeSpec/Props.h>

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm

@@ -102,6 +102,20 @@
       RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y"));
 }
 
+- (void)setCenterContent:(BOOL)centerContent
+{
+  if (_centerContent != centerContent) {
+    _centerContent = centerContent;
+    [self centerContentIfNeeded];
+  }
+}
+
+- (void)setContentSize:(CGSize)contentSize
+{
+  [super setContentSize:contentSize];
+  [self centerContentIfNeeded];
+}
+
 - (void)setFrame:(CGRect)frame
 {
   [super setFrame:frame];

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -247,7 +247,7 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
   if (@available(iOS 14.0, *)) {
     // On iOS when Prefer Cross-Fade Transitions is enabled, the keyboard position
     // & height is reported differently (0 instead of Y position value matching height of frame)
-    // Fixes similar issue we saw with https://github.com/react/react-native/pull/34503
+    // Fixes similar issue we saw with https://github.com/facebook/react-native/pull/34503
     if (UIAccessibilityPrefersCrossFadeTransitions() && keyboardEndFrame.size.height == 0) {
       newContentOffset.y = 0;
       newEdgeInsets.bottom = 0;
@@ -396,15 +396,24 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 
   MAP_SCROLL_VIEW_PROP(zoomScale);
 
-  if (oldScrollViewProps.contentInset != newScrollViewProps.contentInset) {
+  // When disabling centerContent, reset inset to prop value
+  // (enabling is handled automatically by the setCenterContent: setter)
+  if (oldScrollViewProps.centerContent && !newScrollViewProps.centerContent) {
     _scrollView.contentInset = RCTUIEdgeInsetsFromEdgeInsets(newScrollViewProps.contentInset);
   }
 
-  RCTEnhancedScrollView *scrollView = (RCTEnhancedScrollView *)_scrollView;
+  // Only apply contentInset from props if centerContent is disabled
+  // When centerContent is enabled, the inset is calculated by centerContentIfNeeded
+  if (oldScrollViewProps.contentInset != newScrollViewProps.contentInset && !newScrollViewProps.centerContent) {
+    _scrollView.contentInset = RCTUIEdgeInsetsFromEdgeInsets(newScrollViewProps.contentInset);
+  }
   if (oldScrollViewProps.contentOffset != newScrollViewProps.contentOffset) {
     _scrollView.contentOffset = RCTCGPointFromPoint(newScrollViewProps.contentOffset);
   }
 
+  // RCTEnhancedScrollView specific props
+
+  auto *scrollView = (RCTEnhancedScrollView *)_scrollView;
   if (oldScrollViewProps.snapToAlignment != newScrollViewProps.snapToAlignment) {
     scrollView.snapToAlignment = RCTNSStringFromString(toString(newScrollViewProps.snapToAlignment));
   }
@@ -523,7 +532,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     }
   }
 
-  return isPointInside ? self : nil;
+  return isPointInside ? _scrollView : nil;
 }
 
 /*

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerState.mm

@@ -16,14 +16,11 @@
 using namespace facebook;
 using namespace facebook::react;
 
-#if RCT_DEBUG
+#define ENABLE_DEBUG_LOGGING 0 && RCT_DEBUG
+
+#if ENABLE_DEBUG_LOGGING
 static void debugLog(NSString *msg, ...)
 {
-  auto debugEnabled = ReactNativeFeatureFlags::enableVirtualViewDebugFeatures();
-  if (!debugEnabled) {
-    return;
-  }
-
   va_list args;
   va_start(args, msg);
   NSString *msgString = [[NSString alloc] initWithFormat:msg arguments:args];
@@ -31,6 +28,9 @@ static void debugLog(NSString *msg, ...)
   va_end(args); // Don't forget to call va_end to clean up
 }
 
+#define DEBUG_LOG(...) debugLog(__VA_ARGS__)
+#else
+#define DEBUG_LOG(...) ((void)0)
 #endif
 
 /**
@@ -87,18 +87,14 @@ static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
     _prerenderRatio = ReactNativeFeatureFlags::virtualViewPrerenderRatio();
     [_scrollViewComponentView addScrollListener:self];
 
-#if RCT_DEBUG
-    debugLog(@"initWithScrollView");
-#endif
+    DEBUG_LOG(@"initWithScrollView");
   }
   return self;
 }
 
 - (void)dealloc
 {
-#if RCT_DEBUG
-  debugLog(@"dealloc");
-#endif
+  DEBUG_LOG(@"dealloc");
   if (_scrollViewComponentView != nil) {
     [_scrollViewComponentView removeScrollListener:self];
     _scrollViewComponentView = nil;
@@ -112,14 +108,9 @@ static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
 {
   if (![_virtualViews containsObject:virtualView]) {
     [_virtualViews addObject:virtualView];
-#if RCT_DEBUG
-    debugLog(@"Add virtualViewID=%@", virtualView.virtualViewID);
-#endif
-
+    DEBUG_LOG(@"Add virtualViewID=%@", virtualView.virtualViewID);
   } else {
-#if RCT_DEBUG
-    debugLog(@"Update virtualViewID=%@", virtualView.virtualViewID);
-#endif
+    DEBUG_LOG(@"Update virtualViewID=%@", virtualView.virtualViewID);
   }
   [self _updateModes:virtualView];
 }
@@ -131,10 +122,7 @@ static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
   }
 
   [_virtualViews removeObject:virtualView];
-
-#if RCT_DEBUG
-  debugLog(@"Remove virtualViewID=%@", virtualView.virtualViewID);
-#endif
+  DEBUG_LOG(@"Remove virtualViewID=%@", virtualView.virtualViewID);
 }
 
 #pragma mark - Private Helpers
@@ -169,14 +157,12 @@ static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
       thresholdRect = _prerenderRect;
     }
 
-#if RCT_DEBUG
-    debugLog(
+    DEBUG_LOG(
         @"UpdateModes virtualView=%@ mode=%ld rect=%@ thresholdRect=%@",
         vv.virtualViewID,
         (long)mode,
         NSStringFromCGRect(rect),
         NSStringFromCGRect(thresholdRect));
-#endif
     [vv onModeChange:mode targetRect:rect thresholdRect:thresholdRect];
   }
 }