From 9ea1f9f534f6e309cd647d4c6999601861716685 Mon Sep 17 00:00:00 2001 From: Shawn Dempsey Date: Mon, 21 Nov 2022 20:09:09 -0800 Subject: [PATCH 1/7] [Fabric] Replace UIKit with RCTUIKit --- .../ActivityIndicator/RCTActivityIndicatorViewComponentView.h | 2 +- .../InputAccessory/RCTInputAccessoryComponentView.h | 2 +- .../InputAccessory/RCTInputAccessoryContentView.h | 2 +- .../RCTLegacyViewManagerInteropComponentView.h | 2 +- .../ComponentViews/Modal/RCTFabricModalHostViewController.h | 2 +- .../Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h | 2 +- .../ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h | 2 +- .../Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h | 2 +- .../ScrollView/RCTPullToRefreshViewComponentView.h | 2 +- .../ComponentViews/ScrollView/RCTScrollViewComponentView.h | 2 +- .../Mounting/ComponentViews/Slider/RCTSliderComponentView.h | 2 +- .../Mounting/ComponentViews/Switch/RCTSwitchComponentView.h | 2 +- .../Mounting/ComponentViews/Text/RCTAccessibilityElement.h | 2 +- .../Text/RCTParagraphComponentAccessibilityProvider.h | 2 +- .../Mounting/ComponentViews/Text/RCTParagraphComponentView.h | 2 +- .../ComponentViews/TextInput/RCTTextInputComponentView.h | 2 +- .../Mounting/ComponentViews/TextInput/RCTTextInputUtils.h | 2 +- .../RCTUnimplementedNativeComponentView.h | 3 ++- .../UnimplementedView/RCTUnimplementedViewComponentView.h | 2 +- .../Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h | 2 +- React/Fabric/Mounting/RCTComponentViewClassDescriptor.h | 2 +- React/Fabric/Mounting/RCTComponentViewDescriptor.h | 2 +- React/Fabric/Mounting/RCTComponentViewFactory.h | 2 +- React/Fabric/Mounting/RCTComponentViewProtocol.h | 2 +- React/Fabric/Mounting/RCTComponentViewRegistry.h | 2 +- React/Fabric/Mounting/RCTMountingManager.h | 2 +- React/Fabric/Mounting/RCTMountingManagerDelegate.h | 2 +- React/Fabric/Mounting/RCTMountingTransactionObserving.h | 2 +- React/Fabric/Mounting/UIView+ComponentViewProtocol.h | 2 +- React/Fabric/RCTConversions.h | 2 +- React/Fabric/RCTImageResponseDelegate.h | 2 +- React/Fabric/RCTLocalizationProvider.h | 2 +- React/Fabric/RCTScheduler.h | 2 +- React/Fabric/RCTSurfacePresenter.h | 2 +- React/Fabric/RCTSurfacePresenterBridgeAdapter.h | 2 +- React/Fabric/RCTSurfaceRegistry.h | 2 +- React/Fabric/RCTSurfaceTouchHandler.h | 2 +- React/Fabric/RCTTouchableComponentViewProtocol.h | 2 +- React/Fabric/Utils/RCTGenericDelegateSplitter.h | 2 +- React/Views/RCTMaskedView.h | 2 +- React/Views/RCTModalHostView.h | 2 +- React/Views/RCTModalHostViewController.h | 2 +- React/Views/RCTModalManager.h | 2 +- React/Views/RCTWrapperViewController.h | 2 +- React/Views/RefreshControl/RCTRefreshControl.h | 2 +- React/Views/RefreshControl/RCTRefreshableProtocol.h | 2 +- React/Views/SafeAreaView/RCTSafeAreaView.h | 2 +- React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h | 2 +- .../RCTLegacyViewManagerInteropCoordinator.h | 2 +- .../renderer/graphics/platform/ios/RCTPlatformColorUtils.mm | 2 +- .../react/renderer/imagemanager/platform/ios/RCTImageManager.h | 2 +- .../imagemanager/platform/ios/RCTImagePrimitivesConversions.h | 2 +- .../renderer/imagemanager/platform/ios/RCTSyncImageManager.h | 2 +- .../textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h | 2 +- .../textlayoutmanager/platform/ios/RCTAttributedTextUtils.h | 2 +- .../textlayoutmanager/platform/ios/RCTFontProperties.h | 2 +- .../renderer/textlayoutmanager/platform/ios/RCTFontUtils.h | 2 +- .../textlayoutmanager/platform/ios/RCTTextLayoutManager.h | 2 +- .../platform/ios/RCTTextPrimitivesConversions.h | 2 +- 59 files changed, 60 insertions(+), 59 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h index 0551b81eb70960..1a2b1b14459027 100644 --- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h index c2c80a662203fb..45c477397bd9e2 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h index 0054ce06aeae7b..554614a47f8e9e 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) @interface RCTInputAccessoryContentView : UIView diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h index fae91e1b10d4b9..ef23fa36221caa 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h index 149a9788e2c1b2..4bd66b48a468b4 100644 --- a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h +++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) @protocol RCTFabricModalHostViewControllerDelegate - (void)boundsDidChange:(CGRect)newBounds; diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h index cce48d6ffcb922..e028aed693b1ad 100644 --- a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h index 542b88cf14fae7..84e11aacbfcb08 100644 --- a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h index 6402bc6c86c155..3c85ab290f8494 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h index 3048aa48f9baf5..264d306b49b51c 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h index 8edb46868b19e8..785d28a47c79dd 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h index 5ddbef2017ad2a..a436db3af4bf1f 100644 --- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h index 09fb855be5bd4b..77b88e8c316a85 100644 --- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h index 7d06fb61ba8297..2c627de977cf68 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h index 3fb0da7c2a5f08..5187981b4f806d 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h index 0744e4a530c86b..050fb5a1ebceba 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h index 927fbc4e3d33d3..d36a4f11ffbaf8 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h index ffaac133609248..1d170c50bc50f6 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.h b/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.h index fcd2ebe7b7cc5a..7c35ec552bbe6d 100644 --- a/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.h @@ -5,7 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) +#import "React/RCTUITextView.h" #import diff --git a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h index 8c2c82a3f0c5c8..5354d3611035ab 100644 --- a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h index 48298f3fc90add..273ee5c4905c9d 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h b/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h index b03a4642a98123..f4826fc4ae9f60 100644 --- a/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h +++ b/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/RCTComponentViewDescriptor.h b/React/Fabric/Mounting/RCTComponentViewDescriptor.h index f933f2520b0747..753fb399f70ae0 100644 --- a/React/Fabric/Mounting/RCTComponentViewDescriptor.h +++ b/React/Fabric/Mounting/RCTComponentViewDescriptor.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.h b/React/Fabric/Mounting/RCTComponentViewFactory.h index 771131d50f4407..960daa9dc7f137 100644 --- a/React/Fabric/Mounting/RCTComponentViewFactory.h +++ b/React/Fabric/Mounting/RCTComponentViewFactory.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h index 50d7d434f560ff..6f0f98fa14062b 100644 --- a/React/Fabric/Mounting/RCTComponentViewProtocol.h +++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.h b/React/Fabric/Mounting/RCTComponentViewRegistry.h index bcf78a20ccd236..31acca6a2069f6 100644 --- a/React/Fabric/Mounting/RCTComponentViewRegistry.h +++ b/React/Fabric/Mounting/RCTComponentViewRegistry.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h index d30d297e366749..235ac0539a8e6e 100644 --- a/React/Fabric/Mounting/RCTMountingManager.h +++ b/React/Fabric/Mounting/RCTMountingManager.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/Mounting/RCTMountingManagerDelegate.h b/React/Fabric/Mounting/RCTMountingManagerDelegate.h index 21653fe033616f..7c4b3e0a126ef7 100644 --- a/React/Fabric/Mounting/RCTMountingManagerDelegate.h +++ b/React/Fabric/Mounting/RCTMountingManagerDelegate.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/Mounting/RCTMountingTransactionObserving.h b/React/Fabric/Mounting/RCTMountingTransactionObserving.h index c24029a2d81ab1..a09905ea7b30ec 100644 --- a/React/Fabric/Mounting/RCTMountingTransactionObserving.h +++ b/React/Fabric/Mounting/RCTMountingTransactionObserving.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #include diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h index 7b0dd3e96b3bf7..a17eb8a6db6f7e 100644 --- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h +++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h index 58cbfeb466b64e..0f8e8e26df5f38 100644 --- a/React/Fabric/RCTConversions.h +++ b/React/Fabric/RCTConversions.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/RCTImageResponseDelegate.h b/React/Fabric/RCTImageResponseDelegate.h index be55fa93f53381..3744c1d2bc69ae 100644 --- a/React/Fabric/RCTImageResponseDelegate.h +++ b/React/Fabric/RCTImageResponseDelegate.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTLocalizationProvider.h b/React/Fabric/RCTLocalizationProvider.h index 19f87184716490..3fec8fca1a4342 100644 --- a/React/Fabric/RCTLocalizationProvider.h +++ b/React/Fabric/RCTLocalizationProvider.h @@ -6,7 +6,7 @@ */ #import -#import +#import // TODO(macOS GH#774) @protocol RCTLocalizationProtocol diff --git a/React/Fabric/RCTScheduler.h b/React/Fabric/RCTScheduler.h index bebc5fd90f0050..7edf36aad5c8ef 100644 --- a/React/Fabric/RCTScheduler.h +++ b/React/Fabric/RCTScheduler.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h index 8e645be4c413c5..cb4883fd619cbe 100644 --- a/React/Fabric/RCTSurfacePresenter.h +++ b/React/Fabric/RCTSurfacePresenter.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Fabric/RCTSurfacePresenterBridgeAdapter.h b/React/Fabric/RCTSurfacePresenterBridgeAdapter.h index 188d19992c6760..43a0b3ab45c229 100644 --- a/React/Fabric/RCTSurfacePresenterBridgeAdapter.h +++ b/React/Fabric/RCTSurfacePresenterBridgeAdapter.h @@ -7,7 +7,7 @@ #import #import -#import +#import // TODO(macOS GH#774) #import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTSurfaceRegistry.h b/React/Fabric/RCTSurfaceRegistry.h index 4b369cc64b4143..c01231c8a426b9 100644 --- a/React/Fabric/RCTSurfaceRegistry.h +++ b/React/Fabric/RCTSurfaceRegistry.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Fabric/RCTSurfaceTouchHandler.h b/React/Fabric/RCTSurfaceTouchHandler.h index 6515e5f1750c3c..8df850191b8e4a 100644 --- a/React/Fabric/RCTSurfaceTouchHandler.h +++ b/React/Fabric/RCTSurfaceTouchHandler.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTTouchableComponentViewProtocol.h b/React/Fabric/RCTTouchableComponentViewProtocol.h index 162aa866cb3ef3..2fe963bad510f3 100644 --- a/React/Fabric/RCTTouchableComponentViewProtocol.h +++ b/React/Fabric/RCTTouchableComponentViewProtocol.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import @protocol RCTTouchableComponentViewProtocol diff --git a/React/Fabric/Utils/RCTGenericDelegateSplitter.h b/React/Fabric/Utils/RCTGenericDelegateSplitter.h index 77bbac20d7ddc2..e7d5a5e0688627 100644 --- a/React/Fabric/Utils/RCTGenericDelegateSplitter.h +++ b/React/Fabric/Utils/RCTGenericDelegateSplitter.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) NS_ASSUME_NONNULL_BEGIN diff --git a/React/Views/RCTMaskedView.h b/React/Views/RCTMaskedView.h index cab90b6cdca3d8..6f913c057af4fe 100644 --- a/React/Views/RCTMaskedView.h +++ b/React/Views/RCTMaskedView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h index 0246328f99f22f..be36ac164f0e76 100644 --- a/React/Views/RCTModalHostView.h +++ b/React/Views/RCTModalHostView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Views/RCTModalHostViewController.h b/React/Views/RCTModalHostViewController.h index b12b0f7fc15129..66a1659886db30 100644 --- a/React/Views/RCTModalHostViewController.h +++ b/React/Views/RCTModalHostViewController.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) @interface RCTModalHostViewController : UIViewController diff --git a/React/Views/RCTModalManager.h b/React/Views/RCTModalManager.h index 237037fd8db6b2..6cecbd16b69095 100644 --- a/React/Views/RCTModalManager.h +++ b/React/Views/RCTModalManager.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h index b8277587684bd7..97f4816c9550eb 100644 --- a/React/Views/RCTWrapperViewController.h +++ b/React/Views/RCTWrapperViewController.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) @class RCTWrapperViewController; diff --git a/React/Views/RefreshControl/RCTRefreshControl.h b/React/Views/RefreshControl/RCTRefreshControl.h index 35c60c2878b648..a11b801f9ea895 100644 --- a/React/Views/RefreshControl/RCTRefreshControl.h +++ b/React/Views/RefreshControl/RCTRefreshControl.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/React/Views/RefreshControl/RCTRefreshableProtocol.h b/React/Views/RefreshControl/RCTRefreshableProtocol.h index b0b06f2e4db736..ccfb6426cbeff0 100644 --- a/React/Views/RefreshControl/RCTRefreshableProtocol.h +++ b/React/Views/RefreshControl/RCTRefreshableProtocol.h @@ -6,7 +6,7 @@ */ #import -#import +#import // TODO(macOS GH#774) /** * Protocol used to dispatch commands in `RCTRefreshControlManager.h`. diff --git a/React/Views/SafeAreaView/RCTSafeAreaView.h b/React/Views/SafeAreaView/RCTSafeAreaView.h index c0fea6b7bacfc4..34e875558ecc77 100644 --- a/React/Views/SafeAreaView/RCTSafeAreaView.h +++ b/React/Views/SafeAreaView/RCTSafeAreaView.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h index b78edb76c35ece..f3a4b2bab0acd1 100644 --- a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h +++ b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) NS_ASSUME_NONNULL_BEGIN diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h index 2062f42a243372..7dec6d6bc19a01 100644 --- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h @@ -6,7 +6,7 @@ */ #import -#import +#import // TODO(macOS GH#774) #include NS_ASSUME_NONNULL_BEGIN diff --git a/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm b/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm index f11b2af9e40e8e..2d143e7dbbd20b 100644 --- a/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm +++ b/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm @@ -9,7 +9,7 @@ #import #import -#import +#import // TODO(macOS GH#774) #include diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h index 88130fe075573f..2d1803454c5ef3 100644 --- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h index d72e61c63f0afb..89ba290dc051a5 100644 --- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h index c0ef180bc22d6e..c028be86b5932d 100644 --- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h index a87d67d192305c..7c9ab641081368 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) @interface NSTextStorage (FontScaling) diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h index b09fd7115ebe65..0c2deaf3ae11bf 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #include #include diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h index eca30e5046838a..af3e44f95a7a57 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) NS_ASSUME_NONNULL_BEGIN diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h index ad4d7af3dd926e..d70c7a13500e03 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h index 15e4c755abc732..e973113b02f931 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #import #import diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h index 235137bde0c13a..4d90c09e4e6696 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO(macOS GH#774) #include #include From 169a957b09c8609867e6e793d27eb50fde3f7a28 Mon Sep 17 00:00:00 2001 From: Shawn Dempsey Date: Wed, 23 Nov 2022 12:48:59 -0800 Subject: [PATCH 2/7] [Fabric] Convert UIView to RCTUIView shim --- .../RCTActivityIndicatorViewComponentView.h | 2 +- .../Image/RCTImageComponentView.h | 2 +- .../RCTInputAccessoryComponentView.h | 2 +- .../RCTInputAccessoryComponentView.mm | 16 ++++++------ .../RCTInputAccessoryContentView.h | 2 +- .../RCTInputAccessoryContentView.mm | 6 ++--- ...CTLegacyViewManagerInteropComponentView.mm | 12 ++++----- ...gacyViewManagerInteropCoordinatorAdapter.h | 2 +- ...acyViewManagerInteropCoordinatorAdapter.mm | 2 +- .../Modal/RCTModalHostViewComponentView.h | 2 +- .../Modal/RCTModalHostViewComponentView.mm | 10 +++---- .../Root/RCTRootComponentView.h | 2 +- .../RCTSafeAreaViewComponentView.h | 2 +- .../ScrollView/RCTEnhancedScrollView.h | 2 +- .../ScrollView/RCTEnhancedScrollView.mm | 2 +- .../RCTPullToRefreshViewComponentView.h | 2 +- .../ScrollView/RCTScrollViewComponentView.h | 6 ++--- .../ScrollView/RCTScrollViewComponentView.mm | 22 ++++++++-------- .../Slider/RCTSliderComponentView.h | 2 +- .../Switch/RCTSwitchComponentView.h | 2 +- .../Text/RCTAccessibilityElement.mm | 2 +- ...TParagraphComponentAccessibilityProvider.h | 2 +- ...ParagraphComponentAccessibilityProvider.mm | 4 +-- .../Text/RCTParagraphComponentView.h | 2 +- .../TextInput/RCTTextInputComponentView.h | 2 +- .../TextInput/RCTTextInputComponentView.mm | 6 ++--- .../TextInput/RCTTextInputUtils.h | 4 +-- .../TextInput/RCTTextInputUtils.mm | 4 +-- .../RCTUnimplementedViewComponentView.h | 2 +- .../View/RCTViewComponentView.h | 6 ++--- .../View/RCTViewComponentView.mm | 26 +++++++++---------- .../Mounting/RCTComponentViewDescriptor.h | 2 +- .../Mounting/RCTComponentViewProtocol.h | 4 +-- .../Mounting/RCTComponentViewRegistry.h | 2 +- .../Mounting/RCTComponentViewRegistry.mm | 2 +- React/Fabric/Mounting/RCTMountingManager.h | 4 +-- React/Fabric/Mounting/RCTMountingManager.mm | 19 +++++++------- .../Mounting/UIView+ComponentViewProtocol.h | 8 +++--- .../Mounting/UIView+ComponentViewProtocol.mm | 10 +++---- React/Fabric/RCTSurfacePresenter.h | 2 +- React/Fabric/RCTSurfacePresenter.mm | 6 ++--- React/Fabric/RCTSurfaceTouchHandler.h | 4 +-- React/Fabric/RCTSurfaceTouchHandler.mm | 14 +++++----- React/Fabric/Surface/RCTFabricSurface.h | 6 ++--- React/Views/RCTModalHostView.h | 2 +- React/Views/RCTWeakViewHolder.h | 2 +- React/Views/RCTWrapperViewController.h | 2 +- React/Views/UIView+React.h | 2 +- .../RCTLegacyViewManagerInteropCoordinator.h | 4 +-- .../RCTLegacyViewManagerInteropCoordinator.mm | 8 +++--- 50 files changed, 132 insertions(+), 131 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h index 1a2b1b14459027..922b161fd9d0a1 100644 --- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTActivityIndicatorViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h index d64bcbdc1a55fd..8b8668563a240f 100644 --- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTImageComponentView : RCTViewComponentView { @protected diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h index 45c477397bd9e2..36eca1f8578f98 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTInputAccessoryComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm index f78c2797f0ef7c..7fe4c7090a09e6 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm @@ -20,18 +20,18 @@ using namespace facebook::react; -static UIView *_Nullable RCTFindTextInputWithNativeId(UIView *view, NSString *nativeId) +static RCTUIView *_Nullable RCTFindTextInputWithNativeId(RCTUIView *view, NSString *nativeId) { if ([view respondsToSelector:@selector(inputAccessoryViewID)] && [view respondsToSelector:@selector(setInputAccessoryView:)]) { - UIView *typed = (UIView *)view; + RCTUIView *typed = (RCTUIView *)view; if (!nativeId || [typed.inputAccessoryViewID isEqualToString:nativeId]) { return typed; } } - for (UIView *subview in view.subviews) { - UIView *result = RCTFindTextInputWithNativeId(subview, nativeId); + for (RCTUIView *subview in view.subviews) { + RCTUIView *result = RCTFindTextInputWithNativeId(subview, nativeId); if (result) { return result; } @@ -44,7 +44,7 @@ @implementation RCTInputAccessoryComponentView { InputAccessoryShadowNode::ConcreteState::Shared _state; RCTInputAccessoryContentView *_contentView; RCTSurfaceTouchHandler *_touchHandler; - UIView __weak *_textInput; + RCTUIView __weak *_textInput; } - (instancetype)initWithFrame:(CGRect)frame @@ -83,7 +83,7 @@ - (BOOL)canBecomeFirstResponder return true; } -- (UIView *)inputAccessoryView +- (RCTUIView *)inputAccessoryView { return _contentView; } @@ -95,12 +95,12 @@ + (ComponentDescriptorProvider)componentDescriptorProvider return concreteComponentDescriptorProvider(); } -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { [_contentView insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { [childComponentView removeFromSuperview]; } diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h index 554614a47f8e9e..a7b40b88b2df6c 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h @@ -7,6 +7,6 @@ #import // TODO(macOS GH#774) -@interface RCTInputAccessoryContentView : UIView +@interface RCTInputAccessoryContentView : RCTUIView @end diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm index 09de0401910031..e4ee057f062e6e 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm @@ -8,7 +8,7 @@ #import "RCTInputAccessoryContentView.h" @implementation RCTInputAccessoryContentView { - UIView *_safeAreaContainer; + RCTUIView *_safeAreaContainer; NSLayoutConstraint *_heightConstraint; } @@ -17,7 +17,7 @@ - (instancetype)init if (self = [super init]) { self.autoresizingMask = UIViewAutoresizingFlexibleHeight; - _safeAreaContainer = [UIView new]; + _safeAreaContainer = [RCTUIView new]; _safeAreaContainer.translatesAutoresizingMaskIntoConstraints = NO; [self addSubview:_safeAreaContainer]; @@ -40,7 +40,7 @@ - (CGSize)intrinsicContentSize return CGSizeZero; } -- (void)insertSubview:(UIView *)view atIndex:(NSInteger)index +- (void)insertSubview:(RCTUIView *)view atIndex:(NSInteger)index { [_safeAreaContainer insertSubview:view atIndex:index]; } diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm index 5324963ea01a42..e0f171f28521eb 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm @@ -22,7 +22,7 @@ @implementation RCTLegacyViewManagerInteropComponentView { NSMutableArray *_viewsToBeMounted; - NSMutableArray *_viewsToBeUnmounted; + NSMutableArray *_viewsToBeUnmounted; RCTLegacyViewManagerInteropCoordinatorAdapter *_adapter; LegacyViewManagerInteropShadowNode::ConcreteState::Shared _state; BOOL _hasInvokedForwardingWarning; @@ -41,9 +41,9 @@ - (instancetype)initWithFrame:(CGRect)frame return self; } -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event +- (RCTUIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - UIView *result = [super hitTest:point withEvent:event]; + RCTUIView *result = [super hitTest:point withEvent:event]; if (result == _adapter.paperView) { return self; @@ -149,7 +149,7 @@ - (void)prepareForRecycle [super prepareForRecycle]; } -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { [_viewsToBeMounted addObject:@{ kRCTLegacyInteropChildIndexKey : [NSNumber numberWithInteger:index], @@ -157,7 +157,7 @@ - (void)mountChildComponentView:(UIView *)childCompone }]; } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { if (_adapter) { [_adapter.paperView removeReactSubview:childComponentView]; @@ -208,7 +208,7 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask [_viewsToBeMounted removeAllObjects]; - for (UIView *view in _viewsToBeUnmounted) { + for (RCTUIView *view in _viewsToBeUnmounted) { [_adapter.paperView removeReactSubview:view]; } diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h index 6fb76564eb510d..4af87750d7d39d 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithCoordinator:(RCTLegacyViewManagerInteropCoordinator *)coordinator reactTag:(NSInteger)tag; -@property (strong, nonatomic) UIView *paperView; +@property (strong, nonatomic) RCTUIView *paperView; @property (nonatomic, copy, nullable) void (^eventInterceptor)(std::string eventName, folly::dynamic event); diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm index 1a9611ea5ebacb..61b42deba21451 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm @@ -28,7 +28,7 @@ - (void)dealloc [_coordinator removeObserveForTag:_tag]; } -- (UIView *)paperView +- (RCTUIView *)paperView { if (!_paperView) { _paperView = [_coordinator createPaperViewWithTag:_tag]; diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h index 75a134f7d010b2..a0406f7dd1f82d 100644 --- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h @@ -9,7 +9,7 @@ #import /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTModalHostViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm index 28c4bd227b7cc9..d986ad6f12e7fb 100644 --- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm @@ -104,7 +104,7 @@ @implementation RCTModalHostViewComponentView { BOOL _shouldAnimatePresentation; BOOL _shouldPresent; BOOL _isPresented; - UIView *_modalContentsSnapshot; + RCTUIView *_modalContentsSnapshot; } - (instancetype)initWithFrame:(CGRect)frame @@ -165,7 +165,7 @@ - (void)ensurePresentedOnlyIfNeeded _isPresented = NO; // To animate dismissal of view controller, snapshot of // view hierarchy needs to be added to the UIViewController. - UIView *snapshot = _modalContentsSnapshot; + RCTUIView *snapshot = _modalContentsSnapshot; [self.viewController.view addSubview:snapshot]; [self dismissViewController:self.viewController @@ -198,7 +198,7 @@ - (void)mountingTransactionWillMount:(MountingTransaction const &)transaction _modalContentsSnapshot = [self.viewController.view snapshotViewAfterScreenUpdates:NO]; } -#pragma mark - UIView methods +#pragma mark - RCTUIView methods - (void)didMoveToWindow { @@ -269,12 +269,12 @@ - (void)updateState:(facebook::react::State::Shared const &)state _state = std::static_pointer_cast(state); } -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { [self.viewController.view insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { [childComponentView removeFromSuperview]; } diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h index e028aed693b1ad..a08957e6f31493 100644 --- a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTRootComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h index 84e11aacbfcb08..fadcbe6fe74ca2 100644 --- a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTSafeAreaViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h index 3c85ab290f8494..9f25addd017c39 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN */ @protocol RCTEnhancedScrollViewOverridingDelegate -- (BOOL)touchesShouldCancelInContentView:(UIView *)view; +- (BOOL)touchesShouldCancelInContentView:(RCTUIView *)view; @end diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm index 93af874f451c58..98b0ebb494ee4b 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm @@ -88,7 +88,7 @@ - (void)setContentOffset:(CGPoint)contentOffset RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y")); } -- (BOOL)touchesShouldCancelInContentView:(UIView *)view +- (BOOL)touchesShouldCancelInContentView:(RCTUIView *)view { if ([_overridingDelegate respondsToSelector:@selector(touchesShouldCancelInContentView:)]) { return [_overridingDelegate touchesShouldCancelInContentView:view]; diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h index 264d306b49b51c..5b7ae636c53d9f 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * UIView class for root component. + * RCTUIView class for root component. * This view is designed to only serve ViewController-like purpose for the actual `UIRefreshControl` view which is being * attached to some `UIScrollView` (not to this view). */ diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h index 785d28a47c79dd..a522cb6a59b4cc 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * UIView class for component. + * RCTUIView class for component. * * By design, the class does not implement any logic that contradicts to the normal behavior of UIScrollView and does * not contain any special/custom support for things like floating headers, pull-to-refresh components, @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN /* * Finds and returns the closet RCTScrollViewComponentView component to the given view */ -+ (nullable RCTScrollViewComponentView *)findScrollViewComponentViewForView:(UIView *)view; ++ (nullable RCTScrollViewComponentView *)findScrollViewComponentViewForView:(RCTUIView *)view; /* * Returns an actual UIScrollView that this component uses under the hood. @@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN * separate component views from auxiliary views to be able to reliably implement pull-to-refresh- and RTL-related * functionality. */ -@property (nonatomic, strong, readonly) UIView *containerView; +@property (nonatomic, strong, readonly) RCTUIView *containerView; /* * Returns a delegate splitter that can be used to subscribe for UIScrollView delegate. diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index 2ebbb0e82ac91e..f412027a6b11ff 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -102,7 +102,7 @@ @implementation RCTScrollViewComponentView { CGPoint _contentOffsetWhenClipped; } -+ (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(UIView *)view ++ (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(RCTUIView *)view { do { view = view.superview; @@ -124,7 +124,7 @@ - (instancetype)initWithFrame:(CGRect)frame _shouldUpdateContentInsetAdjustmentBehavior = YES; [self addSubview:_scrollView]; - _containerView = [[UIView alloc] initWithFrame:CGRectZero]; + _containerView = [[RCTUIView alloc] initWithFrame:CGRectZero]; [_scrollView addSubview:_containerView]; [self.scrollViewDelegateSplitter addDelegate:self]; @@ -334,12 +334,12 @@ - (void)_preserveContentOffsetIfNeededWithBlock:(void (^)())block [((RCTEnhancedScrollView *)_scrollView) preserveContentOffsetWithBlock:block]; } -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { [_containerView insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { [childComponentView removeFromSuperview]; } @@ -350,11 +350,11 @@ - (void)unmountChildComponentView:(UIView *)childCompo */ - (BOOL)_shouldDisableScrollInteraction { - UIView *ancestorView = self.superview; + RCTUIView *ancestorView = self.superview; while (ancestorView) { if ([ancestorView respondsToSelector:@selector(isJSResponder)]) { - BOOL isJSResponder = ((UIView *)ancestorView).isJSResponder; + BOOL isJSResponder = ((RCTUIView *)ancestorView).isJSResponder; if (isJSResponder) { return YES; } @@ -409,7 +409,7 @@ - (void)prepareForRecycle #pragma mark - UIScrollViewDelegate -- (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view +- (BOOL)touchesShouldCancelInContentView:(__unused RCTUIView *)view { // Historically, `UIScrollView`s in React Native do not cancel touches // started on `UIControl`-based views (as normal iOS `UIScrollView`s do). @@ -519,7 +519,7 @@ - (void)_handleFinishedScrolling:(UIScrollView *)scrollView [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable UIView *)view +- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view { [self _forceDispatchNextScrollEvent]; @@ -530,7 +530,7 @@ - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable std::static_pointer_cast(_eventEmitter)->onScrollBeginDrag([self _scrollViewMetrics]); } -- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable UIView *)view atScale:(CGFloat)scale +- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view atScale:(CGFloat)scale { [self _forceDispatchNextScrollEvent]; @@ -542,7 +542,7 @@ - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable UI [self _updateStateWithContentOffset]; } -- (UIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView +- (RCTUIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView { return _containerView; } @@ -610,7 +610,7 @@ - (void)scrollToEnd:(BOOL)animated #pragma mark - Child views mounting -- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView +- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView { // Do nothing. ScrollView manages its subview clipping individually in `_remountChildren`. } diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h index a436db3af4bf1f..4e013dc89c2a4f 100644 --- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTSliderComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h index 77b88e8c316a85..7f1a4a7058564a 100644 --- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for root component. + * RCTUIView class for root component. */ @interface RCTSwitchComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm index 7ce44a3f1741cf..e90f909e8507a7 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm @@ -11,7 +11,7 @@ @implementation RCTAccessibilityElement - (CGRect)accessibilityFrame { - UIView *container = (UIView *)self.accessibilityContainer; + RCTUIView *container = (RCTUIView *)self.accessibilityContainer; if (CGRectEqualToRect(_frame, CGRectZero)) { return UIAccessibilityConvertFrameToScreenCoordinates(container.bounds, container); } else { diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h index 5187981b4f806d..4ac6e253c2180e 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h @@ -19,7 +19,7 @@ layoutManager:(RCTTextLayoutManager *)layoutManager paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes frame:(CGRect)frame - view:(UIView *)view; + view:(RCTUIView *)view; /* * Returns an array of `UIAccessibilityElement`s to be used for `UIAccessibilityContainer` implementation. diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm index 13723e178bc6e8..41846f161aa3a9 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm @@ -26,14 +26,14 @@ @implementation RCTParagraphComponentAccessibilityProvider { RCTTextLayoutManager *_layoutManager; ParagraphAttributes _paragraphAttributes; CGRect _frame; - __weak UIView *_view; + __weak RCTUIView *_view; } - (instancetype)initWithString:(facebook::react::AttributedString)attributedString layoutManager:(RCTTextLayoutManager *)layoutManager paragraphAttributes:(ParagraphAttributes)paragraphAttributes frame:(CGRect)frame - view:(UIView *)view + view:(RCTUIView *)view { if (self = [super init]) { _attributedString = attributedString; diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h index 050fb5a1ebceba..624fc90edaeb2d 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * UIView class for component. + * RCTUIView class for component. */ @interface RCTParagraphComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h index d36a4f11ffbaf8..83c9a7594ecd9c 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for component. + * RCTUIView class for component. */ @interface RCTTextInputComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index c78fe580dc429b..0a44aebb67fdb3 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -30,7 +30,7 @@ @interface RCTTextInputComponentView () *_backedTextInputView; + RCTUIView *_backedTextInputView; NSUInteger _mostRecentEventCount; NSAttributedString *_lastStringStateWasUpdatedWith; @@ -58,7 +58,7 @@ @implementation RCTTextInputComponentView { BOOL _didMoveToWindow; } -#pragma mark - UIView overrides +#pragma mark - RCTUIView overrides - (instancetype)initWithFrame:(CGRect)frame { @@ -603,7 +603,7 @@ - (void)_setAttributedString:(NSAttributedString *)attributedString - (void)_setMultiline:(BOOL)multiline { [_backedTextInputView removeFromSuperview]; - UIView *backedTextInputView = multiline ? [RCTUITextView new] : [RCTUITextField new]; + RCTUIView *backedTextInputView = multiline ? [RCTUITextView new] : [RCTUITextField new]; backedTextInputView.frame = _backedTextInputView.frame; RCTCopyBackedTextInput(_backedTextInputView, backedTextInputView); _backedTextInputView = backedTextInputView; diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h index 1d170c50bc50f6..ca2294a5a1ca64 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h @@ -15,8 +15,8 @@ NS_ASSUME_NONNULL_BEGIN void RCTCopyBackedTextInput( - UIView *fromTextInput, - UIView *toTextInput); + RCTUIView *fromTextInput, + RCTUIView *toTextInput); UITextAutocorrectionType RCTUITextAutocorrectionTypeFromOptionalBool(std::optional autoCorrect); diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm index 99f46819af9d09..ba9548c77b4ae8 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm @@ -19,8 +19,8 @@ } void RCTCopyBackedTextInput( - UIView *fromTextInput, - UIView *toTextInput) + RCTUIView *fromTextInput, + RCTUIView *toTextInput) { toTextInput.attributedText = RCTSanitizeAttributedString(fromTextInput.attributedText); toTextInput.placeholder = fromTextInput.placeholder; diff --git a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h index 5354d3611035ab..1c6e6b9a2562cb 100644 --- a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * UIView class for all kinds of components. + * RCTUIView class for all kinds of components. */ @interface RCTUnimplementedViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h index 273ee5c4905c9d..c10f9d54e021c4 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h @@ -20,9 +20,9 @@ NS_ASSUME_NONNULL_BEGIN /** - * UIView class for component. + * RCTUIView class for component. */ -@interface RCTViewComponentView : UIView { +@interface RCTViewComponentView : RCTUIView { @protected facebook::react::LayoutMetrics _layoutMetrics; facebook::react::SharedViewProps _props; @@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN * to embed/bridge pure native views as component views. * Defaults to `nil`. Assign `nil` to remove view as subview. */ -@property (nonatomic, strong, nullable) UIView *contentView; +@property (nonatomic, strong, nullable) RCTUIView *contentView; /** * Provides access to `nativeId` prop of the component. diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index c38f932ff064d5..6f98749a8e066a 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -26,7 +26,7 @@ @implementation RCTViewComponentView { BOOL _needsInvalidateLayer; BOOL _isJSResponder; BOOL _removeClippedSubviews; - NSMutableArray *_reactSubviews; + NSMutableArray *_reactSubviews; NSSet *_Nullable _propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN; } @@ -48,7 +48,7 @@ - (instancetype)initWithFrame:(CGRect)frame return _props; } -- (void)setContentView:(UIView *)contentView +- (void)setContentView:(RCTUIView *)contentView { if (_contentView) { [_contentView removeFromSuperview]; @@ -92,7 +92,7 @@ + (ComponentDescriptorProvider)componentDescriptorProvider return concreteComponentDescriptorProvider(); } -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { RCTAssert( childComponentView.superview == nil, @@ -109,7 +109,7 @@ - (void)mountChildComponentView:(UIView *)childCompone } } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { if (_removeClippedSubviews) { [_reactSubviews removeObjectAtIndex:index]; @@ -133,7 +133,7 @@ - (void)unmountChildComponentView:(UIView *)childCompo [childComponentView removeFromSuperview]; } -- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView +- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView { if (!_removeClippedSubviews) { // Use default behavior if unmounting is disabled @@ -154,7 +154,7 @@ - (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIVie clipRect = [clipView convertRect:clipRect toView:self]; // Mount / unmount views - for (UIView *view in _reactSubviews) { + for (RCTUIView *view in _reactSubviews) { if (CGRectIntersectsRect(clipRect, view.frame)) { // View is at least partially visible, so remount it if unmounted [self addSubview:view]; @@ -438,7 +438,7 @@ - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(NSSetpointerEvents) { case PointerEventsMode::Auto: @@ -480,7 +480,7 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event case PointerEventsMode::BoxOnly: return [self pointInside:point withEvent:event] ? self : nil; case PointerEventsMode::BoxNone: - UIView *view = [self betterHitTest:point withEvent:event]; + RCTUIView *view = [self betterHitTest:point withEvent:event]; return view != self ? view : nil; } } @@ -662,10 +662,10 @@ - (NSObject *)accessibilityElement return self; } -static NSString *RCTRecursiveAccessibilityLabel(UIView *view) +static NSString *RCTRecursiveAccessibilityLabel(RCTUIView *view) { NSMutableString *result = [NSMutableString stringWithString:@""]; - for (UIView *subview in view.subviews) { + for (RCTUIView *subview in view.subviews) { NSString *label = subview.accessibilityLabel; if (!label) { label = RCTRecursiveAccessibilityLabel(subview); diff --git a/React/Fabric/Mounting/RCTComponentViewDescriptor.h b/React/Fabric/Mounting/RCTComponentViewDescriptor.h index 753fb399f70ae0..96220bd67d2cee 100644 --- a/React/Fabric/Mounting/RCTComponentViewDescriptor.h +++ b/React/Fabric/Mounting/RCTComponentViewDescriptor.h @@ -21,7 +21,7 @@ class RCTComponentViewDescriptor final { /* * Associated (and owned) native view instance. */ - __strong UIView *view = nil; + __strong RCTUIView *view = nil; /* * Indicates a requirement to call on the view methods from diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h index 6f0f98fa14062b..11950e8a42d605 100644 --- a/React/Fabric/Mounting/RCTComponentViewProtocol.h +++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h @@ -54,14 +54,14 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) { * component view. * Receiver must add `childComponentView` as a subview. */ -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index; +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; /* * Called for unmounting (detaching) a child component view from `self` * component view. * Receiver must remove `childComponentView` as a subview. */ -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index; +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; /* * Called for updating component's props. diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.h b/React/Fabric/Mounting/RCTComponentViewRegistry.h index 31acca6a2069f6..8ba300d0e1abe1 100644 --- a/React/Fabric/Mounting/RCTComponentViewRegistry.h +++ b/React/Fabric/Mounting/RCTComponentViewRegistry.h @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN * Finds a native component view by given `tag`. * Returns `nil` if there is no registered component with the `tag`. */ -- (nullable UIView *)findComponentViewWithTag:(facebook::react::Tag)tag; +- (nullable RCTUIView *)findComponentViewWithTag:(facebook::react::Tag)tag; /** * Creates a component view with a given type and puts it to the recycle pool. diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/React/Fabric/Mounting/RCTComponentViewRegistry.mm index afd8024939f74a..247d2d373d01e5 100644 --- a/React/Fabric/Mounting/RCTComponentViewRegistry.mm +++ b/React/Fabric/Mounting/RCTComponentViewRegistry.mm @@ -116,7 +116,7 @@ - (void)optimisticallyCreateComponentViewWithComponentHandle:(ComponentHandle)co return iterator->second; } -- (nullable UIView *)findComponentViewWithTag:(Tag)tag +- (nullable RCTUIView *)findComponentViewWithTag:(Tag)tag { RCTAssertMainQueue(); auto iterator = _registry.find(tag); diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h index 235ac0539a8e6e..406ca55cc37e15 100644 --- a/React/Fabric/Mounting/RCTMountingManager.h +++ b/React/Fabric/Mounting/RCTMountingManager.h @@ -36,12 +36,12 @@ NS_ASSUME_NONNULL_BEGIN * influence the intrinsic size of the view and cannot be measured using UIView/UIKit layout API. * Must be called on the main thead. */ -- (void)attachSurfaceToView:(UIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; +- (void)attachSurfaceToView:(RCTUIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; /** * Stops designating the view as a rendering viewport of a React Native surface. */ -- (void)detachSurfaceFromView:(UIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; +- (void)detachSurfaceFromView:(RCTUIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; /** * Schedule a mounting transaction to be performed on the main thread. diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm index 66ff0d50fdf2c9..f25863bbb718af 100644 --- a/React/Fabric/Mounting/RCTMountingManager.mm +++ b/React/Fabric/Mounting/RCTMountingManager.mm @@ -29,7 +29,7 @@ using namespace facebook::react; -static SurfaceId RCTSurfaceIdForView(UIView *view) +static SurfaceId RCTSurfaceIdForView(RCTUIView *view) { do { if (RCTIsReactRootView(@(view.tag))) { @@ -81,7 +81,7 @@ static void RCTPerformMountInstructions( auto &newChildViewDescriptor = [registry componentViewDescriptorWithTag:newChildShadowView.tag]; auto &parentViewDescriptor = [registry componentViewDescriptorWithTag:parentShadowView.tag]; - UIView *newChildComponentView = newChildViewDescriptor.view; + RCTUIView *newChildComponentView = newChildViewDescriptor.view; RCTAssert(newChildShadowView.props, @"`newChildShadowView.props` must not be null."); @@ -109,7 +109,7 @@ static void RCTPerformMountInstructions( auto &oldChildShadowView = mutation.oldChildShadowView; auto &newChildShadowView = mutation.newChildShadowView; auto &newChildViewDescriptor = [registry componentViewDescriptorWithTag:newChildShadowView.tag]; - UIView *newChildComponentView = newChildViewDescriptor.view; + RCTUIView *newChildComponentView = newChildViewDescriptor.view; auto mask = RNComponentViewUpdateMask{}; @@ -168,7 +168,7 @@ - (void)setContextContainer:(ContextContainer::Shared)contextContainer _contextContainer = contextContainer; } -- (void)attachSurfaceToView:(UIView *)view surfaceId:(SurfaceId)surfaceId +- (void)attachSurfaceToView:(RCTUIView *)view surfaceId:(SurfaceId)surfaceId { RCTAssertMainQueue(); @@ -179,7 +179,7 @@ - (void)attachSurfaceToView:(UIView *)view surfaceId:(SurfaceId)surfaceId [view addSubview:rootViewDescriptor.view]; } -- (void)detachSurfaceFromView:(UIView *)view surfaceId:(SurfaceId)surfaceId +- (void)detachSurfaceFromView:(RCTUIView *)view surfaceId:(SurfaceId)surfaceId { RCTAssertMainQueue(); RCTComponentViewDescriptor rootViewDescriptor = [_componentViewRegistry componentViewDescriptorWithTag:surfaceId]; @@ -287,7 +287,8 @@ - (void)setIsJSResponder:(BOOL)isJSResponder { ReactTag reactTag = shadowView.tag; RCTExecuteOnMainQueue(^{ - UIView *componentView = [self->_componentViewRegistry findComponentViewWithTag:reactTag]; + RCTUIView *componentView = + [self->_componentViewRegistry findComponentViewWithTag:reactTag]; [componentView setIsJSResponder:isJSResponder]; }); } @@ -297,7 +298,7 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag componentDescriptor:(const ComponentDescriptor &)componentDescriptor { RCTAssertMainQueue(); - UIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; + RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; SurfaceId surfaceId = RCTSurfaceIdForView(componentView); Props::Shared oldProps = [componentView props]; Props::Shared newProps = componentDescriptor.cloneProps( @@ -331,14 +332,14 @@ - (void)synchronouslyDispatchCommandOnUIThread:(ReactTag)reactTag args:(NSArray *)args { RCTAssertMainQueue(); - UIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; + RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; [componentView handleCommand:commandName args:args]; } - (void)synchronouslyDispatchAccessbilityEventOnUIThread:(ReactTag)reactTag eventType:(NSString *)eventType { if ([@"focus" isEqualToString:eventType]) { - UIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; + RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, componentView); } } diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h index a17eb8a6db6f7e..0810ff47160b72 100644 --- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h +++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h @@ -14,13 +14,13 @@ NS_ASSUME_NONNULL_BEGIN /** * Default implementation of RCTComponentViewProtocol. */ -@interface UIView (ComponentViewProtocol) +@interface RCTUIView (ComponentViewProtocol) + (std::vector)supplementalComponentDescriptorProviders; -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index; +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index; +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; - (void)updateProps:(facebook::react::Props::Shared const &)props oldProps:(facebook::react::Props::Shared const &)oldProps; @@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet *)props; - (nullable NSSet *)propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN; -- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView; +- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView; @end diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm index 4a4bd1eb5d556e..9904e95a8d268e 100644 --- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm +++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm @@ -15,7 +15,7 @@ using namespace facebook::react; -@implementation UIView (ComponentViewProtocol) +@implementation RCTUIView (ComponentViewProtocol) + (ComponentDescriptorProvider)componentDescriptorProvider { @@ -28,7 +28,7 @@ + (ComponentDescriptorProvider)componentDescriptorProvider return {}; } -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { RCTAssert( childComponentView.superview == nil, @@ -40,7 +40,7 @@ - (void)mountChildComponentView:(UIView *)childCompone [self insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index { RCTAssert( childComponentView.superview == self, @@ -156,14 +156,14 @@ - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet *componentView = + RCTUIView *componentView = [_mountingManager.componentViewRegistry findComponentViewWithTag:tag]; return componentView; } @@ -186,7 +186,7 @@ - (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag props:(NSDictiona } ReactTag tag = [reactTag integerValue]; - UIView *componentView = + RCTUIView *componentView = [_mountingManager.componentViewRegistry findComponentViewWithTag:tag]; if (componentView == nil) { return NO; // This view probably isn't managed by Fabric diff --git a/React/Fabric/RCTSurfaceTouchHandler.h b/React/Fabric/RCTSurfaceTouchHandler.h index 8df850191b8e4a..6cf7275c38f24b 100644 --- a/React/Fabric/RCTSurfaceTouchHandler.h +++ b/React/Fabric/RCTSurfaceTouchHandler.h @@ -15,8 +15,8 @@ NS_ASSUME_NONNULL_BEGIN * Attaches (and detaches) a view to the touch handler. * The receiver does not retain the provided view. */ -- (void)attachToView:(UIView *)view; -- (void)detachFromView:(UIView *)view; +- (void)attachToView:(RCTUIView *)view; +- (void)detachFromView:(RCTUIView *)view; /* * Offset of the attached view relative to the root component in points. diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm index 0faf668f488622..03db3dfb1c6603 100644 --- a/React/Fabric/RCTSurfaceTouchHandler.mm +++ b/React/Fabric/RCTSurfaceTouchHandler.mm @@ -60,7 +60,7 @@ typedef NS_ENUM(NSInteger, RCTTouchEventType) { /* * A component view on which the touch was begun. */ - __strong UIView *componentView = nil; + __strong RCTUIView *componentView = nil; struct Hasher { size_t operator()(const ActiveTouch &activeTouch) const @@ -80,7 +80,7 @@ bool operator()(const ActiveTouch &lhs, const ActiveTouch &rhs) const static void UpdateActiveTouchWithUITouch( ActiveTouch &activeTouch, UITouch *uiTouch, - UIView *rootComponentView, + RCTUIView *rootComponentView, CGPoint rootViewOriginOffset) { CGPoint offsetPoint = [uiTouch locationInView:activeTouch.componentView]; @@ -99,12 +99,12 @@ static void UpdateActiveTouchWithUITouch( } } -static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, UIView *rootComponentView, CGPoint rootViewOriginOffset) +static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, RCTUIView *rootComponentView, CGPoint rootViewOriginOffset) { ActiveTouch activeTouch = {}; // Find closest Fabric-managed touchable view - UIView *componentView = uiTouch.view; + RCTUIView *componentView = uiTouch.view; while (componentView) { if ([componentView respondsToSelector:@selector(touchEventEmitterAtPoint:)]) { activeTouch.eventEmitter = [(id)componentView @@ -164,7 +164,7 @@ @implementation RCTSurfaceTouchHandler { /* * We hold the view weakly to prevent a retain cycle. */ - __weak UIView *_rootComponentView; + __weak RCTUIView *_rootComponentView; IdentifierPool<11> _identifierPool; } @@ -187,7 +187,7 @@ - (instancetype)init RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)action) -- (void)attachToView:(UIView *)view +- (void)attachToView:(RCTUIView *)view { RCTAssert(self.view == nil, @"RCTTouchHandler already has attached view."); @@ -195,7 +195,7 @@ - (void)attachToView:(UIView *)view _rootComponentView = view; } -- (void)detachFromView:(UIView *)view +- (void)detachFromView:(RCTUIView *)view { RCTAssertParam(view); RCTAssert(self.view == view, @"RCTTouchHandler attached to another view."); diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h index 7e9d280210de0c..30eee121727f98 100644 --- a/React/Fabric/Surface/RCTFabricSurface.h +++ b/React/Fabric/Surface/RCTFabricSurface.h @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN * The primary goals of the RCTSurface are: * * ability to measure and layout the surface in a thread-safe * and synchronous manner; - * * ability to create a UIView instance on demand (later); + * * ability to create a RCTUIView instance on demand (later); * * ability to communicate the current stage of the surface granularly. */ @interface RCTFabricSurface : NSObject @@ -47,12 +47,12 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)resetWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter; -#pragma mark - Dealing with UIView representation, the Main thread only access +#pragma mark - Dealing with RCTUIView representation, the Main thread only access /** * Creates (if needed) and returns `UIView` instance which represents the Surface. * The Surface will cache and *retain* this object. - * Returning the UIView instance does not mean that the Surface is ready + * Returning the RCTUIView instance does not mean that the Surface is ready * to execute and layout. It can be just a handler which Surface will use later * to mount the actual views. * RCTSurface does not control (or influence in any way) the size or origin diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h index be36ac164f0e76..73cd7cdf267328 100644 --- a/React/Views/RCTModalHostView.h +++ b/React/Views/RCTModalHostView.h @@ -16,7 +16,7 @@ @protocol RCTModalHostViewInteractor; -@interface RCTModalHostView : UIView +@interface RCTModalHostView : RCTUIView @property (nonatomic, copy) NSString *animationType; @property (nonatomic, assign) UIModalPresentationStyle presentationStyle; diff --git a/React/Views/RCTWeakViewHolder.h b/React/Views/RCTWeakViewHolder.h index 5417f2e2e775ec..ae623c152fe871 100644 --- a/React/Views/RCTWeakViewHolder.h +++ b/React/Views/RCTWeakViewHolder.h @@ -14,6 +14,6 @@ */ @protocol RCTWeakViewHolder -@property (nonatomic, strong) NSMapTable *weakViews; +@property (nonatomic, strong) NSMapTable *weakViews; @end diff --git a/React/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h index 97f4816c9550eb..838394f5397518 100644 --- a/React/Views/RCTWrapperViewController.h +++ b/React/Views/RCTWrapperViewController.h @@ -11,6 +11,6 @@ @interface RCTWrapperViewController : UIViewController -- (instancetype)initWithContentView:(UIView *)contentView NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithContentView:(RCTUIView *)contentView NS_DESIGNATED_INITIALIZER; @end diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h index 94f1991a3b2df8..d0b3345ef7b15a 100644 --- a/React/Views/UIView+React.h +++ b/React/Views/UIView+React.h @@ -29,7 +29,7 @@ /** * Determines whether or not a view should ignore inverted colors or not. Used to set - * UIView property accessibilityIgnoresInvertColors in iOS 11+. + * RCTUIView property accessibilityIgnoresInvertColors in iOS 11+. */ @property (nonatomic, assign) BOOL shouldAccessibilityIgnoresInvertColors; diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h index 7dec6d6bc19a01..a17f117ca97feb 100644 --- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h @@ -20,13 +20,13 @@ typedef void (^InterceptorBlock)(std::string eventName, folly::dynamic event); - (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(RCTBridge *)bridge; -- (UIView *)createPaperViewWithTag:(NSInteger)tag; +- (RCTUIView *)createPaperViewWithTag:(NSInteger)tag; - (void)addObserveForTag:(NSInteger)tag usingBlock:(InterceptorBlock)block; - (void)removeObserveForTag:(NSInteger)tag; -- (void)setProps:(folly::dynamic const &)props forView:(UIView *)view; +- (void)setProps:(folly::dynamic const &)props forView:(RCTUIView *)view; - (NSString *)componentViewName; diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm index 0e21b7b1f218f1..cddafeee1cea93 100644 --- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm @@ -27,7 +27,7 @@ @implementation RCTLegacyViewManagerInteropCoordinator { __weak RCTBridge *_bridge; /* Each instance of `RCTLegacyViewManagerInteropComponentView` registers a block to which events are dispatched. - This is the container that maps unretained UIView pointer to a block to which the event is dispatched. + This is the container that maps unretained RCTUIView pointer to a block to which the event is dispatched. */ NSMutableDictionary *_eventInterceptors; @@ -71,9 +71,9 @@ - (void)removeObserveForTag:(NSInteger)tag [_eventInterceptors removeObjectForKey:[NSNumber numberWithInteger:tag]]; } -- (UIView *)createPaperViewWithTag:(NSInteger)tag; +- (RCTUIView *)createPaperViewWithTag:(NSInteger)tag; { - UIView *view = [_componentData createViewWithTag:[NSNumber numberWithInteger:tag] rootTag:NULL]; + RCTUIView *view = [_componentData createViewWithTag:[NSNumber numberWithInteger:tag] rootTag:NULL]; if ([_componentData.bridgelessViewManager conformsToProtocol:@protocol(RCTWeakViewHolder)]) { id weakViewHolder = (id)_componentData.bridgelessViewManager; if (!weakViewHolder.weakViews) { @@ -84,7 +84,7 @@ - (UIView *)createPaperViewWithTag:(NSInteger)tag; return view; } -- (void)setProps:(folly::dynamic const &)props forView:(UIView *)view +- (void)setProps:(folly::dynamic const &)props forView:(RCTUIView *)view { if (props.isObject()) { NSDictionary *convertedProps = convertFollyDynamicToId(props); From 45f69bd2cd78d72eae22961a0f3ffd383b2c7754 Mon Sep 17 00:00:00 2001 From: Shawn Dempsey Date: Wed, 30 Nov 2022 11:26:57 -0800 Subject: [PATCH 3/7] Add macOS tags --- .../RCTActivityIndicatorViewComponentView.h | 2 +- .../Image/RCTImageComponentView.h | 2 +- .../RCTInputAccessoryComponentView.h | 2 +- .../RCTInputAccessoryComponentView.mm | 16 ++++++------ .../RCTInputAccessoryContentView.h | 2 +- .../RCTInputAccessoryContentView.mm | 6 ++--- ...CTLegacyViewManagerInteropComponentView.mm | 12 ++++----- ...gacyViewManagerInteropCoordinatorAdapter.h | 2 +- ...acyViewManagerInteropCoordinatorAdapter.mm | 2 +- .../Modal/RCTModalHostViewComponentView.h | 2 +- .../Modal/RCTModalHostViewComponentView.mm | 10 +++---- .../Root/RCTRootComponentView.h | 2 +- .../RCTSafeAreaViewComponentView.h | 2 +- .../ScrollView/RCTEnhancedScrollView.h | 2 +- .../ScrollView/RCTEnhancedScrollView.mm | 2 +- .../RCTPullToRefreshViewComponentView.h | 2 +- .../ScrollView/RCTScrollViewComponentView.h | 6 ++--- .../ScrollView/RCTScrollViewComponentView.mm | 22 ++++++++-------- .../Slider/RCTSliderComponentView.h | 2 +- .../Switch/RCTSwitchComponentView.h | 2 +- .../Text/RCTAccessibilityElement.mm | 2 +- ...TParagraphComponentAccessibilityProvider.h | 2 +- ...ParagraphComponentAccessibilityProvider.mm | 4 +-- .../Text/RCTParagraphComponentView.h | 2 +- .../TextInput/RCTTextInputComponentView.h | 2 +- .../TextInput/RCTTextInputComponentView.mm | 6 ++--- .../TextInput/RCTTextInputUtils.h | 4 +-- .../TextInput/RCTTextInputUtils.mm | 2 +- .../RCTUnimplementedViewComponentView.h | 2 +- .../View/RCTViewComponentView.h | 6 ++--- .../View/RCTViewComponentView.mm | 26 +++++++++---------- .../Mounting/RCTComponentViewDescriptor.h | 2 +- .../Mounting/RCTComponentViewProtocol.h | 4 +-- .../Mounting/RCTComponentViewRegistry.h | 2 +- .../Mounting/RCTComponentViewRegistry.mm | 2 +- React/Fabric/Mounting/RCTMountingManager.h | 4 +-- React/Fabric/Mounting/RCTMountingManager.mm | 18 ++++++------- .../Mounting/UIView+ComponentViewProtocol.h | 8 +++--- .../Mounting/UIView+ComponentViewProtocol.mm | 10 +++---- React/Fabric/RCTSurfacePresenter.h | 2 +- React/Fabric/RCTSurfacePresenter.mm | 6 ++--- React/Fabric/RCTSurfaceTouchHandler.h | 4 +-- React/Fabric/RCTSurfaceTouchHandler.mm | 4 +-- React/Fabric/Surface/RCTFabricSurface.h | 2 +- React/Views/RCTModalHostView.h | 2 +- React/Views/RCTWeakViewHolder.h | 2 +- React/Views/RCTWrapperViewController.h | 2 +- React/Views/UIView+React.h | 2 +- .../RCTLegacyViewManagerInteropCoordinator.h | 4 +-- .../RCTLegacyViewManagerInteropCoordinator.mm | 8 +++--- 50 files changed, 123 insertions(+), 123 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h index 922b161fd9d0a1..1a2b1b14459027 100644 --- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTActivityIndicatorViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h index 8b8668563a240f..d64bcbdc1a55fd 100644 --- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTImageComponentView : RCTViewComponentView { @protected diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h index 36eca1f8578f98..45c477397bd9e2 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTInputAccessoryComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm index 7fe4c7090a09e6..78d78b4d9731dc 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm @@ -20,18 +20,18 @@ using namespace facebook::react; -static RCTUIView *_Nullable RCTFindTextInputWithNativeId(RCTUIView *view, NSString *nativeId) +static RCTUIView *_Nullable RCTFindTextInputWithNativeId(RCTUIView *view, NSString *nativeId) // TODO(macOS GH#774) { if ([view respondsToSelector:@selector(inputAccessoryViewID)] && [view respondsToSelector:@selector(setInputAccessoryView:)]) { - RCTUIView *typed = (RCTUIView *)view; + RCTUIView *typed = (RCTUIView *)view; // TODO(macOS GH#774) if (!nativeId || [typed.inputAccessoryViewID isEqualToString:nativeId]) { return typed; } } - for (RCTUIView *subview in view.subviews) { - RCTUIView *result = RCTFindTextInputWithNativeId(subview, nativeId); + for (RCTUIView *subview in view.subviews) { // TODO(macOS GH#774) + RCTUIView *result = RCTFindTextInputWithNativeId(subview, nativeId); // TODO(macOS GH#774) if (result) { return result; } @@ -44,7 +44,7 @@ @implementation RCTInputAccessoryComponentView { InputAccessoryShadowNode::ConcreteState::Shared _state; RCTInputAccessoryContentView *_contentView; RCTSurfaceTouchHandler *_touchHandler; - RCTUIView __weak *_textInput; + RCTUIView __weak *_textInput; // TODO(macOS GH#774) } - (instancetype)initWithFrame:(CGRect)frame @@ -83,7 +83,7 @@ - (BOOL)canBecomeFirstResponder return true; } -- (RCTUIView *)inputAccessoryView +- (RCTUIView *)inputAccessoryView // TODO(macOS GH#774) { return _contentView; } @@ -95,12 +95,12 @@ + (ComponentDescriptorProvider)componentDescriptorProvider return concreteComponentDescriptorProvider(); } -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [_contentView insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [childComponentView removeFromSuperview]; } diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h index a7b40b88b2df6c..56d776887957bd 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.h @@ -7,6 +7,6 @@ #import // TODO(macOS GH#774) -@interface RCTInputAccessoryContentView : RCTUIView +@interface RCTInputAccessoryContentView : RCTUIView // TODO(macOS GH#774) @end diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm index e4ee057f062e6e..f24f61be44e84d 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm @@ -8,7 +8,7 @@ #import "RCTInputAccessoryContentView.h" @implementation RCTInputAccessoryContentView { - RCTUIView *_safeAreaContainer; + RCTUIView *_safeAreaContainer; // TODO(macOS GH#774) NSLayoutConstraint *_heightConstraint; } @@ -17,7 +17,7 @@ - (instancetype)init if (self = [super init]) { self.autoresizingMask = UIViewAutoresizingFlexibleHeight; - _safeAreaContainer = [RCTUIView new]; + _safeAreaContainer = [RCTUIView new]; // TODO(macOS GH#774) _safeAreaContainer.translatesAutoresizingMaskIntoConstraints = NO; [self addSubview:_safeAreaContainer]; @@ -40,7 +40,7 @@ - (CGSize)intrinsicContentSize return CGSizeZero; } -- (void)insertSubview:(RCTUIView *)view atIndex:(NSInteger)index +- (void)insertSubview:(RCTUIView *)view atIndex:(NSInteger)index // TODO(macOS GH#774) { [_safeAreaContainer insertSubview:view atIndex:index]; } diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm index e0f171f28521eb..3bc381b6cfed05 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm @@ -22,7 +22,7 @@ @implementation RCTLegacyViewManagerInteropComponentView { NSMutableArray *_viewsToBeMounted; - NSMutableArray *_viewsToBeUnmounted; + NSMutableArray *_viewsToBeUnmounted; // TODO(macOS GH#774) RCTLegacyViewManagerInteropCoordinatorAdapter *_adapter; LegacyViewManagerInteropShadowNode::ConcreteState::Shared _state; BOOL _hasInvokedForwardingWarning; @@ -41,9 +41,9 @@ - (instancetype)initWithFrame:(CGRect)frame return self; } -- (RCTUIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event +- (RCTUIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event // TODO(macOS GH#774) { - RCTUIView *result = [super hitTest:point withEvent:event]; + RCTUIView *result = [super hitTest:point withEvent:event]; // TODO(macOS GH#774) if (result == _adapter.paperView) { return self; @@ -149,7 +149,7 @@ - (void)prepareForRecycle [super prepareForRecycle]; } -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [_viewsToBeMounted addObject:@{ kRCTLegacyInteropChildIndexKey : [NSNumber numberWithInteger:index], @@ -157,7 +157,7 @@ - (void)mountChildComponentView:(RCTUIView *)childComp }]; } -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { if (_adapter) { [_adapter.paperView removeReactSubview:childComponentView]; @@ -208,7 +208,7 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask [_viewsToBeMounted removeAllObjects]; - for (RCTUIView *view in _viewsToBeUnmounted) { + for (RCTUIView *view in _viewsToBeUnmounted) { // TODO(macOS GH#774) [_adapter.paperView removeReactSubview:view]; } diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h index 4af87750d7d39d..fa5a263e1870cb 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithCoordinator:(RCTLegacyViewManagerInteropCoordinator *)coordinator reactTag:(NSInteger)tag; -@property (strong, nonatomic) RCTUIView *paperView; +@property (strong, nonatomic) RCTUIView *paperView; // TODO(macOS GH#774) @property (nonatomic, copy, nullable) void (^eventInterceptor)(std::string eventName, folly::dynamic event); diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm index 61b42deba21451..22d151d9e8b8a1 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm @@ -28,7 +28,7 @@ - (void)dealloc [_coordinator removeObserveForTag:_tag]; } -- (RCTUIView *)paperView +- (RCTUIView *)paperView // TODO(macOS GH#774) { if (!_paperView) { _paperView = [_coordinator createPaperViewWithTag:_tag]; diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h index a0406f7dd1f82d..75a134f7d010b2 100644 --- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h @@ -9,7 +9,7 @@ #import /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTModalHostViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm index d986ad6f12e7fb..67cd49b2e0e152 100644 --- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm @@ -104,7 +104,7 @@ @implementation RCTModalHostViewComponentView { BOOL _shouldAnimatePresentation; BOOL _shouldPresent; BOOL _isPresented; - RCTUIView *_modalContentsSnapshot; + RCTUIView *_modalContentsSnapshot; // TODO(macOS GH#774) } - (instancetype)initWithFrame:(CGRect)frame @@ -165,7 +165,7 @@ - (void)ensurePresentedOnlyIfNeeded _isPresented = NO; // To animate dismissal of view controller, snapshot of // view hierarchy needs to be added to the UIViewController. - RCTUIView *snapshot = _modalContentsSnapshot; + RCTUIView *snapshot = _modalContentsSnapshot; // TODO(macOS GH#774) [self.viewController.view addSubview:snapshot]; [self dismissViewController:self.viewController @@ -198,7 +198,7 @@ - (void)mountingTransactionWillMount:(MountingTransaction const &)transaction _modalContentsSnapshot = [self.viewController.view snapshotViewAfterScreenUpdates:NO]; } -#pragma mark - RCTUIView methods +#pragma mark - UIView methods - (void)didMoveToWindow { @@ -269,12 +269,12 @@ - (void)updateState:(facebook::react::State::Shared const &)state _state = std::static_pointer_cast(state); } -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [self.viewController.view insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [childComponentView removeFromSuperview]; } diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h index a08957e6f31493..e028aed693b1ad 100644 --- a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTRootComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h index fadcbe6fe74ca2..84e11aacbfcb08 100644 --- a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTSafeAreaViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h index 9f25addd017c39..87418d54696083 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN */ @protocol RCTEnhancedScrollViewOverridingDelegate -- (BOOL)touchesShouldCancelInContentView:(RCTUIView *)view; +- (BOOL)touchesShouldCancelInContentView:(RCTUIView *)view; // TODO(macOS GH#774) @end diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm index 98b0ebb494ee4b..e5d34b89703558 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm @@ -88,7 +88,7 @@ - (void)setContentOffset:(CGPoint)contentOffset RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y")); } -- (BOOL)touchesShouldCancelInContentView:(RCTUIView *)view +- (BOOL)touchesShouldCancelInContentView:(RCTUIView *)view // TODO(macOS GH#774) { if ([_overridingDelegate respondsToSelector:@selector(touchesShouldCancelInContentView:)]) { return [_overridingDelegate touchesShouldCancelInContentView:view]; diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h index 5b7ae636c53d9f..264d306b49b51c 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * RCTUIView class for root component. + * UIView class for root component. * This view is designed to only serve ViewController-like purpose for the actual `UIRefreshControl` view which is being * attached to some `UIScrollView` (not to this view). */ diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h index a522cb6a59b4cc..a01771f60868d1 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * RCTUIView class for component. + * UIView class for component. * * By design, the class does not implement any logic that contradicts to the normal behavior of UIScrollView and does * not contain any special/custom support for things like floating headers, pull-to-refresh components, @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN /* * Finds and returns the closet RCTScrollViewComponentView component to the given view */ -+ (nullable RCTScrollViewComponentView *)findScrollViewComponentViewForView:(RCTUIView *)view; ++ (nullable RCTScrollViewComponentView *)findScrollViewComponentViewForView:(RCTUIView *)view; // TODO(macOS GH#774) /* * Returns an actual UIScrollView that this component uses under the hood. @@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN * separate component views from auxiliary views to be able to reliably implement pull-to-refresh- and RTL-related * functionality. */ -@property (nonatomic, strong, readonly) RCTUIView *containerView; +@property (nonatomic, strong, readonly) RCTUIView *containerView; // TODO(macOS GH#774) /* * Returns a delegate splitter that can be used to subscribe for UIScrollView delegate. diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index f412027a6b11ff..bc4ae9b34c867b 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -102,7 +102,7 @@ @implementation RCTScrollViewComponentView { CGPoint _contentOffsetWhenClipped; } -+ (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(RCTUIView *)view ++ (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(RCTUIView *)view // TODO(macOS GH#774) { do { view = view.superview; @@ -124,7 +124,7 @@ - (instancetype)initWithFrame:(CGRect)frame _shouldUpdateContentInsetAdjustmentBehavior = YES; [self addSubview:_scrollView]; - _containerView = [[RCTUIView alloc] initWithFrame:CGRectZero]; + _containerView = [[RCTUIView alloc] initWithFrame:CGRectZero]; // TODO(macOS GH#774) [_scrollView addSubview:_containerView]; [self.scrollViewDelegateSplitter addDelegate:self]; @@ -334,12 +334,12 @@ - (void)_preserveContentOffsetIfNeededWithBlock:(void (^)())block [((RCTEnhancedScrollView *)_scrollView) preserveContentOffsetWithBlock:block]; } -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [_containerView insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [childComponentView removeFromSuperview]; } @@ -350,11 +350,11 @@ - (void)unmountChildComponentView:(RCTUIView *)childCo */ - (BOOL)_shouldDisableScrollInteraction { - RCTUIView *ancestorView = self.superview; + RCTUIView *ancestorView = self.superview; // TODO(macOS GH#774) while (ancestorView) { if ([ancestorView respondsToSelector:@selector(isJSResponder)]) { - BOOL isJSResponder = ((RCTUIView *)ancestorView).isJSResponder; + BOOL isJSResponder = ((RCTUIView *)ancestorView).isJSResponder; // TODO(macOS GH#774) if (isJSResponder) { return YES; } @@ -409,7 +409,7 @@ - (void)prepareForRecycle #pragma mark - UIScrollViewDelegate -- (BOOL)touchesShouldCancelInContentView:(__unused RCTUIView *)view +- (BOOL)touchesShouldCancelInContentView:(__unused RCTUIView *)view // TODO(macOS GH#774) { // Historically, `UIScrollView`s in React Native do not cancel touches // started on `UIControl`-based views (as normal iOS `UIScrollView`s do). @@ -519,7 +519,7 @@ - (void)_handleFinishedScrolling:(UIScrollView *)scrollView [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view +- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -530,7 +530,7 @@ - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable std::static_pointer_cast(_eventEmitter)->onScrollBeginDrag([self _scrollViewMetrics]); } -- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view atScale:(CGFloat)scale +- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view atScale:(CGFloat)scale // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -542,7 +542,7 @@ - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable RC [self _updateStateWithContentOffset]; } -- (RCTUIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView +- (RCTUIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView // TODO(macOS GH#774) { return _containerView; } @@ -610,7 +610,7 @@ - (void)scrollToEnd:(BOOL)animated #pragma mark - Child views mounting -- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView +- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView // TODO(macOS GH#774) { // Do nothing. ScrollView manages its subview clipping individually in `_remountChildren`. } diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h index 4e013dc89c2a4f..a436db3af4bf1f 100644 --- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTSliderComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h index 7f1a4a7058564a..77b88e8c316a85 100644 --- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for root component. + * UIView class for root component. */ @interface RCTSwitchComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm index e90f909e8507a7..60299e885afa69 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm @@ -11,7 +11,7 @@ @implementation RCTAccessibilityElement - (CGRect)accessibilityFrame { - RCTUIView *container = (RCTUIView *)self.accessibilityContainer; + RCTUIView *container = (RCTUIView *)self.accessibilityContainer; // TODO(macOS GH#774) if (CGRectEqualToRect(_frame, CGRectZero)) { return UIAccessibilityConvertFrameToScreenCoordinates(container.bounds, container); } else { diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h index 4ac6e253c2180e..489020c4b12117 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h @@ -19,7 +19,7 @@ layoutManager:(RCTTextLayoutManager *)layoutManager paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes frame:(CGRect)frame - view:(RCTUIView *)view; + view:(RCTUIView *)view; // TODO(macOS GH#774) /* * Returns an array of `UIAccessibilityElement`s to be used for `UIAccessibilityContainer` implementation. diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm index 41846f161aa3a9..dd369b3520d1c9 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm @@ -26,14 +26,14 @@ @implementation RCTParagraphComponentAccessibilityProvider { RCTTextLayoutManager *_layoutManager; ParagraphAttributes _paragraphAttributes; CGRect _frame; - __weak RCTUIView *_view; + __weak RCTUIView *_view; // TODO(macOS GH#774) } - (instancetype)initWithString:(facebook::react::AttributedString)attributedString layoutManager:(RCTTextLayoutManager *)layoutManager paragraphAttributes:(ParagraphAttributes)paragraphAttributes frame:(CGRect)frame - view:(RCTUIView *)view + view:(RCTUIView *)view // TODO(macOS GH#774) { if (self = [super init]) { _attributedString = attributedString; diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h index 624fc90edaeb2d..050fb5a1ebceba 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * RCTUIView class for component. + * UIView class for component. */ @interface RCTParagraphComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h index 83c9a7594ecd9c..d36a4f11ffbaf8 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for component. + * UIView class for component. */ @interface RCTTextInputComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index 0a44aebb67fdb3..d438ad0475776c 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -30,7 +30,7 @@ @interface RCTTextInputComponentView () *_backedTextInputView; + RCTUIView *_backedTextInputView; // TODO(macOS GH#774) NSUInteger _mostRecentEventCount; NSAttributedString *_lastStringStateWasUpdatedWith; @@ -58,7 +58,7 @@ @implementation RCTTextInputComponentView { BOOL _didMoveToWindow; } -#pragma mark - RCTUIView overrides +#pragma mark - UIView overrides - (instancetype)initWithFrame:(CGRect)frame { @@ -603,7 +603,7 @@ - (void)_setAttributedString:(NSAttributedString *)attributedString - (void)_setMultiline:(BOOL)multiline { [_backedTextInputView removeFromSuperview]; - RCTUIView *backedTextInputView = multiline ? [RCTUITextView new] : [RCTUITextField new]; + RCTUIView *backedTextInputView = multiline ? [RCTUITextView new] : [RCTUITextField new]; // TODO(macOS GH#774) backedTextInputView.frame = _backedTextInputView.frame; RCTCopyBackedTextInput(_backedTextInputView, backedTextInputView); _backedTextInputView = backedTextInputView; diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h index ca2294a5a1ca64..55a23da1e6b8b8 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h @@ -15,8 +15,8 @@ NS_ASSUME_NONNULL_BEGIN void RCTCopyBackedTextInput( - RCTUIView *fromTextInput, - RCTUIView *toTextInput); + RCTUIView *fromTextInput, + RCTUIView *toTextInput); // TODO(macOS GH#774) UITextAutocorrectionType RCTUITextAutocorrectionTypeFromOptionalBool(std::optional autoCorrect); diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm index ba9548c77b4ae8..b91311e271b2da 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm @@ -20,7 +20,7 @@ void RCTCopyBackedTextInput( RCTUIView *fromTextInput, - RCTUIView *toTextInput) + RCTUIView *toTextInput) // TODO(macOS GH#774) { toTextInput.attributedText = RCTSanitizeAttributedString(fromTextInput.attributedText); toTextInput.placeholder = fromTextInput.placeholder; diff --git a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h index 1c6e6b9a2562cb..5354d3611035ab 100644 --- a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN /* - * RCTUIView class for all kinds of components. + * UIView class for all kinds of components. */ @interface RCTUnimplementedViewComponentView : RCTViewComponentView diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h index c10f9d54e021c4..32fb2aee335af6 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h @@ -20,14 +20,14 @@ NS_ASSUME_NONNULL_BEGIN /** - * RCTUIView class for component. + * UIView class for component. */ @interface RCTViewComponentView : RCTUIView { @protected facebook::react::LayoutMetrics _layoutMetrics; facebook::react::SharedViewProps _props; facebook::react::SharedViewEventEmitter _eventEmitter; -} +} // TODO(macOS GH#774) /** * Represents the `UIView` instance that is being automatically attached to @@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN * to embed/bridge pure native views as component views. * Defaults to `nil`. Assign `nil` to remove view as subview. */ -@property (nonatomic, strong, nullable) RCTUIView *contentView; +@property (nonatomic, strong, nullable) RCTUIView *contentView; // TODO(macOS GH#774) /** * Provides access to `nativeId` prop of the component. diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index 6f98749a8e066a..d198722cdf8c9d 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -26,7 +26,7 @@ @implementation RCTViewComponentView { BOOL _needsInvalidateLayer; BOOL _isJSResponder; BOOL _removeClippedSubviews; - NSMutableArray *_reactSubviews; + NSMutableArray *_reactSubviews; // TODO(macOS GH#774) NSSet *_Nullable _propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN; } @@ -48,7 +48,7 @@ - (instancetype)initWithFrame:(CGRect)frame return _props; } -- (void)setContentView:(RCTUIView *)contentView +- (void)setContentView:(RCTUIView *)contentView // TODO(macOS GH#774) { if (_contentView) { [_contentView removeFromSuperview]; @@ -92,7 +92,7 @@ + (ComponentDescriptorProvider)componentDescriptorProvider return concreteComponentDescriptorProvider(); } -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { RCTAssert( childComponentView.superview == nil, @@ -109,7 +109,7 @@ - (void)mountChildComponentView:(RCTUIView *)childComp } } -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { if (_removeClippedSubviews) { [_reactSubviews removeObjectAtIndex:index]; @@ -133,7 +133,7 @@ - (void)unmountChildComponentView:(RCTUIView *)childCo [childComponentView removeFromSuperview]; } -- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView +- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView // TODO(macOS GH#774) { if (!_removeClippedSubviews) { // Use default behavior if unmounting is disabled @@ -154,7 +154,7 @@ - (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUI clipRect = [clipView convertRect:clipRect toView:self]; // Mount / unmount views - for (RCTUIView *view in _reactSubviews) { + for (RCTUIView *view in _reactSubviews) { // TODO(macOS GH#774) if (CGRectIntersectsRect(clipRect, view.frame)) { // View is at least partially visible, so remount it if unmounted [self addSubview:view]; @@ -438,7 +438,7 @@ - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(NSSetpointerEvents) { case PointerEventsMode::Auto: @@ -480,7 +480,7 @@ - (RCTUIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event case PointerEventsMode::BoxOnly: return [self pointInside:point withEvent:event] ? self : nil; case PointerEventsMode::BoxNone: - RCTUIView *view = [self betterHitTest:point withEvent:event]; + RCTUIView *view = [self betterHitTest:point withEvent:event]; // TODO(macOS GH#774) return view != self ? view : nil; } } @@ -662,10 +662,10 @@ - (NSObject *)accessibilityElement return self; } -static NSString *RCTRecursiveAccessibilityLabel(RCTUIView *view) +static NSString *RCTRecursiveAccessibilityLabel(RCTUIView *view) // TODO(macOS GH#774) { NSMutableString *result = [NSMutableString stringWithString:@""]; - for (RCTUIView *subview in view.subviews) { + for (RCTUIView *subview in view.subviews) { // TODO(macOS GH#774) NSString *label = subview.accessibilityLabel; if (!label) { label = RCTRecursiveAccessibilityLabel(subview); diff --git a/React/Fabric/Mounting/RCTComponentViewDescriptor.h b/React/Fabric/Mounting/RCTComponentViewDescriptor.h index 96220bd67d2cee..703b3b34a9d931 100644 --- a/React/Fabric/Mounting/RCTComponentViewDescriptor.h +++ b/React/Fabric/Mounting/RCTComponentViewDescriptor.h @@ -21,7 +21,7 @@ class RCTComponentViewDescriptor final { /* * Associated (and owned) native view instance. */ - __strong RCTUIView *view = nil; + __strong RCTUIView *view = nil; // TODO(macOS GH#774) /* * Indicates a requirement to call on the view methods from diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h index 11950e8a42d605..7ef2e065642e50 100644 --- a/React/Fabric/Mounting/RCTComponentViewProtocol.h +++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h @@ -54,14 +54,14 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) { * component view. * Receiver must add `childComponentView` as a subview. */ -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; // TODO(macOS GH#774) /* * Called for unmounting (detaching) a child component view from `self` * component view. * Receiver must remove `childComponentView` as a subview. */ -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; // TODO(macOS GH#774) /* * Called for updating component's props. diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.h b/React/Fabric/Mounting/RCTComponentViewRegistry.h index 8ba300d0e1abe1..8cde9198889a05 100644 --- a/React/Fabric/Mounting/RCTComponentViewRegistry.h +++ b/React/Fabric/Mounting/RCTComponentViewRegistry.h @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN * Finds a native component view by given `tag`. * Returns `nil` if there is no registered component with the `tag`. */ -- (nullable RCTUIView *)findComponentViewWithTag:(facebook::react::Tag)tag; +- (nullable RCTUIView *)findComponentViewWithTag:(facebook::react::Tag)tag; // TODO(macOS GH#774) /** * Creates a component view with a given type and puts it to the recycle pool. diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/React/Fabric/Mounting/RCTComponentViewRegistry.mm index 247d2d373d01e5..4c9445376fea49 100644 --- a/React/Fabric/Mounting/RCTComponentViewRegistry.mm +++ b/React/Fabric/Mounting/RCTComponentViewRegistry.mm @@ -116,7 +116,7 @@ - (void)optimisticallyCreateComponentViewWithComponentHandle:(ComponentHandle)co return iterator->second; } -- (nullable RCTUIView *)findComponentViewWithTag:(Tag)tag +- (nullable RCTUIView *)findComponentViewWithTag:(Tag)tag // TODO(macOS GH#774) { RCTAssertMainQueue(); auto iterator = _registry.find(tag); diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h index 406ca55cc37e15..7f2fd10d3e06c0 100644 --- a/React/Fabric/Mounting/RCTMountingManager.h +++ b/React/Fabric/Mounting/RCTMountingManager.h @@ -36,12 +36,12 @@ NS_ASSUME_NONNULL_BEGIN * influence the intrinsic size of the view and cannot be measured using UIView/UIKit layout API. * Must be called on the main thead. */ -- (void)attachSurfaceToView:(RCTUIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; +- (void)attachSurfaceToView:(RCTUIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; // TODO(macOS GH#774) /** * Stops designating the view as a rendering viewport of a React Native surface. */ -- (void)detachSurfaceFromView:(RCTUIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; +- (void)detachSurfaceFromView:(RCTUIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId; // TODO(macOS GH#774) /** * Schedule a mounting transaction to be performed on the main thread. diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm index f25863bbb718af..d58d9f6fd09a04 100644 --- a/React/Fabric/Mounting/RCTMountingManager.mm +++ b/React/Fabric/Mounting/RCTMountingManager.mm @@ -29,7 +29,7 @@ using namespace facebook::react; -static SurfaceId RCTSurfaceIdForView(RCTUIView *view) +static SurfaceId RCTSurfaceIdForView(RCTUIView *view) // TODO(macOS GH#774) { do { if (RCTIsReactRootView(@(view.tag))) { @@ -81,7 +81,7 @@ static void RCTPerformMountInstructions( auto &newChildViewDescriptor = [registry componentViewDescriptorWithTag:newChildShadowView.tag]; auto &parentViewDescriptor = [registry componentViewDescriptorWithTag:parentShadowView.tag]; - RCTUIView *newChildComponentView = newChildViewDescriptor.view; + RCTUIView *newChildComponentView = newChildViewDescriptor.view; // TODO(macOS GH#774) RCTAssert(newChildShadowView.props, @"`newChildShadowView.props` must not be null."); @@ -109,7 +109,7 @@ static void RCTPerformMountInstructions( auto &oldChildShadowView = mutation.oldChildShadowView; auto &newChildShadowView = mutation.newChildShadowView; auto &newChildViewDescriptor = [registry componentViewDescriptorWithTag:newChildShadowView.tag]; - RCTUIView *newChildComponentView = newChildViewDescriptor.view; + RCTUIView *newChildComponentView = newChildViewDescriptor.view; // TODO(macOS GH#774) auto mask = RNComponentViewUpdateMask{}; @@ -168,7 +168,7 @@ - (void)setContextContainer:(ContextContainer::Shared)contextContainer _contextContainer = contextContainer; } -- (void)attachSurfaceToView:(RCTUIView *)view surfaceId:(SurfaceId)surfaceId +- (void)attachSurfaceToView:(RCTUIView *)view surfaceId:(SurfaceId)surfaceId // TODO(macOS GH#774) { RCTAssertMainQueue(); @@ -179,7 +179,7 @@ - (void)attachSurfaceToView:(RCTUIView *)view surfaceId:(SurfaceId)surfaceId [view addSubview:rootViewDescriptor.view]; } -- (void)detachSurfaceFromView:(RCTUIView *)view surfaceId:(SurfaceId)surfaceId +- (void)detachSurfaceFromView:(RCTUIView *)view surfaceId:(SurfaceId)surfaceId // TODO(macOS GH#774) { RCTAssertMainQueue(); RCTComponentViewDescriptor rootViewDescriptor = [_componentViewRegistry componentViewDescriptorWithTag:surfaceId]; @@ -288,7 +288,7 @@ - (void)setIsJSResponder:(BOOL)isJSResponder ReactTag reactTag = shadowView.tag; RCTExecuteOnMainQueue(^{ RCTUIView *componentView = - [self->_componentViewRegistry findComponentViewWithTag:reactTag]; + [self->_componentViewRegistry findComponentViewWithTag:reactTag]; // TODO(macOS GH#774) [componentView setIsJSResponder:isJSResponder]; }); } @@ -298,7 +298,7 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag componentDescriptor:(const ComponentDescriptor &)componentDescriptor { RCTAssertMainQueue(); - RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; + RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; // TODO(macOS GH#774) SurfaceId surfaceId = RCTSurfaceIdForView(componentView); Props::Shared oldProps = [componentView props]; Props::Shared newProps = componentDescriptor.cloneProps( @@ -332,14 +332,14 @@ - (void)synchronouslyDispatchCommandOnUIThread:(ReactTag)reactTag args:(NSArray *)args { RCTAssertMainQueue(); - RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; + RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; // TODO(macOS GH#774) [componentView handleCommand:commandName args:args]; } - (void)synchronouslyDispatchAccessbilityEventOnUIThread:(ReactTag)reactTag eventType:(NSString *)eventType { if ([@"focus" isEqualToString:eventType]) { - RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; + RCTUIView *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag]; // TODO(macOS GH#774) UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, componentView); } } diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h index 0810ff47160b72..bb8a122c4dbae9 100644 --- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h +++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h @@ -14,13 +14,13 @@ NS_ASSUME_NONNULL_BEGIN /** * Default implementation of RCTComponentViewProtocol. */ -@interface RCTUIView (ComponentViewProtocol) +@interface RCTUIView (ComponentViewProtocol) // TODO(macOS GH#774) + (std::vector)supplementalComponentDescriptorProviders; -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; // TODO(macOS GH#774) -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index; // TODO(macOS GH#774) - (void)updateProps:(facebook::react::Props::Shared const &)props oldProps:(facebook::react::Props::Shared const &)oldProps; @@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet *)props; - (nullable NSSet *)propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN; -- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView; +- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView; // TODO(macOS GH#774) @end diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm index 9904e95a8d268e..9068d9ec494f8e 100644 --- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm +++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm @@ -15,7 +15,7 @@ using namespace facebook::react; -@implementation RCTUIView (ComponentViewProtocol) +@implementation RCTUIView (ComponentViewProtocol) // TODO(macOS GH#774) + (ComponentDescriptorProvider)componentDescriptorProvider { @@ -28,7 +28,7 @@ + (ComponentDescriptorProvider)componentDescriptorProvider return {}; } -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { RCTAssert( childComponentView.superview == nil, @@ -40,7 +40,7 @@ - (void)mountChildComponentView:(RCTUIView *)childComp [self insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { RCTAssert( childComponentView.superview == self, @@ -156,14 +156,14 @@ - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet *componentView = - [_mountingManager.componentViewRegistry findComponentViewWithTag:tag]; + [_mountingManager.componentViewRegistry findComponentViewWithTag:tag]; // TODO(macOS GH#774) return componentView; } @@ -187,7 +187,7 @@ - (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag props:(NSDictiona ReactTag tag = [reactTag integerValue]; RCTUIView *componentView = - [_mountingManager.componentViewRegistry findComponentViewWithTag:tag]; + [_mountingManager.componentViewRegistry findComponentViewWithTag:tag]; // TODO(macOS GH#774) if (componentView == nil) { return NO; // This view probably isn't managed by Fabric } diff --git a/React/Fabric/RCTSurfaceTouchHandler.h b/React/Fabric/RCTSurfaceTouchHandler.h index 6cf7275c38f24b..8f8768357a8c63 100644 --- a/React/Fabric/RCTSurfaceTouchHandler.h +++ b/React/Fabric/RCTSurfaceTouchHandler.h @@ -15,8 +15,8 @@ NS_ASSUME_NONNULL_BEGIN * Attaches (and detaches) a view to the touch handler. * The receiver does not retain the provided view. */ -- (void)attachToView:(RCTUIView *)view; -- (void)detachFromView:(RCTUIView *)view; +- (void)attachToView:(RCTUIView *)view; // TODO(macOS GH#774) +- (void)detachFromView:(RCTUIView *)view; // TODO(macOS GH#774) /* * Offset of the attached view relative to the root component in points. diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm index 03db3dfb1c6603..ae0fa7dc211ede 100644 --- a/React/Fabric/RCTSurfaceTouchHandler.mm +++ b/React/Fabric/RCTSurfaceTouchHandler.mm @@ -60,7 +60,7 @@ typedef NS_ENUM(NSInteger, RCTTouchEventType) { /* * A component view on which the touch was begun. */ - __strong RCTUIView *componentView = nil; + __strong RCTUIView *componentView = nil; // TODO(macOS GH#774) struct Hasher { size_t operator()(const ActiveTouch &activeTouch) const @@ -81,7 +81,7 @@ static void UpdateActiveTouchWithUITouch( ActiveTouch &activeTouch, UITouch *uiTouch, RCTUIView *rootComponentView, - CGPoint rootViewOriginOffset) + CGPoint rootViewOriginOffset) // TODO(macOS GH#774) { CGPoint offsetPoint = [uiTouch locationInView:activeTouch.componentView]; CGPoint screenPoint = [uiTouch locationInView:uiTouch.window]; diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h index 30eee121727f98..0e700f50b22193 100644 --- a/React/Fabric/Surface/RCTFabricSurface.h +++ b/React/Fabric/Surface/RCTFabricSurface.h @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN * The primary goals of the RCTSurface are: * * ability to measure and layout the surface in a thread-safe * and synchronous manner; - * * ability to create a RCTUIView instance on demand (later); + * * ability to create a UIView instance on demand (later); * * ability to communicate the current stage of the surface granularly. */ @interface RCTFabricSurface : NSObject diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h index 73cd7cdf267328..db78f2f1382d47 100644 --- a/React/Views/RCTModalHostView.h +++ b/React/Views/RCTModalHostView.h @@ -16,7 +16,7 @@ @protocol RCTModalHostViewInteractor; -@interface RCTModalHostView : RCTUIView +@interface RCTModalHostView : RCTUIView // TODO(macOS GH#774) @property (nonatomic, copy) NSString *animationType; @property (nonatomic, assign) UIModalPresentationStyle presentationStyle; diff --git a/React/Views/RCTWeakViewHolder.h b/React/Views/RCTWeakViewHolder.h index ae623c152fe871..db0b489a1545c5 100644 --- a/React/Views/RCTWeakViewHolder.h +++ b/React/Views/RCTWeakViewHolder.h @@ -14,6 +14,6 @@ */ @protocol RCTWeakViewHolder -@property (nonatomic, strong) NSMapTable *weakViews; +@property (nonatomic, strong) NSMapTable *weakViews; // TODO(macOS GH#774) @end diff --git a/React/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h index 838394f5397518..5f8357eaa4934d 100644 --- a/React/Views/RCTWrapperViewController.h +++ b/React/Views/RCTWrapperViewController.h @@ -11,6 +11,6 @@ @interface RCTWrapperViewController : UIViewController -- (instancetype)initWithContentView:(RCTUIView *)contentView NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithContentView:(RCTUIView *)contentView NS_DESIGNATED_INITIALIZER; // TODO(macOS GH#774) @end diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h index d0b3345ef7b15a..94f1991a3b2df8 100644 --- a/React/Views/UIView+React.h +++ b/React/Views/UIView+React.h @@ -29,7 +29,7 @@ /** * Determines whether or not a view should ignore inverted colors or not. Used to set - * RCTUIView property accessibilityIgnoresInvertColors in iOS 11+. + * UIView property accessibilityIgnoresInvertColors in iOS 11+. */ @property (nonatomic, assign) BOOL shouldAccessibilityIgnoresInvertColors; diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h index a17f117ca97feb..64b97c1889fdc6 100644 --- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h @@ -20,13 +20,13 @@ typedef void (^InterceptorBlock)(std::string eventName, folly::dynamic event); - (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(RCTBridge *)bridge; -- (RCTUIView *)createPaperViewWithTag:(NSInteger)tag; +- (RCTUIView *)createPaperViewWithTag:(NSInteger)tag; // TODO(macOS GH#774) - (void)addObserveForTag:(NSInteger)tag usingBlock:(InterceptorBlock)block; - (void)removeObserveForTag:(NSInteger)tag; -- (void)setProps:(folly::dynamic const &)props forView:(RCTUIView *)view; +- (void)setProps:(folly::dynamic const &)props forView:(RCTUIView *)view; // TODO(macOS GH#774) - (NSString *)componentViewName; diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm index cddafeee1cea93..cbbd0010dc1f2d 100644 --- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm @@ -27,7 +27,7 @@ @implementation RCTLegacyViewManagerInteropCoordinator { __weak RCTBridge *_bridge; /* Each instance of `RCTLegacyViewManagerInteropComponentView` registers a block to which events are dispatched. - This is the container that maps unretained RCTUIView pointer to a block to which the event is dispatched. + This is the container that maps unretained UIView pointer to a block to which the event is dispatched. */ NSMutableDictionary *_eventInterceptors; @@ -71,9 +71,9 @@ - (void)removeObserveForTag:(NSInteger)tag [_eventInterceptors removeObjectForKey:[NSNumber numberWithInteger:tag]]; } -- (RCTUIView *)createPaperViewWithTag:(NSInteger)tag; +- (RCTUIView *)createPaperViewWithTag:(NSInteger)tag; // TODO(macOS GH#774) { - RCTUIView *view = [_componentData createViewWithTag:[NSNumber numberWithInteger:tag] rootTag:NULL]; + RCTUIView *view = [_componentData createViewWithTag:[NSNumber numberWithInteger:tag] rootTag:NULL]; // TODO(macOS GH#774) if ([_componentData.bridgelessViewManager conformsToProtocol:@protocol(RCTWeakViewHolder)]) { id weakViewHolder = (id)_componentData.bridgelessViewManager; if (!weakViewHolder.weakViews) { @@ -84,7 +84,7 @@ - (RCTUIView *)createPaperViewWithTag:(NSInteger)tag; return view; } -- (void)setProps:(folly::dynamic const &)props forView:(RCTUIView *)view +- (void)setProps:(folly::dynamic const &)props forView:(RCTUIView *)view // TODO(macOS GH#774) { if (props.isObject()) { NSDictionary *convertedProps = convertFollyDynamicToId(props); From a36200d4d2a0d19d5729d5101bf47801445b9107 Mon Sep 17 00:00:00 2001 From: Shawn Dempsey Date: Wed, 30 Nov 2022 11:34:52 -0800 Subject: [PATCH 4/7] Add missing tags --- .../ComponentViews/TextInput/RCTTextInputUtils.h | 2 +- React/Fabric/RCTSurfaceTouchHandler.mm | 10 +++++----- React/Fabric/Surface/RCTFabricSurface.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h index 55a23da1e6b8b8..2d62c452a72476 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN void RCTCopyBackedTextInput( - RCTUIView *fromTextInput, + RCTUIView *fromTextInput, RCTUIView *toTextInput); // TODO(macOS GH#774) UITextAutocorrectionType RCTUITextAutocorrectionTypeFromOptionalBool(std::optional autoCorrect); diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm index ae0fa7dc211ede..e16cfe0949acd1 100644 --- a/React/Fabric/RCTSurfaceTouchHandler.mm +++ b/React/Fabric/RCTSurfaceTouchHandler.mm @@ -99,12 +99,12 @@ static void UpdateActiveTouchWithUITouch( } } -static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, RCTUIView *rootComponentView, CGPoint rootViewOriginOffset) +static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, RCTUIView *rootComponentView, CGPoint rootViewOriginOffset) // TODO(macOS GH#774) { ActiveTouch activeTouch = {}; // Find closest Fabric-managed touchable view - RCTUIView *componentView = uiTouch.view; + RCTUIView *componentView = uiTouch.view; // TODO(macOS GH#774) while (componentView) { if ([componentView respondsToSelector:@selector(touchEventEmitterAtPoint:)]) { activeTouch.eventEmitter = [(id)componentView @@ -164,7 +164,7 @@ @implementation RCTSurfaceTouchHandler { /* * We hold the view weakly to prevent a retain cycle. */ - __weak RCTUIView *_rootComponentView; + __weak RCTUIView *_rootComponentView; // TODO(macOS GH#774) IdentifierPool<11> _identifierPool; } @@ -187,7 +187,7 @@ - (instancetype)init RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)action) -- (void)attachToView:(RCTUIView *)view +- (void)attachToView:(RCTUIView *)view // TODO(macOS GH#774) { RCTAssert(self.view == nil, @"RCTTouchHandler already has attached view."); @@ -195,7 +195,7 @@ - (void)attachToView:(RCTUIView *)view _rootComponentView = view; } -- (void)detachFromView:(RCTUIView *)view +- (void)detachFromView:(RCTUIView *)view // TODO(macOS GH#774) { RCTAssertParam(view); RCTAssert(self.view == view, @"RCTTouchHandler attached to another view."); diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h index 0e700f50b22193..7e9d280210de0c 100644 --- a/React/Fabric/Surface/RCTFabricSurface.h +++ b/React/Fabric/Surface/RCTFabricSurface.h @@ -47,12 +47,12 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)resetWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter; -#pragma mark - Dealing with RCTUIView representation, the Main thread only access +#pragma mark - Dealing with UIView representation, the Main thread only access /** * Creates (if needed) and returns `UIView` instance which represents the Surface. * The Surface will cache and *retain* this object. - * Returning the RCTUIView instance does not mean that the Surface is ready + * Returning the UIView instance does not mean that the Surface is ready * to execute and layout. It can be just a handler which Surface will use later * to mount the actual views. * RCTSurface does not control (or influence in any way) the size or origin From ea9172772399df99070974375b6bc2bc9d50464c Mon Sep 17 00:00:00 2001 From: Shawn Dempsey Date: Tue, 6 Dec 2022 15:12:55 -0800 Subject: [PATCH 5/7] Revert "Merge remote-tracking branch 'meta/main' into fabric/rctuiview-shim" This reverts commit 8d362464a2dfd92372accdcf742b7b6e99237499, reversing changes made to a36200d4d2a0d19d5729d5101bf47801445b9107. --- .../ScrollView/RCTEnhancedScrollView.h | 2 +- .../ScrollView/RCTEnhancedScrollView.mm | 6 +- .../ScrollView/RCTScrollViewComponentView.h | 2 +- .../ScrollView/RCTScrollViewComponentView.mm | 28 +- .../TextInput/RCTTextInputComponentView.mm | 2 +- .../Views/RefreshControl/RCTRefreshControl.h | 2 +- .../Views/ScrollView/RCTScrollableProtocol.h | 2 +- package.json | 2 - yarn.lock | 585 +++++++++++++++++- 9 files changed, 601 insertions(+), 30 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h index 7bd19f69537162..87418d54696083 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN * `UIScrollView` subclass which has some improvements and tweaks * which are not directly related to React Native. */ -@interface RCTEnhancedScrollView : RCTUIScrollView // TODO(macOS GH#774) +@interface RCTEnhancedScrollView : UIScrollView /* * Returns a delegate splitter that can be used to create as many `UIScrollView` delegates as needed. diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm index 02d5f4af0cd1f4..e5d34b89703558 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm @@ -130,9 +130,9 @@ - (void)setDelegate:(id)delegate #pragma mark - UIScrollViewDelegate -- (void)scrollViewWillEndDragging:(RCTUIScrollView *)scrollView +- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity - targetContentOffset:(inout CGPoint *)targetContentOffset // TODO(macOS GH#774) + targetContentOffset:(inout CGPoint *)targetContentOffset { if (self.snapToOffsets && self.snapToOffsets.count > 0) { // An alternative to enablePaging and snapToInterval which allows setting custom @@ -259,7 +259,7 @@ - (void)scrollViewWillEndDragging:(RCTUIScrollView *)scrollView #pragma mark - -- (BOOL)isHorizontal:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (BOOL)isHorizontal:(UIScrollView *)scrollView { return scrollView.contentSize.width > self.frame.size.width; } diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h index 33651572822461..a01771f60868d1 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN /* * Returns an actual UIScrollView that this component uses under the hood. */ -@property (nonatomic, strong, readonly) RCTUIScrollView *scrollView; // TODO(macOS GH#774) +@property (nonatomic, strong, readonly) UIScrollView *scrollView; /* * Returns the subview of the scroll view that the component uses to mount all subcomponents into. That's useful to diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index 1c5c568d9e511a..bc4ae9b34c867b 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -56,7 +56,7 @@ static UIScrollViewIndicatorStyle RCTUIScrollViewIndicatorStyleFromProps(ScrollV // This is just a workaround to allow animations based on onScroll event. // This is only used to animate sticky headers in ScrollViews, and only the contentOffset and tag is used. // TODO: T116850910 [Fabric][iOS] Make Fabric not use legacy RCTEventDispatcher for native-driven AnimatedEvents -static void RCTSendScrollEventForNativeAnimations_DEPRECATED(RCTUIScrollView *scrollView, NSInteger tag) // TODO(macOS GH#774) +static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInteger tag) { static uint16_t coalescingKey = 0; RCTScrollEvent *scrollEvent = [[RCTScrollEvent alloc] initWithEventName:@"onScroll" @@ -416,7 +416,7 @@ - (BOOL)touchesShouldCancelInContentView:(__unused RCTUIView *)view // TODO(macO return ![self _shouldDisableScrollInteraction]; } -- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewDidScroll:(UIScrollView *)scrollView { if (!_isUserTriggeredScrolling) { [self _updateStateWithContentOffset]; @@ -435,24 +435,24 @@ - (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) [self _remountChildrenIfNeeded]; } -- (void)scrollViewDidZoom:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewDidZoom:(UIScrollView *)scrollView { [self scrollViewDidScroll:scrollView]; } -- (BOOL)scrollViewShouldScrollToTop:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (BOOL)scrollViewShouldScrollToTop:(UIScrollView *)scrollView { _isUserTriggeredScrolling = YES; return YES; } -- (void)scrollViewDidScrollToTop:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewDidScrollToTop:(UIScrollView *)scrollView { _isUserTriggeredScrolling = NO; [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginDragging:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { [self _forceDispatchNextScrollEvent]; @@ -464,7 +464,7 @@ - (void)scrollViewWillBeginDragging:(RCTUIScrollView *)scrollView // TODO(macOS _isUserTriggeredScrolling = YES; } -- (void)scrollViewDidEndDragging:(RCTUIScrollView *)scrollView willDecelerate:(BOOL)decelerate // TODO(macOS GH#774) +- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate { [self _forceDispatchNextScrollEvent]; @@ -476,7 +476,7 @@ - (void)scrollViewDidEndDragging:(RCTUIScrollView *)scrollView willDecelerate:(B [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginDecelerating:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView { [self _forceDispatchNextScrollEvent]; @@ -488,7 +488,7 @@ - (void)scrollViewWillBeginDecelerating:(RCTUIScrollView *)scrollView // TODO(ma ->onMomentumScrollBegin([self _scrollViewMetrics]); } -- (void)scrollViewDidEndDecelerating:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { [self _forceDispatchNextScrollEvent]; @@ -501,12 +501,12 @@ - (void)scrollViewDidEndDecelerating:(RCTUIScrollView *)scrollView // TODO(macOS _isUserTriggeredScrolling = NO; } -- (void)scrollViewDidEndScrollingAnimation:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView { [self _handleFinishedScrolling:scrollView]; } -- (void)_handleFinishedScrolling:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)_handleFinishedScrolling:(UIScrollView *)scrollView { [self _forceDispatchNextScrollEvent]; [self scrollViewDidScroll:scrollView]; @@ -519,7 +519,7 @@ - (void)_handleFinishedScrolling:(RCTUIScrollView *)scrollView // TODO(macOS GH# [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginZooming:(RCTUIScrollView *)scrollView withView:(nullable RCTUIView *)view // TODO(macOS GH#774) +- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -530,7 +530,7 @@ - (void)scrollViewWillBeginZooming:(RCTUIScrollView *)scrollView withView:(nulla std::static_pointer_cast(_eventEmitter)->onScrollBeginDrag([self _scrollViewMetrics]); } -- (void)scrollViewDidEndZooming:(RCTUIScrollView *)scrollView withView:(nullable RCTUIView *)view atScale:(CGFloat)scale // TODO(macOS GH#774) +- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view atScale:(CGFloat)scale // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -542,7 +542,7 @@ - (void)scrollViewDidEndZooming:(RCTUIScrollView *)scrollView withView:(nullable [self _updateStateWithContentOffset]; } -- (RCTUIView *)viewForZoomingInScrollView:(__unused RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (RCTUIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView // TODO(macOS GH#774) { return _containerView; } diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index 9a623ca3a10b5d..d438ad0475776c 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -409,7 +409,7 @@ - (void)textInputDidChangeSelection #pragma mark - RCTBackedTextInputDelegate (UIScrollViewDelegate) -- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) +- (void)scrollViewDidScroll:(UIScrollView *)scrollView { if (_eventEmitter) { std::static_pointer_cast(_eventEmitter)->onScroll([self _textInputMetrics]); diff --git a/React/Views/RefreshControl/RCTRefreshControl.h b/React/Views/RefreshControl/RCTRefreshControl.h index f3d6b2cdc6e150..a11b801f9ea895 100644 --- a/React/Views/RefreshControl/RCTRefreshControl.h +++ b/React/Views/RefreshControl/RCTRefreshControl.h @@ -14,6 +14,6 @@ @property (nonatomic, copy) NSString *title; @property (nonatomic, copy) RCTDirectEventBlock onRefresh; -@property (nonatomic, weak) RCTUIScrollView *scrollView; // TODO(macOS GH#774) +@property (nonatomic, weak) UIScrollView *scrollView; @end diff --git a/React/Views/ScrollView/RCTScrollableProtocol.h b/React/Views/ScrollView/RCTScrollableProtocol.h index d1ff41cea33402..45610b457e303e 100644 --- a/React/Views/ScrollView/RCTScrollableProtocol.h +++ b/React/Views/ScrollView/RCTScrollableProtocol.h @@ -42,7 +42,7 @@ #if !TARGET_OS_OSX // TODO(macOS GH#774) @optional -@property (nonatomic, weak) RCTUIScrollView *scrollView; +@property (nonatomic, weak) UIScrollView *scrollView; #endif // TODO(macOS GH#774) @end diff --git a/package.json b/package.json index b4a2ce90467e48..9200bc3a358ab5 100644 --- a/package.json +++ b/package.json @@ -176,14 +176,12 @@ "resolutions": { "async": "^3.2.2", "es5-ext": "0.10.53", - "micromatch": "^4.0.0", "readable-stream": "^4.0.0", "shell-quote": "^1.7.3" }, "_justification": { "async": "Versions of async prior to 3.2.2 are vulnerable to prototype pollution", "es5-ext": "Packages after 0.10.54 and at the moment up until 0.10.59 contain a protest message. A policy prevents us from using packages with protestware, therefore downgrading to the latest release without the message.", - "micromatch": "Version 3.x.x depends on decode-uri-component 0.2.0, which has a DoS vulnerability", "readable-stream": "Eliminates dependency on outdated string_decoder component", "shell-quote": "Versions prior to 1.7.3 have an RCE vulnerability. Should be removable once we upgrade CLI tools to ^8.0.0 with RN 0.69." }, diff --git a/yarn.lock b/yarn.lock index b672ad5572a722..2915bd18dc674b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1785,6 +1785,11 @@ aria-query@^4.2.2: "@babel/runtime" "^7.10.2" "@babel/runtime-corejs3" "^7.10.2" +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== + arr-filter@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee" @@ -1792,7 +1797,7 @@ arr-filter@^1.1.1: dependencies: make-iterator "^1.0.0" -arr-flatten@^1.0.1: +arr-flatten@^1.0.1, arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== @@ -1804,6 +1809,11 @@ arr-map@^2.0.0, arr-map@^2.0.2: dependencies: make-iterator "^1.0.0" +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== + array-each@^1.0.0, array-each@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" @@ -1845,6 +1855,11 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== + array.prototype.flatmap@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f" @@ -1872,6 +1887,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== + assign@>=0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/assign/-/assign-0.1.7.tgz#e63bfe3a887b8630913c27663e4cc9bff1ddd25f" @@ -1933,6 +1953,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2137,6 +2162,19 @@ base64-js@^1.1.2, base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -2203,6 +2241,22 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -2251,6 +2305,21 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -2402,6 +2471,16 @@ clang-format@^1.2.4: glob "^7.0.0" resolve "^1.1.6" +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -2491,6 +2570,14 @@ collection-map@^1.0.0: for-own "^1.0.0" make-iterator "^1.0.0" +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + color-convert@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd" @@ -2585,6 +2672,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + compressible@~2.0.16: version "2.0.18" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" @@ -2627,6 +2719,11 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== + core-js-compat@^3.21.0: version "3.23.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.1.tgz#23d44d9f209086e60dabf9130cea7719af6e199b" @@ -2758,7 +2855,7 @@ debug@0.8.x: resolved "https://registry.yarnpkg.com/debug/-/debug-0.8.1.tgz#20ff4d26f5e422cb68a1bacbbb61039ad8c1c130" integrity sha512-HlXEJm99YsRjLJ8xmuz0Lq8YUwrv7hAJkTEr6/Em3sUlSUNl0UdFA+1SrY4fnykeq1FVkUEUtwRGHs9VvlYbGA== -debug@2.6.9, debug@^2.2.0: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2782,6 +2879,11 @@ decimal.js@^10.2.1: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== + deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -2817,6 +2919,28 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -3433,6 +3557,19 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + expect@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" @@ -3452,6 +3589,21 @@ ext@^1.1.2: dependencies: type "^2.5.0" +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" @@ -3471,6 +3623,20 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + extract-github@0.0.x: version "0.0.5" resolved "https://registry.yarnpkg.com/extract-github/-/extract-github-0.0.5.tgz#f542536db8c19b983a3bec9db96d2ef2a5ff1a86" @@ -3550,6 +3716,16 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -3630,7 +3806,7 @@ flow-parser@^0.121.0: resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f" integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg== -for-in@^1.0.1: +for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== @@ -3665,6 +3841,13 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== + dependencies: + map-cache "^0.2.2" + fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -3822,6 +4005,11 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -3958,6 +4146,37 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -4172,6 +4391,20 @@ ip@^1.1.5: resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4199,6 +4432,11 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" @@ -4218,6 +4456,20 @@ is-core-module@^2.2.0, is-core-module@^2.8.1: dependencies: has "^1.0.3" +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + is-date-object@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" @@ -4225,6 +4477,24 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" @@ -4235,6 +4505,18 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -4279,6 +4561,13 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== + dependencies: + kind-of "^3.0.2" + is-number@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" @@ -4289,7 +4578,7 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -4364,6 +4653,11 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" @@ -4376,11 +4670,23 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" +isarray@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== + dependencies: + isarray "1.0.0" + isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" @@ -5155,7 +5461,26 @@ just-scripts@^1.8.0: undertaker-registry "^1.0.1" yargs-parser "^20.2.3" -kind-of@^6.0.2: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -5383,6 +5708,18 @@ mana@0.1.x: millisecond "0.1.x" request "2.x.x" +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== + dependencies: + object-visit "^1.0.0" + marked-terminal@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-4.2.0.tgz#593734a53cf9a4bb01ea961aa579bd21889ce502" @@ -5677,7 +6014,26 @@ metro@0.67.0, metro@^0.67.0: ws "^7.5.1" yargs "^15.3.1" -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: +micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -5749,6 +6105,14 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + mkdirp@^0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -5781,6 +6145,23 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -5938,6 +6319,15 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + object-inspect@^1.12.0, object-inspect@^1.9.0: version "1.12.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" @@ -5948,6 +6338,13 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== + dependencies: + isobject "^3.0.0" + object.assign@^4.1.0, object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" @@ -5994,6 +6391,13 @@ object.hasown@^1.1.1: define-properties "^1.1.4" es-abstract "^1.19.5" +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== + dependencies: + isobject "^3.0.1" + object.reduce@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad" @@ -6213,6 +6617,11 @@ parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -6295,6 +6704,11 @@ plist@^3.0.2, plist@^3.0.5: base64-js "^1.5.1" xmlbuilder "^9.0.7" +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== + predefine@0.1.x: version "0.1.3" resolved "https://registry.yarnpkg.com/predefine/-/predefine-0.1.3.tgz#833d67afa815c42707845449dbc88d8a307744e5" @@ -6587,6 +7001,14 @@ regenerator-transform@^0.15.0: dependencies: "@babel/runtime" "^7.8.4" +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -6630,6 +7052,16 @@ remove-trailing-separator@^1.0.1: resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== + request@2.x.x, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -6693,6 +7125,11 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== + resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.19.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" @@ -6733,6 +7170,11 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -6805,6 +7247,13 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== + dependencies: + ret "~0.1.10" + "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -6911,6 +7360,16 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -7022,6 +7481,47 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + source-map-support@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab" @@ -7037,6 +7537,11 @@ source-map-support@^0.5.16, source-map-support@^0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-url@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -7078,6 +7583,13 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -7117,6 +7629,14 @@ stacktrace-parser@^0.1.3: dependencies: type-fest "^0.7.1" +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -7374,6 +7894,21 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -7381,6 +7916,16 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -7582,6 +8127,16 @@ unicode-property-aliases-ecmascript@^2.0.0: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -7597,6 +8152,14 @@ unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -7604,6 +8167,11 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== + "use-subscription@>=1.0.0 <1.6.0": version "1.5.1" resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1" @@ -7611,6 +8179,11 @@ uri-js@^4.2.2: dependencies: object-assign "^4.1.1" +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" From b01bd2b777050d620eb9f3cd3cefbc8c61374ced Mon Sep 17 00:00:00 2001 From: Shawn Dempsey Date: Tue, 6 Dec 2022 16:25:06 -0800 Subject: [PATCH 6/7] Fix bad merge of meta/main --- .../ScrollView/RCTEnhancedScrollView.h | 2 +- .../ScrollView/RCTEnhancedScrollView.mm | 6 +- .../ScrollView/RCTScrollViewComponentView.mm | 34 +- .../TextInput/RCTTextInputComponentView.mm | 2 +- .../Views/RefreshControl/RCTRefreshControl.h | 2 +- package.json | 2 + yarn.lock | 585 +----------------- 7 files changed, 28 insertions(+), 605 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h index 87418d54696083..7bd19f69537162 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN * `UIScrollView` subclass which has some improvements and tweaks * which are not directly related to React Native. */ -@interface RCTEnhancedScrollView : UIScrollView +@interface RCTEnhancedScrollView : RCTUIScrollView // TODO(macOS GH#774) /* * Returns a delegate splitter that can be used to create as many `UIScrollView` delegates as needed. diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm index e5d34b89703558..02d5f4af0cd1f4 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm @@ -130,9 +130,9 @@ - (void)setDelegate:(id)delegate #pragma mark - UIScrollViewDelegate -- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView +- (void)scrollViewWillEndDragging:(RCTUIScrollView *)scrollView withVelocity:(CGPoint)velocity - targetContentOffset:(inout CGPoint *)targetContentOffset + targetContentOffset:(inout CGPoint *)targetContentOffset // TODO(macOS GH#774) { if (self.snapToOffsets && self.snapToOffsets.count > 0) { // An alternative to enablePaging and snapToInterval which allows setting custom @@ -259,7 +259,7 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView #pragma mark - -- (BOOL)isHorizontal:(UIScrollView *)scrollView +- (BOOL)isHorizontal:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { return scrollView.contentSize.width > self.frame.size.width; } diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index bc4ae9b34c867b..a79a9db50a0b9c 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -56,7 +56,7 @@ static UIScrollViewIndicatorStyle RCTUIScrollViewIndicatorStyleFromProps(ScrollV // This is just a workaround to allow animations based on onScroll event. // This is only used to animate sticky headers in ScrollViews, and only the contentOffset and tag is used. // TODO: T116850910 [Fabric][iOS] Make Fabric not use legacy RCTEventDispatcher for native-driven AnimatedEvents -static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInteger tag) +static void RCTSendScrollEventForNativeAnimations_DEPRECATED(RCTUIScrollView *scrollView, NSInteger tag) // TODO(macOS GH#774) { static uint16_t coalescingKey = 0; RCTScrollEvent *scrollEvent = [[RCTScrollEvent alloc] initWithEventName:@"onScroll" @@ -334,12 +334,10 @@ - (void)_preserveContentOffsetIfNeededWithBlock:(void (^)())block [((RCTEnhancedScrollView *)_scrollView) preserveContentOffsetWithBlock:block]; } -- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [_containerView insertSubview:childComponentView atIndex:index]; } -- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [childComponentView removeFromSuperview]; } @@ -350,11 +348,9 @@ - (void)unmountChildComponentView:(RCTUIView *)childCo */ - (BOOL)_shouldDisableScrollInteraction { - RCTUIView *ancestorView = self.superview; // TODO(macOS GH#774) while (ancestorView) { if ([ancestorView respondsToSelector:@selector(isJSResponder)]) { - BOOL isJSResponder = ((RCTUIView *)ancestorView).isJSResponder; // TODO(macOS GH#774) if (isJSResponder) { return YES; } @@ -409,14 +405,13 @@ - (void)prepareForRecycle #pragma mark - UIScrollViewDelegate -- (BOOL)touchesShouldCancelInContentView:(__unused RCTUIView *)view // TODO(macOS GH#774) { // Historically, `UIScrollView`s in React Native do not cancel touches // started on `UIControl`-based views (as normal iOS `UIScrollView`s do). return ![self _shouldDisableScrollInteraction]; } -- (void)scrollViewDidScroll:(UIScrollView *)scrollView +- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { if (!_isUserTriggeredScrolling) { [self _updateStateWithContentOffset]; @@ -435,24 +430,24 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView [self _remountChildrenIfNeeded]; } -- (void)scrollViewDidZoom:(UIScrollView *)scrollView +- (void)scrollViewDidZoom:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { [self scrollViewDidScroll:scrollView]; } -- (BOOL)scrollViewShouldScrollToTop:(UIScrollView *)scrollView +- (BOOL)scrollViewShouldScrollToTop:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { _isUserTriggeredScrolling = YES; return YES; } -- (void)scrollViewDidScrollToTop:(UIScrollView *)scrollView +- (void)scrollViewDidScrollToTop:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { _isUserTriggeredScrolling = NO; [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView +- (void)scrollViewWillBeginDragging:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -464,7 +459,7 @@ - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView _isUserTriggeredScrolling = YES; } -- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate +- (void)scrollViewDidEndDragging:(RCTUIScrollView *)scrollView willDecelerate:(BOOL)decelerate // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -476,7 +471,7 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView +- (void)scrollViewWillBeginDecelerating:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -488,7 +483,7 @@ - (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView ->onMomentumScrollBegin([self _scrollViewMetrics]); } -- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView +- (void)scrollViewDidEndDecelerating:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -501,12 +496,12 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView _isUserTriggeredScrolling = NO; } -- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView +- (void)scrollViewDidEndScrollingAnimation:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { [self _handleFinishedScrolling:scrollView]; } -- (void)_handleFinishedScrolling:(UIScrollView *)scrollView +- (void)_handleFinishedScrolling:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; [self scrollViewDidScroll:scrollView]; @@ -519,7 +514,7 @@ - (void)_handleFinishedScrolling:(UIScrollView *)scrollView [self _updateStateWithContentOffset]; } -- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view // TODO(macOS GH#774) +- (void)scrollViewWillBeginZooming:(RCTUIScrollView *)scrollView withView:(nullable RCTUIView *)view // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -530,7 +525,7 @@ - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable std::static_pointer_cast(_eventEmitter)->onScrollBeginDrag([self _scrollViewMetrics]); } -- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable RCTUIView *)view atScale:(CGFloat)scale // TODO(macOS GH#774) +- (void)scrollViewDidEndZooming:(RCTUIScrollView *)scrollView withView:(nullable RCTUIView *)view atScale:(CGFloat)scale // TODO(macOS GH#774) { [self _forceDispatchNextScrollEvent]; @@ -542,7 +537,7 @@ - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable RC [self _updateStateWithContentOffset]; } -- (RCTUIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView // TODO(macOS GH#774) +- (RCTUIView *)viewForZoomingInScrollView:(__unused RCTUIScrollView *)scrollView // TODO(macOS GH#774) { return _containerView; } @@ -610,7 +605,6 @@ - (void)scrollToEnd:(BOOL)animated #pragma mark - Child views mounting -- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView // TODO(macOS GH#774) { // Do nothing. ScrollView manages its subview clipping individually in `_remountChildren`. } diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index d438ad0475776c..9a623ca3a10b5d 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -409,7 +409,7 @@ - (void)textInputDidChangeSelection #pragma mark - RCTBackedTextInputDelegate (UIScrollViewDelegate) -- (void)scrollViewDidScroll:(UIScrollView *)scrollView +- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // TODO(macOS GH#774) { if (_eventEmitter) { std::static_pointer_cast(_eventEmitter)->onScroll([self _textInputMetrics]); diff --git a/React/Views/RefreshControl/RCTRefreshControl.h b/React/Views/RefreshControl/RCTRefreshControl.h index a11b801f9ea895..f3d6b2cdc6e150 100644 --- a/React/Views/RefreshControl/RCTRefreshControl.h +++ b/React/Views/RefreshControl/RCTRefreshControl.h @@ -14,6 +14,6 @@ @property (nonatomic, copy) NSString *title; @property (nonatomic, copy) RCTDirectEventBlock onRefresh; -@property (nonatomic, weak) UIScrollView *scrollView; +@property (nonatomic, weak) RCTUIScrollView *scrollView; // TODO(macOS GH#774) @end diff --git a/package.json b/package.json index 9200bc3a358ab5..b4a2ce90467e48 100644 --- a/package.json +++ b/package.json @@ -176,12 +176,14 @@ "resolutions": { "async": "^3.2.2", "es5-ext": "0.10.53", + "micromatch": "^4.0.0", "readable-stream": "^4.0.0", "shell-quote": "^1.7.3" }, "_justification": { "async": "Versions of async prior to 3.2.2 are vulnerable to prototype pollution", "es5-ext": "Packages after 0.10.54 and at the moment up until 0.10.59 contain a protest message. A policy prevents us from using packages with protestware, therefore downgrading to the latest release without the message.", + "micromatch": "Version 3.x.x depends on decode-uri-component 0.2.0, which has a DoS vulnerability", "readable-stream": "Eliminates dependency on outdated string_decoder component", "shell-quote": "Versions prior to 1.7.3 have an RCE vulnerability. Should be removable once we upgrade CLI tools to ^8.0.0 with RN 0.69." }, diff --git a/yarn.lock b/yarn.lock index 2915bd18dc674b..b672ad5572a722 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1785,11 +1785,6 @@ aria-query@^4.2.2: "@babel/runtime" "^7.10.2" "@babel/runtime-corejs3" "^7.10.2" -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== - arr-filter@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee" @@ -1797,7 +1792,7 @@ arr-filter@^1.1.1: dependencies: make-iterator "^1.0.0" -arr-flatten@^1.0.1, arr-flatten@^1.1.0: +arr-flatten@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== @@ -1809,11 +1804,6 @@ arr-map@^2.0.0, arr-map@^2.0.2: dependencies: make-iterator "^1.0.0" -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== - array-each@^1.0.0, array-each@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" @@ -1855,11 +1845,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== - array.prototype.flatmap@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f" @@ -1887,11 +1872,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== - assign@>=0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/assign/-/assign-0.1.7.tgz#e63bfe3a887b8630913c27663e4cc9bff1ddd25f" @@ -1953,11 +1933,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2162,19 +2137,6 @@ base64-js@^1.1.2, base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -2241,22 +2203,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -2305,21 +2251,6 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -2471,16 +2402,6 @@ clang-format@^1.2.4: glob "^7.0.0" resolve "^1.1.6" -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -2570,14 +2491,6 @@ collection-map@^1.0.0: for-own "^1.0.0" make-iterator "^1.0.0" -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - color-convert@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd" @@ -2672,11 +2585,6 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - compressible@~2.0.16: version "2.0.18" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" @@ -2719,11 +2627,6 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== - core-js-compat@^3.21.0: version "3.23.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.1.tgz#23d44d9f209086e60dabf9130cea7719af6e199b" @@ -2855,7 +2758,7 @@ debug@0.8.x: resolved "https://registry.yarnpkg.com/debug/-/debug-0.8.1.tgz#20ff4d26f5e422cb68a1bacbbb61039ad8c1c130" integrity sha512-HlXEJm99YsRjLJ8xmuz0Lq8YUwrv7hAJkTEr6/Em3sUlSUNl0UdFA+1SrY4fnykeq1FVkUEUtwRGHs9VvlYbGA== -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: +debug@2.6.9, debug@^2.2.0: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2879,11 +2782,6 @@ decimal.js@^10.2.1: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== - deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -2919,28 +2817,6 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -3557,19 +3433,6 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - expect@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" @@ -3589,21 +3452,6 @@ ext@^1.1.2: dependencies: type "^2.5.0" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" @@ -3623,20 +3471,6 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - extract-github@0.0.x: version "0.0.5" resolved "https://registry.yarnpkg.com/extract-github/-/extract-github-0.0.5.tgz#f542536db8c19b983a3bec9db96d2ef2a5ff1a86" @@ -3716,16 +3550,6 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -3806,7 +3630,7 @@ flow-parser@^0.121.0: resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f" integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg== -for-in@^1.0.1, for-in@^1.0.2: +for-in@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== @@ -3841,13 +3665,6 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== - dependencies: - map-cache "^0.2.2" - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -4005,11 +3822,6 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== - getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -4146,37 +3958,6 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -4391,20 +4172,6 @@ ip@^1.1.5: resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4432,11 +4199,6 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" @@ -4456,20 +4218,6 @@ is-core-module@^2.2.0, is-core-module@^2.8.1: dependencies: has "^1.0.3" -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - is-date-object@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" @@ -4477,24 +4225,6 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" @@ -4505,18 +4235,6 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -4561,13 +4279,6 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== - dependencies: - kind-of "^3.0.2" - is-number@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" @@ -4578,7 +4289,7 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -4653,11 +4364,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" @@ -4670,23 +4376,11 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== - dependencies: - isarray "1.0.0" - isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" @@ -5461,26 +5155,7 @@ just-scripts@^1.8.0: undertaker-registry "^1.0.1" yargs-parser "^20.2.3" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -5708,18 +5383,6 @@ mana@0.1.x: millisecond "0.1.x" request "2.x.x" -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== - dependencies: - object-visit "^1.0.0" - marked-terminal@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-4.2.0.tgz#593734a53cf9a4bb01ea961aa579bd21889ce502" @@ -6014,26 +5677,7 @@ metro@0.67.0, metro@^0.67.0: ws "^7.5.1" yargs "^15.3.1" -micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: +micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -6105,14 +5749,6 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - mkdirp@^0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -6145,23 +5781,6 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -6319,15 +5938,6 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - object-inspect@^1.12.0, object-inspect@^1.9.0: version "1.12.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" @@ -6338,13 +5948,6 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== - dependencies: - isobject "^3.0.0" - object.assign@^4.1.0, object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" @@ -6391,13 +5994,6 @@ object.hasown@^1.1.1: define-properties "^1.1.4" es-abstract "^1.19.5" -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== - dependencies: - isobject "^3.0.1" - object.reduce@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad" @@ -6617,11 +6213,6 @@ parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -6704,11 +6295,6 @@ plist@^3.0.2, plist@^3.0.5: base64-js "^1.5.1" xmlbuilder "^9.0.7" -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== - predefine@0.1.x: version "0.1.3" resolved "https://registry.yarnpkg.com/predefine/-/predefine-0.1.3.tgz#833d67afa815c42707845449dbc88d8a307744e5" @@ -7001,14 +6587,6 @@ regenerator-transform@^0.15.0: dependencies: "@babel/runtime" "^7.8.4" -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -7052,16 +6630,6 @@ remove-trailing-separator@^1.0.1: resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== - request@2.x.x, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -7125,11 +6693,6 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== - resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.19.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" @@ -7170,11 +6733,6 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -7247,13 +6805,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== - dependencies: - ret "~0.1.10" - "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -7360,16 +6911,6 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -7481,47 +7022,6 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - source-map-support@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab" @@ -7537,11 +7037,6 @@ source-map-support@^0.5.16, source-map-support@^0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -7583,13 +7078,6 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -7629,14 +7117,6 @@ stacktrace-parser@^0.1.3: dependencies: type-fest "^0.7.1" -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -7894,21 +7374,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -7916,16 +7381,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -8127,16 +7582,6 @@ unicode-property-aliases-ecmascript@^2.0.0: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -8152,14 +7597,6 @@ unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -8167,11 +7604,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== - "use-subscription@>=1.0.0 <1.6.0": version "1.5.1" resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1" @@ -8179,11 +7611,6 @@ urix@^0.1.0: dependencies: object-assign "^4.1.1" -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" From 5f70599bb84331e13bfa88a91ed4e307a7fd8934 Mon Sep 17 00:00:00 2001 From: Shawn Dempsey Date: Tue, 6 Dec 2022 16:33:04 -0800 Subject: [PATCH 7/7] Actually fix bad merge! --- .../ComponentViews/ScrollView/RCTScrollViewComponentView.h | 2 +- .../ComponentViews/ScrollView/RCTScrollViewComponentView.mm | 6 ++++++ React/Views/ScrollView/RCTScrollableProtocol.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h index a01771f60868d1..33651572822461 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN /* * Returns an actual UIScrollView that this component uses under the hood. */ -@property (nonatomic, strong, readonly) UIScrollView *scrollView; +@property (nonatomic, strong, readonly) RCTUIScrollView *scrollView; // TODO(macOS GH#774) /* * Returns the subview of the scroll view that the component uses to mount all subcomponents into. That's useful to diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index a79a9db50a0b9c..4c28bbef2c9cbb 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -334,10 +334,12 @@ - (void)_preserveContentOffsetIfNeededWithBlock:(void (^)())block [((RCTEnhancedScrollView *)_scrollView) preserveContentOffsetWithBlock:block]; } +- (void)mountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [_containerView insertSubview:childComponentView atIndex:index]; } +- (void)unmountChildComponentView:(RCTUIView *)childComponentView index:(NSInteger)index // TODO(macOS GH#774) { [childComponentView removeFromSuperview]; } @@ -348,9 +350,11 @@ - (void)_preserveContentOffsetIfNeededWithBlock:(void (^)())block */ - (BOOL)_shouldDisableScrollInteraction { + RCTUIView *ancestorView = self.superview; // TODO(macOS GH#774) while (ancestorView) { if ([ancestorView respondsToSelector:@selector(isJSResponder)]) { + BOOL isJSResponder = ((RCTUIView *)ancestorView).isJSResponder; // TODO(macOS GH#774) if (isJSResponder) { return YES; } @@ -405,6 +409,7 @@ - (void)prepareForRecycle #pragma mark - UIScrollViewDelegate +- (BOOL)touchesShouldCancelInContentView:(__unused RCTUIView *)view // TODO(macOS GH#774) { // Historically, `UIScrollView`s in React Native do not cancel touches // started on `UIControl`-based views (as normal iOS `UIScrollView`s do). @@ -605,6 +610,7 @@ - (void)scrollToEnd:(BOOL)animated #pragma mark - Child views mounting +- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(RCTUIView *)clipView // TODO(macOS GH#774) { // Do nothing. ScrollView manages its subview clipping individually in `_remountChildren`. } diff --git a/React/Views/ScrollView/RCTScrollableProtocol.h b/React/Views/ScrollView/RCTScrollableProtocol.h index 45610b457e303e..d1ff41cea33402 100644 --- a/React/Views/ScrollView/RCTScrollableProtocol.h +++ b/React/Views/ScrollView/RCTScrollableProtocol.h @@ -42,7 +42,7 @@ #if !TARGET_OS_OSX // TODO(macOS GH#774) @optional -@property (nonatomic, weak) UIScrollView *scrollView; +@property (nonatomic, weak) RCTUIScrollView *scrollView; #endif // TODO(macOS GH#774) @end