Refactor RCTActivityIndicator

Saadnajmi · Sep 23, 2023 · aeaa593 · aeaa593
1 parent cec6410
commit aeaa593
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/packages/react-native/React/Base/RCTUIKit.h b/packages/react-native/React/Base/RCTUIKit.h
@@ -227,8 +227,8 @@ enum : NSInteger
 
 // RCTActivityIndicatorView.h
 typedef NS_ENUM(NSInteger, UIActivityIndicatorViewStyle) {
-  UIActivityIndicatorViewStyleWhiteLarge,
-  UIActivityIndicatorViewStyleWhite
+  UIActivityIndicatorViewStyleLarge,
+  UIActivityIndicatorViewStyleMedium,
 };
 
 

diff --git a/packages/react-native/React/Base/macOS/RCTUIKit.m b/packages/react-native/React/Base/macOS/RCTUIKit.m
@@ -698,11 +698,15 @@ - (void)setActivityIndicatorViewStyle:(UIActivityIndicatorViewStyle)activityIndi
   _activityIndicatorViewStyle = activityIndicatorViewStyle;
 
   switch (activityIndicatorViewStyle) {
-    case UIActivityIndicatorViewStyleWhiteLarge:
-      self.controlSize = NSControlSizeRegular;
+    case UIActivityIndicatorViewStyleLarge:
+	  if (@available(macOS 11.0, *)) {
+		self.controlSize = NSControlSizeLarge;
+	  } else {
+		self.controlSize = NSControlSizeRegular;
+	  }
       break;
-    case UIActivityIndicatorViewStyleWhite:
-      self.controlSize = NSControlSizeSmall;
+    case UIActivityIndicatorViewStyleMedium:
+      self.controlSize = NSControlSizeRegular;
       break;
     default:
       break;

diff --git a/packages/react-native/React/Views/RCTActivityIndicatorView.m b/packages/react-native/React/Views/RCTActivityIndicatorView.m
@@ -59,10 +59,10 @@ - (void)setActivityIndicatorViewStyle:(UIActivityIndicatorViewStyle)activityIndi
   _activityIndicatorViewStyle = activityIndicatorViewStyle;
 
   switch (activityIndicatorViewStyle) {
-    case UIActivityIndicatorViewStyleWhiteLarge:
+    case UIActivityIndicatorViewStyleLarge:
       self.controlSize = NSControlSizeRegular;
       break;
-    case UIActivityIndicatorViewStyleWhite:
+    case UIActivityIndicatorViewStyleMedium:
       self.controlSize = NSControlSizeSmall;
       break;
     default: