react-native 0.71.3 → 0.72.0-rc.0

package/React/Fabric/Utils/RCTIdentifierPool.h

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <bitset>
+
+namespace facebook {
+namespace react {
+
+template <size_t size>
+class RCTIdentifierPool {
+ public:
+  void enqueue(int index) {
+    usage[index] = false;
+  }
+
+  int dequeue() {
+    while (true) {
+      if (!usage[lastIndex]) {
+        usage[lastIndex] = true;
+        return lastIndex;
+      }
+      lastIndex = (lastIndex + 1) % size;
+    }
+  }
+
+  void reset() {
+    for (int i = 0; i < size; i++) {
+      usage[i] = false;
+    }
+  }
+
+ private:
+  std::bitset<size> usage;
+  int lastIndex;
+};
+
+} // namespace react
+} // namespace facebook

package/React/Fabric/Utils/RCTReactTaggedView.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Lightweight wrapper class around a UIView with a react tag which registers a
  * constant react tag at initialization time for a stable hash and provides the
  * udnerlying view to a caller if that underlying view's react tag has not
- * changed from the one provided at initalization time (i.e. recycled).
+ * changed from the one provided at initialization time (i.e. recycled).
  */
 @interface RCTReactTaggedView : NSObject {
   UIView *_view;

package/React/Inspector/RCTInspector.h

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTDefines.h>
 
-#if RCT_DEV
+#if RCT_DEV || RCT_REMOTE_PROFILE
 
 @class RCTInspectorRemoteConnection;
 

package/React/Inspector/RCTInspector.mm

@@ -7,14 +7,13 @@
 
 #import <React/RCTInspector.h>
 
-#if RCT_DEV
+#if RCT_DEV || RCT_REMOTE_PROFILE
 
 #include <jsinspector/InspectorInterfaces.h>
 
 #import <React/RCTDefines.h>
 #import <React/RCTInspectorPackagerConnection.h>
 #import <React/RCTLog.h>
-#import <React/RCTSRWebSocket.h>
 #import <React/RCTUtils.h>
 
 using namespace facebook::react;

package/React/Inspector/RCTInspectorPackagerConnection.h

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTDefines.h>
 
-#if RCT_DEV
+#if RCT_DEV || RCT_REMOTE_PROFILE
 
 @interface RCTBundleStatus : NSObject
 @property (atomic, assign) BOOL isLastBundleDownloadSuccess;

package/React/Inspector/RCTInspectorPackagerConnection.m

@@ -7,13 +7,13 @@
 
 #import <React/RCTInspectorPackagerConnection.h>
 
-#if RCT_DEV
+#if RCT_DEV || RCT_REMOTE_PROFILE
 
 #import <React/RCTDefines.h>
 #import <React/RCTInspector.h>
 #import <React/RCTLog.h>
-#import <React/RCTSRWebSocket.h>
 #import <React/RCTUtils.h>
+#import <SocketRocket/SRWebSocket.h>
 
 // This is a port of the Android impl, at
 // ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
@@ -24,10 +24,10 @@ const int RECONNECT_DELAY_MS = 2000;
 @implementation RCTBundleStatus
 @end
 
-@interface RCTInspectorPackagerConnection () <RCTSRWebSocketDelegate> {
+@interface RCTInspectorPackagerConnection () <SRWebSocketDelegate> {
   NSURL *_url;
   NSMutableDictionary<NSString *, RCTInspectorLocalConnection *> *_inspectorConnections;
-  RCTSRWebSocket *_webSocket;
+  SRWebSocket *_webSocket;
   dispatch_queue_t _jsQueue;
   BOOL _closed;
   BOOL _suppressConnectionErrors;
@@ -188,7 +188,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 }
 
 // analogous to InspectorPackagerConnection.Connection.onFailure(...)
-- (void)webSocket:(__unused RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
+- (void)webSocket:(__unused SRWebSocket *)webSocket didFailWithError:(NSError *)error
 {
   if (_webSocket) {
     [self abort:@"Websocket exception" withCause:error];
@@ -199,7 +199,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 }
 
 // analogous to InspectorPackagerConnection.Connection.onMessage(...)
-- (void)webSocket:(__unused RCTSRWebSocket *)webSocket didReceiveMessage:(id)opaqueMessage
+- (void)webSocket:(__unused SRWebSocket *)webSocket didReceiveMessage:(id)opaqueMessage
 {
   // warn but don't die on unrecognized messages
   if (![opaqueMessage isKindOfClass:[NSString class]]) {
@@ -219,7 +219,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 }
 
 // analogous to InspectorPackagerConnection.Connection.onClosed(...)
-- (void)webSocket:(__unused RCTSRWebSocket *)webSocket
+- (void)webSocket:(__unused SRWebSocket *)webSocket
     didCloseWithCode:(__unused NSInteger)code
               reason:(__unused NSString *)reason
             wasClean:(__unused BOOL)wasClean
@@ -244,9 +244,9 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   }
 
   // The corresponding android code has a lot of custom config options for
-  // timeouts, but it appears the iOS RCTSRWebSocket API doesn't have the same
-  // implemented options.
-  _webSocket = [[RCTSRWebSocket alloc] initWithURL:_url];
+  // timeouts, but our previous class, RCTSRWebSocket didn't have the same
+  // implemented options. Might be worth reinvestigating for SRWebSocket?
+  _webSocket = [[SRWebSocket alloc] initWithURL:_url];
   [_webSocket setDelegateDispatchQueue:_jsQueue];
   _webSocket.delegate = self;
   [_webSocket open];
@@ -290,7 +290,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
       if (error) {
         RCTLogWarn(@"Couldn't send event to packager: %@", error);
       } else {
-        [strongSelf->_webSocket send:messageText];
+        [strongSelf->_webSocket sendString:messageText error:nil];
       }
     }
   });

package/React/Modules/RCTEventEmitter.m

@@ -23,17 +23,6 @@
   return @"";
 }
 
-+ (void)initialize
-{
-  [super initialize];
-  if (self != [RCTEventEmitter class]) {
-    RCTAssert(
-        RCTClassOverridesInstanceMethod(self, @selector(supportedEvents)),
-        @"You must override the `supportedEvents` method of %@",
-        self);
-  }
-}
-
 - (instancetype)initWithDisabledObservation
 {
   self = [super init];
@@ -43,6 +32,9 @@
 
 - (NSArray<NSString *> *)supportedEvents
 {
+  NSString *message =
+      [NSString stringWithFormat:@"%@ must implement the supportedEvents method", NSStringFromClass(self.class)];
+  [self _log:message];
   return nil;
 }
 
@@ -147,4 +139,15 @@ RCT_EXPORT_METHOD(removeListeners : (double)count)
   }
 }
 
+#pragma mark - Test utilities
+
+// For testing purposes only.
+// This is supposed to be overridden by a subclass in the Tests
+// to verified that the error message is actually emitted.
+// This is the less intrusive way found to mock the RCTLogError function in unit tests.
+- (void)_log:(NSString *)message
+{
+  RCTLogError(@"%@", message);
+}
+
 @end

package/React/Profiler/RCTProfileTrampoline-x86_64.S

@@ -90,7 +90,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
   movq $0x10, %rdi
   callq SYMBOL_NAME_PIC(RCTProfileMalloc)
 
-  // store the initial value of calle saved registers %r13 and %r14
+  // store the initial value of caller saved registers %r13 and %r14
   movq %r13, 0x0(%rax)
   movq %r14, 0x8(%rax)
 

package/React/React-RCTFabric.podspec

@@ -21,13 +21,35 @@ folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
 folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
+header_search_paths = [
+  "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
+  "\"$(PODS_ROOT)/boost\"",
+  "\"$(PODS_ROOT)/DoubleConversion\"",
+  "\"$(PODS_ROOT)/RCT-Folly\"",
+  "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
+  "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
+  "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",
+
+]
+
+if ENV['USE_FRAMEWORKS']
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/textlayoutmanager/platform/ios\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/textinput/iostextinput\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-ImageManager/React_ImageManager.framework/Headers\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\""
+end
+
 Pod::Spec.new do |s|
   s.name                   = "React-RCTFabric"
   s.version                = version
   s.summary                = "RCTFabric for React Native."
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "Fabric/**/*.{c,h,m,mm,S,cpp}"
@@ -37,13 +59,18 @@ Pod::Spec.new do |s|
   s.header_dir             = "React"
   s.module_name            = "RCTFabric"
   s.framework              = "JavaScriptCore"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" }
-  s.xcconfig               = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-                               "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags  }
+  s.pod_target_xcconfig    = {
+    "HEADER_SEARCH_PATHS" => header_search_paths,
+    "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags,
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+  }.merge!(ENV['USE_FRAMEWORKS'] != nil ? {
+    "PUBLIC_HEADERS_FOLDER_PATH" => "$(CONTENTS_FOLDER_PATH)/Headers/React"
+  }: {})
 
   s.dependency "React-Core", version
   s.dependency "React-Fabric", version
   s.dependency "React-RCTImage", version
+  s.dependency "React-ImageManager"
   s.dependency "RCT-Folly/Fabric", folly_version
 
   s.test_spec 'Tests' do |test_spec|

package/React/Views/RCTComponentData.m

@@ -431,25 +431,13 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
 
     if ([type isEqualToString:@"RCTBubblingEventBlock"]) {
       [bubblingEvents addObject:RCTNormalizeInputEventName(name)];
-
-      // TODO(109509380): Remove this gating
-      if (!RCTViewConfigEventValidAttributesDisabled()) {
-        propTypes[name] = @"BOOL";
-      }
+      propTypes[name] = @"BOOL";
     } else if ([type isEqualToString:@"RCTCapturingEventBlock"]) {
       [capturingEvents addObject:RCTNormalizeInputEventName(name)];
-
-      // TODO(109509380): Remove this gating
-      if (!RCTViewConfigEventValidAttributesDisabled()) {
-        propTypes[name] = @"BOOL";
-      }
+      propTypes[name] = @"BOOL";
     } else if ([type isEqualToString:@"RCTDirectEventBlock"]) {
       [directEvents addObject:RCTNormalizeInputEventName(name)];
-
-      // TODO(109509380): Remove this gating
-      if (!RCTViewConfigEventValidAttributesDisabled()) {
-        propTypes[name] = @"BOOL";
-      }
+      propTypes[name] = @"BOOL";
     } else {
       propTypes[name] = type;
     }

package/React/Views/RCTConvert+Transform.m

@@ -138,7 +138,7 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
       transform = CATransform3DConcat(next, transform);
 
     } else {
-      RCTLogError(@"Unsupported transform type for a CATransform3D: %@.", property);
+      RCTLogInfo(@"Unsupported transform type for a CATransform3D: %@.", property);
     }
   }
   return transform;

package/React/Views/RCTFont.mm

@@ -332,7 +332,7 @@ typedef NSDictionary RCTFontVariantDescriptor;
   });
   RCTFontVariantDescriptor *value = mapping[json];
   if (RCT_DEBUG && !value && [json description].length > 0) {
-    RCTLogError(
+    RCTLogInfo(
         @"Invalid RCTFontVariantDescriptor '%@'. should be one of: %@",
         json,
         [[mapping allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]);
@@ -424,7 +424,7 @@ RCT_ARRAY_CONVERTER(RCTFontVariantDescriptor)
       isCondensed = isCondensedFont(font);
     } else {
       // Not a valid font or family
-      RCTLogError(@"Unrecognized font family '%@'", familyName);
+      RCTLogInfo(@"Unrecognized font family '%@'", familyName);
       if ([UIFont respondsToSelector:@selector(systemFontOfSize:weight:)]) {
         font = [UIFont systemFontOfSize:fontSize weight:fontWeight];
       } else if (fontWeight > UIFontWeightRegular) {

package/React/Views/RCTView.h

@@ -71,6 +71,10 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
 @property (nonatomic, assign) CGFloat borderBottomRightRadius;
 @property (nonatomic, assign) CGFloat borderBottomStartRadius;
 @property (nonatomic, assign) CGFloat borderBottomEndRadius;
+@property (nonatomic, assign) CGFloat borderEndEndRadius;
+@property (nonatomic, assign) CGFloat borderEndStartRadius;
+@property (nonatomic, assign) CGFloat borderStartEndRadius;
+@property (nonatomic, assign) CGFloat borderStartStartRadius;
 
 /**
  * Border colors (actually retained).
@@ -82,6 +86,9 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
 @property (nonatomic, strong) UIColor *borderStartColor;
 @property (nonatomic, strong) UIColor *borderEndColor;
 @property (nonatomic, strong) UIColor *borderColor;
+@property (nonatomic, strong) UIColor *borderBlockColor;
+@property (nonatomic, strong) UIColor *borderBlockEndColor;
+@property (nonatomic, strong) UIColor *borderBlockStartColor;
 
 /**
  * Border widths.
@@ -93,6 +100,10 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
 @property (nonatomic, assign) CGFloat borderStartWidth;
 @property (nonatomic, assign) CGFloat borderEndWidth;
 @property (nonatomic, assign) CGFloat borderWidth;
+// TODO: Implement logical border width logic
+@property (nonatomic, assign) CGFloat borderBlockWidth;
+@property (nonatomic, assign) CGFloat borderBlockEndWidth;
+@property (nonatomic, assign) CGFloat borderBlockStartWidth;
 
 /**
  * Border curve.

package/React/Views/RCTView.m

@@ -7,6 +7,7 @@
 
 #import "RCTView.h"
 
+#import <QuartzCore/QuartzCore.h>
 #import <React/RCTMockDef.h>
 
 #import "RCTAutoInsetsProtocol.h"
@@ -127,6 +128,10 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
     _borderBottomRightRadius = -1;
     _borderBottomStartRadius = -1;
     _borderBottomEndRadius = -1;
+    _borderEndEndRadius = -1;
+    _borderEndStartRadius = -1;
+    _borderStartEndRadius = -1;
+    _borderStartStartRadius = -1;
     _borderCurve = RCTBorderCurveCircular;
     _borderStyle = RCTBorderStyleSolid;
     _hitTestEdgeInsets = UIEdgeInsetsZero;
@@ -207,7 +212,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
     case RCTPointerEventsBoxNone:
       return hitSubview;
     default:
-      RCTLogError(@"Invalid pointer-events specified %lld on %@", (long long)_pointerEvents, self);
+      RCTLogInfo(@"Invalid pointer-events specified %lld on %@", (long long)_pointerEvents, self);
       return hitSubview ?: hitView;
   }
 }
@@ -447,10 +452,10 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
 
 - (NSString *)description
 {
-  NSString *superDescription = super.description;
-  NSRange semicolonRange = [superDescription rangeOfString:@";"];
-  NSString *replacement = [NSString stringWithFormat:@"; reactTag: %@;", self.reactTag];
-  return [superDescription stringByReplacingCharactersInRange:semicolonRange withString:replacement];
+  return [[super description] stringByAppendingFormat:@" reactTag: %@; frame = %@; layer = %@",
+                                                      self.reactTag,
+                                                      NSStringFromCGRect(self.frame),
+                                                      self.layer];
 }
 
 #pragma mark - Statics for dealing with layoutGuides
@@ -666,11 +671,16 @@ static CGFloat RCTDefaultIfNegativeTo(CGFloat defaultValue, CGFloat x)
   CGFloat bottomLeftRadius;
   CGFloat bottomRightRadius;
 
+  const CGFloat logicalTopStartRadius = RCTDefaultIfNegativeTo(_borderStartStartRadius, _borderTopStartRadius);
+  const CGFloat logicalTopEndRadius = RCTDefaultIfNegativeTo(_borderStartEndRadius, _borderTopEndRadius);
+  const CGFloat logicalBottomStartRadius = RCTDefaultIfNegativeTo(_borderEndStartRadius, _borderBottomStartRadius);
+  const CGFloat logicalBottomEndRadius = RCTDefaultIfNegativeTo(_borderEndEndRadius, _borderBottomEndRadius);
+
   if ([[RCTI18nUtil sharedInstance] doLeftAndRightSwapInRTL]) {
-    const CGFloat topStartRadius = RCTDefaultIfNegativeTo(_borderTopLeftRadius, _borderTopStartRadius);
-    const CGFloat topEndRadius = RCTDefaultIfNegativeTo(_borderTopRightRadius, _borderTopEndRadius);
-    const CGFloat bottomStartRadius = RCTDefaultIfNegativeTo(_borderBottomLeftRadius, _borderBottomStartRadius);
-    const CGFloat bottomEndRadius = RCTDefaultIfNegativeTo(_borderBottomRightRadius, _borderBottomEndRadius);
+    const CGFloat topStartRadius = RCTDefaultIfNegativeTo(_borderTopLeftRadius, logicalTopStartRadius);
+    const CGFloat topEndRadius = RCTDefaultIfNegativeTo(_borderTopRightRadius, logicalTopEndRadius);
+    const CGFloat bottomStartRadius = RCTDefaultIfNegativeTo(_borderBottomLeftRadius, logicalBottomStartRadius);
+    const CGFloat bottomEndRadius = RCTDefaultIfNegativeTo(_borderBottomRightRadius, logicalBottomEndRadius);
 
     const CGFloat directionAwareTopLeftRadius = isRTL ? topEndRadius : topStartRadius;
     const CGFloat directionAwareTopRightRadius = isRTL ? topStartRadius : topEndRadius;
@@ -682,10 +692,10 @@ static CGFloat RCTDefaultIfNegativeTo(CGFloat defaultValue, CGFloat x)
     bottomLeftRadius = RCTDefaultIfNegativeTo(radius, directionAwareBottomLeftRadius);
     bottomRightRadius = RCTDefaultIfNegativeTo(radius, directionAwareBottomRightRadius);
   } else {
-    const CGFloat directionAwareTopLeftRadius = isRTL ? _borderTopEndRadius : _borderTopStartRadius;
-    const CGFloat directionAwareTopRightRadius = isRTL ? _borderTopStartRadius : _borderTopEndRadius;
-    const CGFloat directionAwareBottomLeftRadius = isRTL ? _borderBottomEndRadius : _borderBottomStartRadius;
-    const CGFloat directionAwareBottomRightRadius = isRTL ? _borderBottomStartRadius : _borderBottomEndRadius;
+    const CGFloat directionAwareTopLeftRadius = isRTL ? logicalTopEndRadius : logicalTopStartRadius;
+    const CGFloat directionAwareTopRightRadius = isRTL ? logicalTopStartRadius : logicalTopEndRadius;
+    const CGFloat directionAwareBottomLeftRadius = isRTL ? logicalBottomEndRadius : logicalBottomStartRadius;
+    const CGFloat directionAwareBottomRightRadius = isRTL ? logicalBottomStartRadius : logicalBottomEndRadius;
 
     topLeftRadius =
         RCTDefaultIfNegativeTo(radius, RCTDefaultIfNegativeTo(_borderTopLeftRadius, directionAwareTopLeftRadius));
@@ -735,6 +745,17 @@ static CGFloat RCTDefaultIfNegativeTo(CGFloat defaultValue, CGFloat x)
   UIColor *borderTopColor = _borderTopColor;
   UIColor *borderBottomColor = _borderBottomColor;
 
+  if (_borderBlockColor) {
+    borderTopColor = _borderBlockColor;
+    borderBottomColor = _borderBlockColor;
+  }
+  if (_borderBlockEndColor) {
+    borderBottomColor = _borderBlockEndColor;
+  }
+  if (_borderBlockStartColor) {
+    borderTopColor = _borderBlockStartColor;
+  }
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
   if (@available(iOS 13.0, *)) {
     borderColor = [borderColor resolvedColorWithTraitCollection:self.traitCollection];
@@ -914,7 +935,7 @@ static void RCTUpdateShadowPathForView(RCTView *view)
   }
 
 setBorderColor() setBorderColor(Top) setBorderColor(Right) setBorderColor(Bottom) setBorderColor(Left)
-    setBorderColor(Start) setBorderColor(End)
+    setBorderColor(Start) setBorderColor(End) setBorderColor(Block) setBorderColor(BlockEnd) setBorderColor(BlockStart)
 
 #pragma mark - Border Width
 
@@ -945,7 +966,8 @@ setBorderColor() setBorderColor(Top) setBorderColor(Right) setBorderColor(Bottom
 
                 setBorderRadius() setBorderRadius(TopLeft) setBorderRadius(TopRight) setBorderRadius(TopStart)
                     setBorderRadius(TopEnd) setBorderRadius(BottomLeft) setBorderRadius(BottomRight)
-                        setBorderRadius(BottomStart) setBorderRadius(BottomEnd)
+                        setBorderRadius(BottomStart) setBorderRadius(BottomEnd) setBorderRadius(EndEnd)
+                            setBorderRadius(EndStart) setBorderRadius(StartEnd) setBorderRadius(StartStart)
 
 #pragma mark - Border Curve
 
@@ -959,7 +981,7 @@ setBorderColor() setBorderColor(Top) setBorderColor(Right) setBorderColor(Bottom
     [self.layer setNeedsDisplay];                       \
   }
 
-                            setBorderCurve()
+                                setBorderCurve()
 
 #pragma mark - Border Style
 
@@ -973,6 +995,6 @@ setBorderColor() setBorderColor(Top) setBorderColor(Right) setBorderColor(Bottom
     [self.layer setNeedsDisplay];                       \
   }
 
-                                setBorderStyle()
+                                    setBorderStyle()
 
-                                    @end
+                                        @end

package/React/Views/RCTViewManager.m

@@ -28,6 +28,7 @@ RCT_MULTI_ENUM_CONVERTER(
     (@{
       @"none" : @(UIAccessibilityTraitNone),
       @"button" : @(UIAccessibilityTraitButton),
+      @"dropdownlist" : @(UIAccessibilityTraitNone),
       @"togglebutton" : @(UIAccessibilityTraitButton),
       @"link" : @(UIAccessibilityTraitLink),
       @"header" : @(UIAccessibilityTraitHeader),
@@ -63,6 +64,14 @@ RCT_MULTI_ENUM_CONVERTER(
       @"tablist" : @(UIAccessibilityTraitNone),
       @"timer" : @(UIAccessibilityTraitNone),
       @"toolbar" : @(UIAccessibilityTraitNone),
+      @"pager" : @(UIAccessibilityTraitNone),
+      @"scrollview" : @(UIAccessibilityTraitNone),
+      @"horizontalscrollview" : @(UIAccessibilityTraitNone),
+      @"viewgroup" : @(UIAccessibilityTraitNone),
+      @"webview" : @(UIAccessibilityTraitNone),
+      @"drawerlayout" : @(UIAccessibilityTraitNone),
+      @"slidingdrawer" : @(UIAccessibilityTraitNone),
+      @"iconmenu" : @(UIAccessibilityTraitNone),
       @"list" : @(UIAccessibilityTraitNone),
       @"grid" : @(UIAccessibilityTraitNone),
     }),
@@ -257,7 +266,7 @@ RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RCTView)
       view.userInteractionEnabled = NO;
       break;
     default:
-      RCTLogError(@"UIView base class does not support pointerEvent value: %@", json);
+      RCTLogInfo(@"UIView base class does not support pointerEvent value: %@", json);
   }
 }
 RCT_CUSTOM_VIEW_PROPERTY(removeClippedSubviews, BOOL, RCTView)
@@ -349,6 +358,9 @@ RCT_VIEW_BORDER_PROPERTY(Bottom)
 RCT_VIEW_BORDER_PROPERTY(Left)
 RCT_VIEW_BORDER_PROPERTY(Start)
 RCT_VIEW_BORDER_PROPERTY(End)
+RCT_VIEW_BORDER_PROPERTY(Block)
+RCT_VIEW_BORDER_PROPERTY(BlockEnd)
+RCT_VIEW_BORDER_PROPERTY(BlockStart)
 
 #define RCT_VIEW_BORDER_RADIUS_PROPERTY(SIDE)                                                          \
   RCT_CUSTOM_VIEW_PROPERTY(border##SIDE##Radius, CGFloat, RCTView)                                     \
@@ -366,6 +378,10 @@ RCT_VIEW_BORDER_RADIUS_PROPERTY(BottomLeft)
 RCT_VIEW_BORDER_RADIUS_PROPERTY(BottomRight)
 RCT_VIEW_BORDER_RADIUS_PROPERTY(BottomStart)
 RCT_VIEW_BORDER_RADIUS_PROPERTY(BottomEnd)
+RCT_VIEW_BORDER_RADIUS_PROPERTY(EndEnd)
+RCT_VIEW_BORDER_RADIUS_PROPERTY(EndStart)
+RCT_VIEW_BORDER_RADIUS_PROPERTY(StartEnd)
+RCT_VIEW_BORDER_RADIUS_PROPERTY(StartStart)
 
 RCT_REMAP_VIEW_PROPERTY(display, reactDisplay, YGDisplay)
 RCT_REMAP_VIEW_PROPERTY(zIndex, reactZIndex, NSInteger)

package/React/Views/RefreshControl/RCTRefreshControl.h

@@ -10,7 +10,7 @@
 #import <React/RCTComponent.h>
 #import <React/RCTScrollableProtocol.h>
 
-@interface RCTRefreshControl : UIRefreshControl <RCTCustomRefreshContolProtocol>
+@interface RCTRefreshControl : UIRefreshControl <RCTCustomRefreshControlProtocol>
 
 @property (nonatomic, copy) NSString *title;
 @property (nonatomic, copy) RCTDirectEventBlock onRefresh;

package/React/Views/RefreshControl/RCTRefreshControl.m

@@ -117,6 +117,13 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
 - (void)_applyProgressViewOffset
 {
+  // Setting the UIRefreshControl's frame breaks integration with ContentInset from the superview
+  // if it is a UIScrollView. This integration happens when setting the UIScrollView's .refreshControl
+  // property. For this reason, setting the frame manually should be avoided, if not needed.
+  if (_progressViewOffset == 0.f) {
+    return;
+  }
+
   // progressViewOffset must be converted from the ScrollView parent's coordinate space to
   // the coordinate space of the RefreshControl. This ensures that the control respects any
   // offset in the view hierarchy, and that progressViewOffset is not inadvertently applied

package/React/Views/SafeAreaView/RCTSafeAreaShadowView.m

@@ -32,7 +32,7 @@
 
 /**
  * Removing support for setting padding from any outside code
- * to prevent interferring this with local data.
+ * to prevent interfering this with local data.
  */
 - (void)setPadding:(__unused YGValue)value
 {