react-native-platform-components 0.8.9 → 0.9.0

package/ios/PCSegmentedControl.mm

@@ -5,6 +5,7 @@
 #import <React/RCTComponentViewFactory.h>
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTFont.h>
 
 #import <react/renderer/components/PlatformComponentsViewSpec/ComponentDescriptors.h>
 #import <react/renderer/components/PlatformComponentsViewSpec/EventEmitters.h>
@@ -32,10 +33,46 @@ static inline bool SegmentsEqual(
     if (a[i].label != b[i].label) return false;
     if (a[i].value != b[i].value) return false;
     if (a[i].disabled != b[i].disabled) return false;
-    if (a[i].icon != b[i].icon) return false;
+    if (a[i].iconType != b[i].iconType) return false;
+    if (a[i].iconName != b[i].iconName) return false;
+    if (a[i].iconUri != b[i].iconUri) return false;
+    if (a[i].iconScale != b[i].iconScale) return false;
+    if (a[i].iconTinted != b[i].iconTinted) return false;
+    if (a[i].badge != b[i].badge) return false;
+    if (a[i].accessibilityLabel != b[i].accessibilityLabel) return false;
   }
   return true;
 }
+
+static inline NSString *NSStringFromStd(const std::string &s, NSString *fallback) {
+  return s.empty() ? fallback : [NSString stringWithUTF8String:s.c_str()];
+}
+
+static inline bool LabelStyleEqual(
+    const facebook::react::PCSegmentedControlLabelStyleStruct &a,
+    const facebook::react::PCSegmentedControlLabelStyleStruct &b) {
+  return a.fontFamily == b.fontFamily && a.fontSize == b.fontSize &&
+         a.fontWeight == b.fontWeight && a.fontStyle == b.fontStyle;
+}
+
+/// Builds the label font from RN-style font props, or nil when every field is
+/// unset so the control keeps the system font.
+static UIFont *FontFromLabelStyle(
+    const facebook::react::PCSegmentedControlLabelStyleStruct &style) {
+  if (style.fontFamily.empty() && style.fontSize <= 0 &&
+      style.fontWeight.empty() && style.fontStyle.empty()) {
+    return nil;
+  }
+  // UISegmentedControl titles default to 13pt; start there so a lone
+  // fontWeight or fontStyle doesn't change the size.
+  return [RCTFont updateFont:[UIFont systemFontOfSize:13]
+                  withFamily:NSStringFromStd(style.fontFamily, nil)
+                        size:style.fontSize > 0 ? @(style.fontSize) : nil
+                      weight:NSStringFromStd(style.fontWeight, nil)
+                       style:NSStringFromStd(style.fontStyle, nil)
+                     variant:nil
+             scaleMultiplier:1.0];
+}
 } // namespace
 
 @interface PCSegmentedControl ()
@@ -77,6 +114,12 @@ static inline bool SegmentsEqual(
 
       eventEmitter->onSelect(payload);
     };
+
+    _view.onNeedsRemeasure = ^{
+      __typeof(self) strongSelf = weakSelf;
+      if (!strongSelf) return;
+      [strongSelf updateMeasurements];
+    };
   }
   return self;
 }
@@ -88,32 +131,32 @@ static inline bool SegmentsEqual(
   const auto prevProps =
       std::static_pointer_cast<const PCSegmentedControlProps>(oldProps);
 
-  // segments: [{label, value, disabled, icon}]
+  // segments: [{label, value, disabled, iconType, iconName, iconUri, iconScale,
+  //             iconTinted, accessibilityLabel}]
   if (!prevProps || !SegmentsEqual(newProps.segments, prevProps->segments)) {
     NSMutableArray *arr = [NSMutableArray new];
     for (const auto &seg : newProps.segments) {
-      NSString *label = seg.label.empty()
-                            ? @""
-                            : [NSString stringWithUTF8String:seg.label.c_str()];
-      NSString *value = seg.value.empty()
-                            ? @""
-                            : [NSString stringWithUTF8String:seg.value.c_str()];
-      NSString *disabled = seg.disabled.empty()
-                               ? @"enabled"
-                               : [NSString stringWithUTF8String:seg.disabled.c_str()];
-      NSString *icon = seg.icon.empty()
-                           ? @""
-                           : [NSString stringWithUTF8String:seg.icon.c_str()];
       [arr addObject:@{
-        @"label": label,
-        @"value": value,
-        @"disabled": disabled,
-        @"icon": icon
+        @"label": NSStringFromStd(seg.label, @""),
+        @"value": NSStringFromStd(seg.value, @""),
+        @"disabled": NSStringFromStd(seg.disabled, @"enabled"),
+        @"iconType": NSStringFromStd(seg.iconType, @""),
+        @"iconName": NSStringFromStd(seg.iconName, @""),
+        @"iconUri": NSStringFromStd(seg.iconUri, @""),
+        @"iconScale": @(seg.iconScale),
+        @"iconTinted": NSStringFromStd(seg.iconTinted, @"true"),
+        @"badge": NSStringFromStd(seg.badge, @""),
+        @"accessibilityLabel": NSStringFromStd(seg.accessibilityLabel, @""),
       }];
     }
     _view.segments = arr;
   }
 
+  // labelVisibility: "auto" | "labeled" | "unlabeled"
+  if (!prevProps || newProps.labelVisibility != prevProps->labelVisibility) {
+    _view.labelVisibility = NSStringFromStd(newProps.labelVisibility, @"auto");
+  }
+
   // selectedValue (default "")
   if (!prevProps || newProps.selectedValue != prevProps->selectedValue) {
     if (!newProps.selectedValue.empty()) {
@@ -147,13 +190,30 @@ static inline bool SegmentsEqual(
     _view.apportionsSegmentWidthsByContent = (newIos.apportionsSegmentWidthsByContent == "true");
   }
 
-  if (!prevProps || newIos.selectedSegmentTintColor != oldIos.selectedSegmentTintColor) {
-    if (!newIos.selectedSegmentTintColor.empty()) {
-      _view.selectedSegmentTintColor =
-          [NSString stringWithUTF8String:newIos.selectedSegmentTintColor.c_str()];
-    } else {
-      _view.selectedSegmentTintColor = nil;
-    }
+  // Colors arrive as SharedColor (already processed by React Native)
+  if (!prevProps || newProps.selectedSegmentColor != prevProps->selectedSegmentColor) {
+    _view.selectedSegmentColor = RCTUIColorFromSharedColor(newProps.selectedSegmentColor);
+  }
+
+  if (!prevProps || newProps.activeTintColor != prevProps->activeTintColor) {
+    _view.activeTintColor = RCTUIColorFromSharedColor(newProps.activeTintColor);
+  }
+
+  if (!prevProps || newProps.inactiveTintColor != prevProps->inactiveTintColor) {
+    _view.inactiveTintColor = RCTUIColorFromSharedColor(newProps.inactiveTintColor);
+  }
+
+  // labelStyle: {fontFamily, fontSize, fontWeight, fontStyle}
+  if (!prevProps || !LabelStyleEqual(newProps.labelStyle, prevProps->labelStyle)) {
+    _view.labelFont = FontFromLabelStyle(newProps.labelStyle);
+  }
+
+  if (!prevProps || newProps.badgeBackgroundColor != prevProps->badgeBackgroundColor) {
+    _view.badgeBackgroundColor = RCTUIColorFromSharedColor(newProps.badgeBackgroundColor);
+  }
+
+  if (!prevProps || newProps.badgeTextColor != prevProps->badgeTextColor) {
+    _view.badgeTextColor = RCTUIColorFromSharedColor(newProps.badgeTextColor);
   }
 
   [super updateProps:props oldProps:oldProps];