From 66894d74163936a45006ebc12b7a5223d59471dc Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 15 Aug 2021 16:20:04 +0200 Subject: [PATCH 01/10] added cornerSmoothing style prop --- Libraries/Components/View/ReactNativeStyleAttributes.js | 1 + Libraries/Components/View/ReactNativeViewViewConfig.js | 2 ++ Libraries/StyleSheet/StyleSheetTypes.js | 1 + 3 files changed, 4 insertions(+) diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js index 9f87352219e..a4f4f1421fa 100644 --- a/Libraries/Components/View/ReactNativeStyleAttributes.js +++ b/Libraries/Components/View/ReactNativeStyleAttributes.js @@ -116,6 +116,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = { borderTopLeftRadius: true, borderTopRightRadius: true, borderTopStartRadius: true, + cornerSmoothing: true, opacity: true, /** diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js index ff0b6d837e1..44df50df0fd 100644 --- a/Libraries/Components/View/ReactNativeViewViewConfig.js +++ b/Libraries/Components/View/ReactNativeViewViewConfig.js @@ -160,6 +160,7 @@ const ReactNativeViewConfig: ViewConfig = { bottom: true, clickable: true, collapsable: true, + cornerSmoothing: true, direction: true, display: true, elevation: true, @@ -253,6 +254,7 @@ const ReactNativeViewConfig: ViewConfig = { borderWidth: true, bottom: true, color: {process: require('../../StyleSheet/processColor')}, + cornerSmoothing: true, decomposedMatrix: true, direction: true, display: true, diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js index 5a32873e345..e42a498c264 100644 --- a/Libraries/StyleSheet/StyleSheetTypes.js +++ b/Libraries/StyleSheet/StyleSheetTypes.js @@ -582,6 +582,7 @@ export type ____ViewStyle_Internal = $ReadOnly<{| borderRightWidth?: number | AnimatedNode, borderStartWidth?: number | AnimatedNode, borderTopWidth?: number | AnimatedNode, + cornerSmoothing?: boolean, opacity?: number | AnimatedNode, elevation?: number, |}>; From 1b30215b9ac604ce1e1f7a30496910cadf73b4ff Mon Sep 17 00:00:00 2001 From: Benjamin Roux Date: Tue, 17 Aug 2021 19:04:36 +0200 Subject: [PATCH 02/10] adding native property --- React/Views/RCTView.h | 5 +++++ React/Views/RCTViewManager.m | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h index c82242d90b1..f827d35f8b3 100644 --- a/React/Views/RCTView.h +++ b/React/Views/RCTView.h @@ -79,6 +79,11 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait; @property (nonatomic, assign) CGFloat borderBottomStartRadius; @property (nonatomic, assign) CGFloat borderBottomEndRadius; +/** + * Corner smoothing + */ +@property (nonatomic, assign) BOOL cornerSmoothing; + /** * Border colors (actually retained). */ diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 799e60a0793..aa2f636db91 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -259,6 +259,14 @@ - (RCTShadowView *)shadowView view.removeClippedSubviews = json ? [RCTConvert BOOL:json] : defaultView.removeClippedSubviews; } } +RCT_CUSTOM_VIEW_PROPERTY(cornerSmoothing, BOOL, RCTView) +{ + if ([RCTConvert BOOL:json]) { + view.layer.cornerCurve = @"continuous"; + } else { + view.layer.cornerCurve = @"circular"; + } +} RCT_CUSTOM_VIEW_PROPERTY(borderRadius, CGFloat, RCTView) { if ([view respondsToSelector:@selector(setBorderRadius:)]) { From 8b9543bce7d95da5a26fcc9753feb49413c04319 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 17 Aug 2021 19:10:15 +0200 Subject: [PATCH 03/10] removed prop from view props to leave only for style prop --- Libraries/Components/View/ReactNativeViewViewConfig.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js index 44df50df0fd..f44bbe4c0f5 100644 --- a/Libraries/Components/View/ReactNativeViewViewConfig.js +++ b/Libraries/Components/View/ReactNativeViewViewConfig.js @@ -254,7 +254,6 @@ const ReactNativeViewConfig: ViewConfig = { borderWidth: true, bottom: true, color: {process: require('../../StyleSheet/processColor')}, - cornerSmoothing: true, decomposedMatrix: true, direction: true, display: true, From 41726a0d6c221dc35df3d7e83a3f15234e49c30a Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 18 Sep 2021 17:15:40 +0200 Subject: [PATCH 04/10] added cornerSmoothing example on the RNTester app --- .../rn-tester/js/examples/View/ViewExample.js | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/packages/rn-tester/js/examples/View/ViewExample.js b/packages/rn-tester/js/examples/View/ViewExample.js index dee2a5947b9..50cb9dc6492 100644 --- a/packages/rn-tester/js/examples/View/ViewExample.js +++ b/packages/rn-tester/js/examples/View/ViewExample.js @@ -17,6 +17,7 @@ const { Text, TouchableWithoutFeedback, View, + Platform, } = require('react-native'); exports.title = 'View'; @@ -81,12 +82,29 @@ exports.examples = [ title: 'Border Radius', render(): React.Node { return ( - - - Too much use of `borderRadius` (especially large radii) on anything - which is scrolling may result in dropped frames. Use sparingly. - - + <> + + + Too much use of `borderRadius` (especially large radii) on + anything which is scrolling may result in dropped frames. Use + sparingly. + + + {Platform.OS === 'ios' && ( + + + View with corner smoothing on the border radius + + + )} + ); }, }, From 30444b33f6f4c4bb0ce4e3cfb90956e7061d0b94 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 4 Oct 2021 23:13:27 +0200 Subject: [PATCH 05/10] added borderCurve view style prop (renamed from cornerSmoothing) --- BUCK | 1 + .../View/ReactNativeStyleAttributes.js | 2 +- .../View/ReactNativeViewViewConfig.js | 2 +- Libraries/StyleSheet/StyleSheetTypes.js | 2 +- React/Base/RCTConvert.h | 2 + React/Base/RCTConvert.m | 9 + React/Views/RCTBorderCurve.h | 13 + React/Views/RCTView.h | 5 +- React/Views/RCTViewManager.m | 13 +- packages/rn-tester/Podfile.lock | 403 ++---------------- .../RNTesterPods.xcodeproj/project.pbxproj | 5 +- .../rn-tester/js/examples/View/ViewExample.js | 4 +- 12 files changed, 70 insertions(+), 391 deletions(-) create mode 100644 React/Views/RCTBorderCurve.h diff --git a/BUCK b/BUCK index b315295c974..aa88ae02cc5 100644 --- a/BUCK +++ b/BUCK @@ -215,6 +215,7 @@ REACT_PUBLIC_HEADERS = { "React/RCTAutoInsetsProtocol.h": RCTVIEWS_PATH + "RCTAutoInsetsProtocol.h", "React/RCTBorderDrawing.h": RCTVIEWS_PATH + "RCTBorderDrawing.h", "React/RCTBorderStyle.h": RCTVIEWS_PATH + "RCTBorderStyle.h", + "React/RCTBorderCurve.h": RCTVIEWS_PATH + "RCTBorderCurve.h", "React/RCTBridge+Private.h": RCTBASE_PATH + "RCTBridge+Private.h", "React/RCTBridge.h": RCTBASE_PATH + "RCTBridge.h", "React/RCTBridgeDelegate.h": RCTBASE_PATH + "RCTBridgeDelegate.h", diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js index a4f4f1421fa..bd5010909ab 100644 --- a/Libraries/Components/View/ReactNativeStyleAttributes.js +++ b/Libraries/Components/View/ReactNativeStyleAttributes.js @@ -105,6 +105,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = { borderBottomRightRadius: true, borderBottomStartRadius: true, borderColor: colorAttributes, + borderCurve: true, borderEndColor: colorAttributes, borderLeftColor: colorAttributes, borderRadius: true, @@ -116,7 +117,6 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = { borderTopLeftRadius: true, borderTopRightRadius: true, borderTopStartRadius: true, - cornerSmoothing: true, opacity: true, /** diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js index f44bbe4c0f5..866cf829573 100644 --- a/Libraries/Components/View/ReactNativeViewViewConfig.js +++ b/Libraries/Components/View/ReactNativeViewViewConfig.js @@ -140,6 +140,7 @@ const ReactNativeViewConfig: ViewConfig = { borderBottomStartRadius: true, borderBottomWidth: true, borderColor: {process: require('../../StyleSheet/processColor')}, + borderCurve: true, borderEndColor: {process: require('../../StyleSheet/processColor')}, borderEndWidth: true, borderLeftColor: {process: require('../../StyleSheet/processColor')}, @@ -160,7 +161,6 @@ const ReactNativeViewConfig: ViewConfig = { bottom: true, clickable: true, collapsable: true, - cornerSmoothing: true, direction: true, display: true, elevation: true, diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js index e42a498c264..e65a04175ff 100644 --- a/Libraries/StyleSheet/StyleSheetTypes.js +++ b/Libraries/StyleSheet/StyleSheetTypes.js @@ -559,6 +559,7 @@ export type ____ViewStyle_Internal = $ReadOnly<{| backfaceVisibility?: 'visible' | 'hidden', backgroundColor?: ____ColorValue_Internal, borderColor?: ____ColorValue_Internal, + borderCurve?: 'circular' | 'continuous', borderBottomColor?: ____ColorValue_Internal, borderEndColor?: ____ColorValue_Internal, borderLeftColor?: ____ColorValue_Internal, @@ -582,7 +583,6 @@ export type ____ViewStyle_Internal = $ReadOnly<{| borderRightWidth?: number | AnimatedNode, borderStartWidth?: number | AnimatedNode, borderTopWidth?: number | AnimatedNode, - cornerSmoothing?: boolean, opacity?: number | AnimatedNode, elevation?: number, |}>; diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h index 1137788402b..ec080942b99 100644 --- a/React/Base/RCTConvert.h +++ b/React/Base/RCTConvert.h @@ -10,6 +10,7 @@ #import #import +#import #import #import #import @@ -130,6 +131,7 @@ typedef BOOL css_backface_visibility_t; + (RCTPointerEvents)RCTPointerEvents:(id)json; + (RCTAnimationType)RCTAnimationType:(id)json; + (RCTBorderStyle)RCTBorderStyle:(id)json; ++ (RCTBorderCurve)RCTBorderCurve:(id)json; + (RCTTextDecorationLineType)RCTTextDecorationLineType:(id)json; @end diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index 4b59899560b..e366613fcb6 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -345,6 +345,15 @@ + (NSLocale *)NSLocale:(id)json RCTBorderStyleSolid, integerValue) +RCT_ENUM_CONVERTER( + RCTBorderCurve, + (@{ + @"circular" : @(RCTBorderCurveCircular), + @"continuous" : @(RCTBorderCurveContinuous), + }), + RCTBorderCurveCircular, + integerValue) + RCT_ENUM_CONVERTER( RCTTextDecorationLineType, (@{ diff --git a/React/Views/RCTBorderCurve.h b/React/Views/RCTBorderCurve.h new file mode 100644 index 00000000000..3b26407067a --- /dev/null +++ b/React/Views/RCTBorderCurve.h @@ -0,0 +1,13 @@ +/* + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#import + +typedef NS_ENUM(NSInteger, RCTBorderCurve) { + RCTBorderCurveContinuous = 0, + RCTBorderCurveCircular, +}; diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h index f827d35f8b3..ed7bee09252 100644 --- a/React/Views/RCTView.h +++ b/React/Views/RCTView.h @@ -8,6 +8,7 @@ #import #import +#import #import #import #import @@ -80,9 +81,9 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait; @property (nonatomic, assign) CGFloat borderBottomEndRadius; /** - * Corner smoothing + * Border curve */ -@property (nonatomic, assign) BOOL cornerSmoothing; +@property (nonatomic, assign) RCTBorderCurve borderCurve; /** * Border colors (actually retained). diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index aa2f636db91..5dab769a5d5 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -9,6 +9,7 @@ #import "RCTAssert.h" #import "RCTBorderStyle.h" +#import "RCTBorderCurve.h" #import "RCTBridge.h" #import "RCTConvert+Transform.h" #import "RCTConvert.h" @@ -259,12 +260,14 @@ - (RCTShadowView *)shadowView view.removeClippedSubviews = json ? [RCTConvert BOOL:json] : defaultView.removeClippedSubviews; } } -RCT_CUSTOM_VIEW_PROPERTY(cornerSmoothing, BOOL, RCTView) +RCT_CUSTOM_VIEW_PROPERTY(borderCurve, RCTBorderCurve, RCTView) { - if ([RCTConvert BOOL:json]) { - view.layer.cornerCurve = @"continuous"; - } else { - view.layer.cornerCurve = @"circular"; + if (@available(iOS 13.0, *)) { + if ([RCTConvert RCTBorderCurve:json] == RCTBorderCurveContinuous) { + view.layer.cornerCurve = kCACornerCurveContinuous; + } else { + view.layer.cornerCurve = kCACornerCurveCircular; + } } } RCT_CUSTOM_VIEW_PROPERTY(borderRadius, CGFloat, RCTView) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 3f2bd828528..23b78b63321 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -85,11 +85,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Fabric (2021.06.28.00): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - RCTRequired (1000.0.0) - RCTTypeSafety (1000.0.0): - FBLazyVector (= 1000.0.0) @@ -264,326 +259,6 @@ PODS: - React-jsinspector (= 1000.0.0) - React-perflogger (= 1000.0.0) - React-runtimeexecutor (= 1000.0.0) - - React-Fabric (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Fabric/animations (= 1000.0.0) - - React-Fabric/attributedstring (= 1000.0.0) - - React-Fabric/better (= 1000.0.0) - - React-Fabric/componentregistry (= 1000.0.0) - - React-Fabric/componentregistrynative (= 1000.0.0) - - React-Fabric/components (= 1000.0.0) - - React-Fabric/config (= 1000.0.0) - - React-Fabric/core (= 1000.0.0) - - React-Fabric/debug_core (= 1000.0.0) - - React-Fabric/debug_renderer (= 1000.0.0) - - React-Fabric/imagemanager (= 1000.0.0) - - React-Fabric/leakchecker (= 1000.0.0) - - React-Fabric/mounting (= 1000.0.0) - - React-Fabric/runtimescheduler (= 1000.0.0) - - React-Fabric/scheduler (= 1000.0.0) - - React-Fabric/telemetry (= 1000.0.0) - - React-Fabric/templateprocessor (= 1000.0.0) - - React-Fabric/textlayoutmanager (= 1000.0.0) - - React-Fabric/uimanager (= 1000.0.0) - - React-Fabric/utils (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/animations (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/attributedstring (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/better (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/componentregistry (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/componentregistrynative (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Fabric/components/activityindicator (= 1000.0.0) - - React-Fabric/components/image (= 1000.0.0) - - React-Fabric/components/inputaccessory (= 1000.0.0) - - React-Fabric/components/legacyviewmanagerinterop (= 1000.0.0) - - React-Fabric/components/modal (= 1000.0.0) - - React-Fabric/components/rncore (= 1000.0.0) - - React-Fabric/components/root (= 1000.0.0) - - React-Fabric/components/safeareaview (= 1000.0.0) - - React-Fabric/components/scrollview (= 1000.0.0) - - React-Fabric/components/slider (= 1000.0.0) - - React-Fabric/components/text (= 1000.0.0) - - React-Fabric/components/textinput (= 1000.0.0) - - React-Fabric/components/unimplementedview (= 1000.0.0) - - React-Fabric/components/view (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/activityindicator (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/image (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/inputaccessory (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/legacyviewmanagerinterop (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/modal (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/rncore (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/root (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/safeareaview (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/scrollview (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/slider (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/text (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/textinput (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/unimplementedview (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/components/view (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - Yoga - - React-Fabric/config (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/core (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/debug_core (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/debug_renderer (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/imagemanager (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - React-RCTImage (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/leakchecker (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/mounting (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/runtimescheduler (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/scheduler (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/telemetry (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/templateprocessor (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/textlayoutmanager (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Fabric/uimanager - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/uimanager (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/utils (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-graphics (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - React-Core/Default (= 1000.0.0) - React-jsi (1000.0.0): - boost (= 1.76.0) - DoubleConversion @@ -595,11 +270,6 @@ PODS: - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00) - - React-jsi/Fabric (1000.0.0): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.06.28.00) - React-jsiexecutor (1000.0.0): - DoubleConversion - glog @@ -626,11 +296,6 @@ PODS: - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTFabric (1000.0.0): - - RCT-Folly/Fabric (= 2021.06.28.00) - - React-Core (= 1000.0.0) - - React-Fabric (= 1000.0.0) - - React-RCTImage (= 1000.0.0) - React-RCTImage (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00) @@ -731,7 +396,6 @@ DEPENDENCIES: - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) - glog (from `../../third-party-podspecs/glog.podspec`) - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`) - - RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../../Libraries/RCTRequired`) - RCTTypeSafety (from `../../Libraries/TypeSafety`) - React (from `../../`) @@ -741,17 +405,13 @@ DEPENDENCIES: - React-Core/RCTWebSocket (from `../../`) - React-CoreModules (from `../../React/CoreModules`) - React-cxxreact (from `../../ReactCommon/cxxreact`) - - React-Fabric (from `../../ReactCommon`) - - React-graphics (from `../../ReactCommon/react/renderer/graphics`) - React-jsi (from `../../ReactCommon/jsi`) - - React-jsi/Fabric (from `../../ReactCommon/jsi`) - React-jsiexecutor (from `../../ReactCommon/jsiexecutor`) - React-jsinspector (from `../../ReactCommon/jsinspector`) - React-perflogger (from `../../ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../../Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../../Libraries/NativeAnimation`) - React-RCTBlob (from `../../Libraries/Blob`) - - React-RCTFabric (from `../../React`) - React-RCTImage (from `../../Libraries/Image`) - React-RCTLinking (from `../../Libraries/LinkingIOS`) - React-RCTNetwork (from `../../Libraries/Network`) @@ -809,10 +469,6 @@ EXTERNAL SOURCES: :path: "../../React/CoreModules" React-cxxreact: :path: "../../ReactCommon/cxxreact" - React-Fabric: - :path: "../../ReactCommon" - React-graphics: - :path: "../../ReactCommon/react/renderer/graphics" React-jsi: :path: "../../ReactCommon/jsi" React-jsiexecutor: @@ -827,8 +483,6 @@ EXTERNAL SOURCES: :path: "../../Libraries/NativeAnimation" React-RCTBlob: :path: "../../Libraries/Blob" - React-RCTFabric: - :path: "../../React" React-RCTImage: :path: "../../Libraries/Image" React-RCTLinking: @@ -856,8 +510,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949 - FBReactNativeSpec: ce190a91d6e289e5fb1fb2414c90d16cb8567ab8 + FBLazyVector: 6a8264f3c8733864579035439da73796d3566af8 + FBReactNativeSpec: 60660c83b26b9ca55e7084983de3152625fccea7 Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c @@ -872,34 +526,31 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RCT-Folly: db8170f3a20daeced0bf1619a7886998dd7679ec - RCTRequired: af2d6080a4b9ba0885b28ca78879a92066c71cab - RCTTypeSafety: c8f5da77a23b354f35637c81f07c1f702044b4c6 - React: f64c9f6db5428717922a3292ba6a448615a2e143 - React-callinvoker: c5d61e29df57793f0dc10ec2bc01c846f863e51f - React-Core: 15d3fbb3cc863fa9990cc14c303a021cc66892a5 - React-CoreModules: 5ee1ed4f8b7f8bdbd45ed155a15c601dca9c73dd - React-cxxreact: 20a63475c83c5450442c754305738c6db6070214 - React-Fabric: 7641eab239c5fc5669ef22ea08cf383f9066fdcb - React-graphics: db797c4609216593a1a12d1661716898d303900f - React-jsi: 7cc3d3691803478047e7d2c8eb5d4c2f9c6d2922 - React-jsiexecutor: 02ed9d4a28a8acf44788b4697e13c4aadc42cf72 - React-jsinspector: 7d223826b0e7a61b3540c21b9eca2603b1d4e823 - React-perflogger: fe66bd6d8b17ebcfdf0159bf41fe28d8035ac20c - React-RCTActionSheet: 3131a0b9280aa0e51bdf54b3d79aecd8503db62c - React-RCTAnimation: 73ba515a4fab8ca55d15b41935547cdb45fa5e0b - React-RCTBlob: 2e817b4d0150c371c06eabc980a4a76f5c2f757b - React-RCTFabric: efd8d82066a040f612192d1ce57e767faace2801 - React-RCTImage: 04c55217a5bfb6c40cb25b64e304e3d62244cb58 - React-RCTLinking: 559c9223212ab2824950883220582c5e29a6fcb2 - React-RCTNetwork: c829621bad40dcbdbae9da5b88b341218bbf9753 - React-RCTPushNotification: fafeb247db030c4d3f0a098d729e49f62ed32b3f - React-RCTSettings: 5e7847825606de5698716dcd1a5f026dc6cd72d0 - React-RCTTest: 301130cab41008c4bf511f1a2772cdd7253a9cba - React-RCTText: e9146b2c0550a83d1335bfe2553760070a2d75c7 - React-RCTVibration: 1a58f6ab1ae5fad004119979b676cb5e912f2e44 - React-runtimeexecutor: 4b0c6eb341c7d3ceb5e2385cb0fdb9bf701024f3 - ReactCommon: 877082c706646737624b505f7120052794ae75dd - Yoga: c0d06f5380d34e939f55420669a60fe08b79bd75 + RCTRequired: ac3163068eb67d5fac1d19efb51f678e18acbb13 + RCTTypeSafety: c189bea1781e4c7a1347aa7b8053b0163684c0f9 + React: fd14aa1dca75c5d2fce4eed464e8bc340cef99ea + React-callinvoker: 9567395b832869a1e30f1b65e4d26285c73a078e + React-Core: e53d3cb93a2f74129e9066d90fed672d8fcad5d0 + React-CoreModules: cec2fff7df677a1993781cbc08847faebb1dbaec + React-cxxreact: a273e9119c28e580efae94ac5559e62bd798e255 + React-jsi: f315a267de0b6ab67724d7fbc8e3ac034015314b + React-jsiexecutor: 39b762ed467edc695ce19fd010115fc0193c3b86 + React-jsinspector: b54d9aa82b068e219a6bcde0ffcf4cdd4864a152 + React-perflogger: c0b3c48568d88f85ce8dd53a5465a8cd8f969062 + React-RCTActionSheet: 5b0f0d267e7d2fcdaa641bce390eb1bf8836254a + React-RCTAnimation: 4f0b8488c8db5bf7c43e3b61be21649490e0fc5f + React-RCTBlob: ec27dfbf46c6316327815a81036669e06cbf4baa + React-RCTImage: a8966f8b6167334686972440f5606147ad8bce66 + React-RCTLinking: 509ba53fe3a2ae4e99b6847d374f4b006b9106dc + React-RCTNetwork: 2fa30de770d9ff351b12be125c98b929e75ba6e2 + React-RCTPushNotification: ad196100ec28f8e340d73054fc1617b324c52464 + React-RCTSettings: 8336d4d17d69270d3c3ecc178e8a75b3ff6c2dbc + React-RCTTest: 38d1d5185a2476fa02653f8fb281562ca1289bd7 + React-RCTText: 0c0b194a00008cad8a2279b792f09690327fc166 + React-RCTVibration: 689df6776a2d875a3e9a67a1ce885243003e6a33 + React-runtimeexecutor: 5ba56bfc4979b68c2e60bcf00f354d1bd24ad6c3 + ReactCommon: ecaf931d864ac6e1e7ead9639c1e471793ac11d7 + Yoga: b308a526fb3f5268478f00ff1b3aaf814e06ac75 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 6e910a576b7db9347c60dfc58f7852f692200116 diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 334d7ae082a..5d033da2e8e 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -321,7 +321,6 @@ C38CB0C2095A8FFDE13321E5 /* Pods-RNTesterUnitTests.debug.xcconfig */, 8735BC063632C9712E25C7D9 /* Pods-RNTesterUnitTests.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -775,7 +774,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9DDNPU75GR; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -808,7 +807,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9DDNPU75GR; EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; diff --git a/packages/rn-tester/js/examples/View/ViewExample.js b/packages/rn-tester/js/examples/View/ViewExample.js index 50cb9dc6492..3a767a62412 100644 --- a/packages/rn-tester/js/examples/View/ViewExample.js +++ b/packages/rn-tester/js/examples/View/ViewExample.js @@ -97,10 +97,10 @@ exports.examples = [ padding: 8, marginTop: 12, backgroundColor: '#527FE4', - cornerSmoothing: true, + borderCurve: 'continuous', }}> - View with corner smoothing on the border radius + View with continuous border curve )} From 728ef63d168fe17e90f2dc7016387a710114eb26 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 4 Oct 2021 23:16:30 +0200 Subject: [PATCH 06/10] revert podfile.lock + project.pbxproj changes --- packages/rn-tester/Podfile.lock | 403 ++++++++++++++++-- .../RNTesterPods.xcodeproj/project.pbxproj | 5 +- 2 files changed, 379 insertions(+), 29 deletions(-) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 23b78b63321..3f2bd828528 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -85,6 +85,11 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog + - RCT-Folly/Fabric (2021.06.28.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog - RCTRequired (1000.0.0) - RCTTypeSafety (1000.0.0): - FBLazyVector (= 1000.0.0) @@ -259,6 +264,326 @@ PODS: - React-jsinspector (= 1000.0.0) - React-perflogger (= 1000.0.0) - React-runtimeexecutor (= 1000.0.0) + - React-Fabric (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-Fabric/animations (= 1000.0.0) + - React-Fabric/attributedstring (= 1000.0.0) + - React-Fabric/better (= 1000.0.0) + - React-Fabric/componentregistry (= 1000.0.0) + - React-Fabric/componentregistrynative (= 1000.0.0) + - React-Fabric/components (= 1000.0.0) + - React-Fabric/config (= 1000.0.0) + - React-Fabric/core (= 1000.0.0) + - React-Fabric/debug_core (= 1000.0.0) + - React-Fabric/debug_renderer (= 1000.0.0) + - React-Fabric/imagemanager (= 1000.0.0) + - React-Fabric/leakchecker (= 1000.0.0) + - React-Fabric/mounting (= 1000.0.0) + - React-Fabric/runtimescheduler (= 1000.0.0) + - React-Fabric/scheduler (= 1000.0.0) + - React-Fabric/telemetry (= 1000.0.0) + - React-Fabric/templateprocessor (= 1000.0.0) + - React-Fabric/textlayoutmanager (= 1000.0.0) + - React-Fabric/uimanager (= 1000.0.0) + - React-Fabric/utils (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/animations (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/attributedstring (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/better (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/componentregistry (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/componentregistrynative (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-Fabric/components/activityindicator (= 1000.0.0) + - React-Fabric/components/image (= 1000.0.0) + - React-Fabric/components/inputaccessory (= 1000.0.0) + - React-Fabric/components/legacyviewmanagerinterop (= 1000.0.0) + - React-Fabric/components/modal (= 1000.0.0) + - React-Fabric/components/rncore (= 1000.0.0) + - React-Fabric/components/root (= 1000.0.0) + - React-Fabric/components/safeareaview (= 1000.0.0) + - React-Fabric/components/scrollview (= 1000.0.0) + - React-Fabric/components/slider (= 1000.0.0) + - React-Fabric/components/text (= 1000.0.0) + - React-Fabric/components/textinput (= 1000.0.0) + - React-Fabric/components/unimplementedview (= 1000.0.0) + - React-Fabric/components/view (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/activityindicator (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/image (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/inputaccessory (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/legacyviewmanagerinterop (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/modal (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/rncore (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/root (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/safeareaview (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/scrollview (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/slider (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/text (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/textinput (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/unimplementedview (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/view (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - Yoga + - React-Fabric/config (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/core (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/debug_core (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/debug_renderer (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/imagemanager (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-RCTImage (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/leakchecker (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/mounting (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/runtimescheduler (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/scheduler (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/telemetry (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/templateprocessor (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/textlayoutmanager (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-Fabric/uimanager + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/uimanager (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/utils (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-graphics (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - React-Core/Default (= 1000.0.0) - React-jsi (1000.0.0): - boost (= 1.76.0) - DoubleConversion @@ -270,6 +595,11 @@ PODS: - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00) + - React-jsi/Fabric (1000.0.0): + - boost (= 1.76.0) + - DoubleConversion + - glog + - RCT-Folly (= 2021.06.28.00) - React-jsiexecutor (1000.0.0): - DoubleConversion - glog @@ -296,6 +626,11 @@ PODS: - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) + - React-RCTFabric (1000.0.0): + - RCT-Folly/Fabric (= 2021.06.28.00) + - React-Core (= 1000.0.0) + - React-Fabric (= 1000.0.0) + - React-RCTImage (= 1000.0.0) - React-RCTImage (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00) @@ -396,6 +731,7 @@ DEPENDENCIES: - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) - glog (from `../../third-party-podspecs/glog.podspec`) - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`) + - RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../../Libraries/RCTRequired`) - RCTTypeSafety (from `../../Libraries/TypeSafety`) - React (from `../../`) @@ -405,13 +741,17 @@ DEPENDENCIES: - React-Core/RCTWebSocket (from `../../`) - React-CoreModules (from `../../React/CoreModules`) - React-cxxreact (from `../../ReactCommon/cxxreact`) + - React-Fabric (from `../../ReactCommon`) + - React-graphics (from `../../ReactCommon/react/renderer/graphics`) - React-jsi (from `../../ReactCommon/jsi`) + - React-jsi/Fabric (from `../../ReactCommon/jsi`) - React-jsiexecutor (from `../../ReactCommon/jsiexecutor`) - React-jsinspector (from `../../ReactCommon/jsinspector`) - React-perflogger (from `../../ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../../Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../../Libraries/NativeAnimation`) - React-RCTBlob (from `../../Libraries/Blob`) + - React-RCTFabric (from `../../React`) - React-RCTImage (from `../../Libraries/Image`) - React-RCTLinking (from `../../Libraries/LinkingIOS`) - React-RCTNetwork (from `../../Libraries/Network`) @@ -469,6 +809,10 @@ EXTERNAL SOURCES: :path: "../../React/CoreModules" React-cxxreact: :path: "../../ReactCommon/cxxreact" + React-Fabric: + :path: "../../ReactCommon" + React-graphics: + :path: "../../ReactCommon/react/renderer/graphics" React-jsi: :path: "../../ReactCommon/jsi" React-jsiexecutor: @@ -483,6 +827,8 @@ EXTERNAL SOURCES: :path: "../../Libraries/NativeAnimation" React-RCTBlob: :path: "../../Libraries/Blob" + React-RCTFabric: + :path: "../../React" React-RCTImage: :path: "../../Libraries/Image" React-RCTLinking: @@ -510,8 +856,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: 6a8264f3c8733864579035439da73796d3566af8 - FBReactNativeSpec: 60660c83b26b9ca55e7084983de3152625fccea7 + FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949 + FBReactNativeSpec: ce190a91d6e289e5fb1fb2414c90d16cb8567ab8 Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c @@ -526,31 +872,34 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RCT-Folly: db8170f3a20daeced0bf1619a7886998dd7679ec - RCTRequired: ac3163068eb67d5fac1d19efb51f678e18acbb13 - RCTTypeSafety: c189bea1781e4c7a1347aa7b8053b0163684c0f9 - React: fd14aa1dca75c5d2fce4eed464e8bc340cef99ea - React-callinvoker: 9567395b832869a1e30f1b65e4d26285c73a078e - React-Core: e53d3cb93a2f74129e9066d90fed672d8fcad5d0 - React-CoreModules: cec2fff7df677a1993781cbc08847faebb1dbaec - React-cxxreact: a273e9119c28e580efae94ac5559e62bd798e255 - React-jsi: f315a267de0b6ab67724d7fbc8e3ac034015314b - React-jsiexecutor: 39b762ed467edc695ce19fd010115fc0193c3b86 - React-jsinspector: b54d9aa82b068e219a6bcde0ffcf4cdd4864a152 - React-perflogger: c0b3c48568d88f85ce8dd53a5465a8cd8f969062 - React-RCTActionSheet: 5b0f0d267e7d2fcdaa641bce390eb1bf8836254a - React-RCTAnimation: 4f0b8488c8db5bf7c43e3b61be21649490e0fc5f - React-RCTBlob: ec27dfbf46c6316327815a81036669e06cbf4baa - React-RCTImage: a8966f8b6167334686972440f5606147ad8bce66 - React-RCTLinking: 509ba53fe3a2ae4e99b6847d374f4b006b9106dc - React-RCTNetwork: 2fa30de770d9ff351b12be125c98b929e75ba6e2 - React-RCTPushNotification: ad196100ec28f8e340d73054fc1617b324c52464 - React-RCTSettings: 8336d4d17d69270d3c3ecc178e8a75b3ff6c2dbc - React-RCTTest: 38d1d5185a2476fa02653f8fb281562ca1289bd7 - React-RCTText: 0c0b194a00008cad8a2279b792f09690327fc166 - React-RCTVibration: 689df6776a2d875a3e9a67a1ce885243003e6a33 - React-runtimeexecutor: 5ba56bfc4979b68c2e60bcf00f354d1bd24ad6c3 - ReactCommon: ecaf931d864ac6e1e7ead9639c1e471793ac11d7 - Yoga: b308a526fb3f5268478f00ff1b3aaf814e06ac75 + RCTRequired: af2d6080a4b9ba0885b28ca78879a92066c71cab + RCTTypeSafety: c8f5da77a23b354f35637c81f07c1f702044b4c6 + React: f64c9f6db5428717922a3292ba6a448615a2e143 + React-callinvoker: c5d61e29df57793f0dc10ec2bc01c846f863e51f + React-Core: 15d3fbb3cc863fa9990cc14c303a021cc66892a5 + React-CoreModules: 5ee1ed4f8b7f8bdbd45ed155a15c601dca9c73dd + React-cxxreact: 20a63475c83c5450442c754305738c6db6070214 + React-Fabric: 7641eab239c5fc5669ef22ea08cf383f9066fdcb + React-graphics: db797c4609216593a1a12d1661716898d303900f + React-jsi: 7cc3d3691803478047e7d2c8eb5d4c2f9c6d2922 + React-jsiexecutor: 02ed9d4a28a8acf44788b4697e13c4aadc42cf72 + React-jsinspector: 7d223826b0e7a61b3540c21b9eca2603b1d4e823 + React-perflogger: fe66bd6d8b17ebcfdf0159bf41fe28d8035ac20c + React-RCTActionSheet: 3131a0b9280aa0e51bdf54b3d79aecd8503db62c + React-RCTAnimation: 73ba515a4fab8ca55d15b41935547cdb45fa5e0b + React-RCTBlob: 2e817b4d0150c371c06eabc980a4a76f5c2f757b + React-RCTFabric: efd8d82066a040f612192d1ce57e767faace2801 + React-RCTImage: 04c55217a5bfb6c40cb25b64e304e3d62244cb58 + React-RCTLinking: 559c9223212ab2824950883220582c5e29a6fcb2 + React-RCTNetwork: c829621bad40dcbdbae9da5b88b341218bbf9753 + React-RCTPushNotification: fafeb247db030c4d3f0a098d729e49f62ed32b3f + React-RCTSettings: 5e7847825606de5698716dcd1a5f026dc6cd72d0 + React-RCTTest: 301130cab41008c4bf511f1a2772cdd7253a9cba + React-RCTText: e9146b2c0550a83d1335bfe2553760070a2d75c7 + React-RCTVibration: 1a58f6ab1ae5fad004119979b676cb5e912f2e44 + React-runtimeexecutor: 4b0c6eb341c7d3ceb5e2385cb0fdb9bf701024f3 + ReactCommon: 877082c706646737624b505f7120052794ae75dd + Yoga: c0d06f5380d34e939f55420669a60fe08b79bd75 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 6e910a576b7db9347c60dfc58f7852f692200116 diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 5d033da2e8e..334d7ae082a 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -321,6 +321,7 @@ C38CB0C2095A8FFDE13321E5 /* Pods-RNTesterUnitTests.debug.xcconfig */, 8735BC063632C9712E25C7D9 /* Pods-RNTesterUnitTests.release.xcconfig */, ); + name = Pods; path = Pods; sourceTree = ""; }; @@ -774,7 +775,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = 9DDNPU75GR; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -807,7 +808,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = 9DDNPU75GR; + DEVELOPMENT_TEAM = ""; EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; From 65c320f8f3e17c82a24e721844071431dcfeb617 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 5 Oct 2021 07:38:54 +0200 Subject: [PATCH 07/10] removed RCTBorderCurve.h from BUCK --- BUCK | 1 - 1 file changed, 1 deletion(-) diff --git a/BUCK b/BUCK index aa88ae02cc5..b315295c974 100644 --- a/BUCK +++ b/BUCK @@ -215,7 +215,6 @@ REACT_PUBLIC_HEADERS = { "React/RCTAutoInsetsProtocol.h": RCTVIEWS_PATH + "RCTAutoInsetsProtocol.h", "React/RCTBorderDrawing.h": RCTVIEWS_PATH + "RCTBorderDrawing.h", "React/RCTBorderStyle.h": RCTVIEWS_PATH + "RCTBorderStyle.h", - "React/RCTBorderCurve.h": RCTVIEWS_PATH + "RCTBorderCurve.h", "React/RCTBridge+Private.h": RCTBASE_PATH + "RCTBridge+Private.h", "React/RCTBridge.h": RCTBASE_PATH + "RCTBridge.h", "React/RCTBridgeDelegate.h": RCTBASE_PATH + "RCTBridgeDelegate.h", From cc6b0c25b0407e7ba5f27f965179c475c801ef2c Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 5 Oct 2021 07:39:33 +0200 Subject: [PATCH 08/10] removed RCTBorderCurve from RCTView.h --- React/Views/RCTView.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h index ed7bee09252..c82242d90b1 100644 --- a/React/Views/RCTView.h +++ b/React/Views/RCTView.h @@ -8,7 +8,6 @@ #import #import -#import #import #import #import @@ -80,11 +79,6 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait; @property (nonatomic, assign) CGFloat borderBottomStartRadius; @property (nonatomic, assign) CGFloat borderBottomEndRadius; -/** - * Border curve - */ -@property (nonatomic, assign) RCTBorderCurve borderCurve; - /** * Border colors (actually retained). */ From 8ae45c0c53b284116a4c277eddf9468ae7e0cc1b Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 5 Oct 2021 07:41:45 +0200 Subject: [PATCH 09/10] switch case for border curve prop --- React/Views/RCTViewManager.m | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 5dab769a5d5..299f213f8c7 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -263,10 +263,15 @@ - (RCTShadowView *)shadowView RCT_CUSTOM_VIEW_PROPERTY(borderCurve, RCTBorderCurve, RCTView) { if (@available(iOS 13.0, *)) { - if ([RCTConvert RCTBorderCurve:json] == RCTBorderCurveContinuous) { - view.layer.cornerCurve = kCACornerCurveContinuous; - } else { - view.layer.cornerCurve = kCACornerCurveCircular; + switch ([RCTConvert RCTBorderCurve:json]) { + case RCTBorderCurveContinuous: + view.layer.cornerCurve = kCACornerCurveContinuous; + break; + case RCTBorderCurveCircular: + view.layer.cornerCurve = kCACornerCurveCircular; + break; + default: + view.layer.cornerCurve = kCACornerCurveCircular; } } } From 6cc9632464f3d15ba7bcc8c5fed65ef4a31027c4 Mon Sep 17 00:00:00 2001 From: Eric Edouard Amilhat Date: Tue, 2 Nov 2021 21:46:23 +0100 Subject: [PATCH 10/10] removed default cornerCurve style in convert mapper --- React/Views/RCTViewManager.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 299f213f8c7..160336d750e 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -270,8 +270,6 @@ - (RCTShadowView *)shadowView case RCTBorderCurveCircular: view.layer.cornerCurve = kCACornerCurveCircular; break; - default: - view.layer.cornerCurve = kCACornerCurveCircular; } } }