react-native-platform-components 1.4.0 → 1.6.0

package/ios/PCTextField.mm

@@ -31,15 +31,33 @@ static inline NSString *NSStringFromStd(const std::string &s, NSString *fallback
 }
 
 static inline bool IconEqual(const PCTextFieldLeadingIconStruct &a, const PCTextFieldLeadingIconStruct &b) {
-  return a.iconType == b.iconType && a.iconName == b.iconName && a.iconUri == b.iconUri &&
+  return a.iconType == b.iconType && a.iconName == b.iconName && a.iconRequest == b.iconRequest && a.iconUri == b.iconUri &&
          a.iconScale == b.iconScale && a.iconTinted == b.iconTinted;
 }
 
 static inline bool IconEqual(const PCTextFieldTrailingIconStruct &a, const PCTextFieldTrailingIconStruct &b) {
-  return a.iconType == b.iconType && a.iconName == b.iconName && a.iconUri == b.iconUri &&
+  return a.iconType == b.iconType && a.iconName == b.iconName && a.iconRequest == b.iconRequest && a.iconUri == b.iconUri &&
          a.iconScale == b.iconScale && a.iconTinted == b.iconTinted;
 }
 
+static inline bool ToolbarItemsEqual(
+    const std::vector<PCTextFieldKeyboardToolbarItemsStruct> &a,
+    const std::vector<PCTextFieldKeyboardToolbarItemsStruct> &b) {
+  if (a.size() != b.size()) return false;
+  for (size_t i = 0; i < a.size(); i++) {
+    const auto &x = a[i];
+    const auto &y = b[i];
+    if (x.kind != y.kind || x.itemId != y.itemId || x.title != y.title ||
+        x.systemItem != y.systemItem || x.iconType != y.iconType || x.iconName != y.iconName ||
+        x.iconRequest != y.iconRequest || x.iconUri != y.iconUri || x.iconScale != y.iconScale || x.iconTinted != y.iconTinted ||
+        x.prominent != y.prominent || x.accessibilityLabel != y.accessibilityLabel ||
+        x.testID != y.testID) {
+      return false;
+    }
+  }
+  return true;
+}
+
 static inline bool TextStyleEqual(
     const PCTextFieldTextStyleStruct &a,
     const PCTextFieldTextStyleStruct &b) {
@@ -48,13 +66,17 @@ static inline bool TextStyleEqual(
 }
 
 /// Builds the input font from RN-style font props, or nil when every field is
-/// unset so the field keeps the body text style.
+/// unset so the field keeps the body text style. The font is built at the
+/// default text size; the view scales it with Dynamic Type.
 static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
   if (style.fontFamily.empty() && style.fontSize <= 0 &&
       style.fontWeight.empty() && style.fontStyle.empty()) {
     return nil;
   }
-  return [RCTFont updateFont:[UIFont preferredFontForTextStyle:UIFontTextStyleBody]
+  UITraitCollection *defaultSize =
+      [UITraitCollection traitCollectionWithPreferredContentSizeCategory:UIContentSizeCategoryLarge];
+  return [RCTFont updateFont:[UIFont preferredFontForTextStyle:UIFontTextStyleBody
+                                 compatibleWithTraitCollection:defaultSize]
                   withFamily:NSStringFromStd(style.fontFamily, nil)
                         size:style.fontSize > 0 ? @(style.fontSize) : nil
                       weight:NSStringFromStd(style.fontWeight, nil)
@@ -87,6 +109,12 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
+    // Fabric views seed _props with their own defaults: RCTViewComponentView
+    // asserts on it in debug builds of React Native core, and the first
+    // updateProps would otherwise read the base ViewProps as PCTextFieldProps.
+    static const auto defaultProps = std::make_shared<const PCTextFieldProps>();
+    _props = defaultProps;
+
     _view = [PCTextFieldView new];
     self.contentView = _view;
 
@@ -133,6 +161,28 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
       eventEmitter->onFieldSubmit({.text = text.UTF8String});
     };
 
+    _view.onSelectionChange = ^(NSInteger start, NSInteger end) {
+      __typeof(self) strongSelf = weakSelf;
+      if (!strongSelf) return;
+
+      auto eventEmitter =
+          std::static_pointer_cast<const PCTextFieldEventEmitter>(strongSelf->_eventEmitter);
+      if (!eventEmitter) return;
+
+      eventEmitter->onFieldSelectionChange({.start = (int)start, .end = (int)end});
+    };
+
+    _view.onKeyboardToolbarPress = ^(NSString *itemId) {
+      __typeof(self) strongSelf = weakSelf;
+      if (!strongSelf) return;
+
+      auto eventEmitter =
+          std::static_pointer_cast<const PCTextFieldEventEmitter>(strongSelf->_eventEmitter);
+      if (!eventEmitter) return;
+
+      eventEmitter->onKeyboardToolbarPress({.itemId = itemId.UTF8String});
+    };
+
     _view.onTrailingIconPress = ^{
       __typeof(self) strongSelf = weakSelf;
       if (!strongSelf) return;
@@ -144,6 +194,17 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
       eventEmitter->onTrailingIconPress({});
     };
 
+    _view.onPress = ^{
+      __typeof(self) strongSelf = weakSelf;
+      if (!strongSelf) return;
+
+      auto eventEmitter =
+          std::static_pointer_cast<const PCTextFieldEventEmitter>(strongSelf->_eventEmitter);
+      if (!eventEmitter) return;
+
+      eventEmitter->onFieldPress({});
+    };
+
     _view.onNeedsRemeasure = ^{
       __typeof(self) strongSelf = weakSelf;
       if (!strongSelf) return;
@@ -196,6 +257,7 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
     const auto &icon = newProps.leadingIcon;
     [_view setLeadingIconWithType:NSStringFromStd(icon.iconType, @"")
                              name:NSStringFromStd(icon.iconName, @"")
+                              request:NSStringFromStd(icon.iconRequest, @"")
                               uri:NSStringFromStd(icon.iconUri, @"")
                             scale:icon.iconScale
                            tinted:(icon.iconTinted != "false")];
@@ -205,6 +267,7 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
     const auto &icon = newProps.trailingIcon;
     [_view setTrailingIconWithType:NSStringFromStd(icon.iconType, @"")
                               name:NSStringFromStd(icon.iconName, @"")
+                               request:NSStringFromStd(icon.iconRequest, @"")
                                uri:NSStringFromStd(icon.iconUri, @"")
                              scale:icon.iconScale
                             tinted:(icon.iconTinted != "false")];
@@ -250,6 +313,33 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
     _view.multiline = newProps.lines == "multiline";
   }
 
+  if (!prevProps || newProps.submitBehavior != prevProps->submitBehavior) {
+    _view.submitBehavior = NSStringFromStd(newProps.submitBehavior, @"");
+  }
+
+  // keyboardToolbarItems: {kind, itemId, title, systemItem, icon fields, prominent, ...}
+  if (!prevProps || !ToolbarItemsEqual(newProps.keyboardToolbarItems, prevProps->keyboardToolbarItems)) {
+    NSMutableArray *items = [NSMutableArray new];
+    for (const auto &item : newProps.keyboardToolbarItems) {
+      [items addObject:@{
+        @"kind" : NSStringFromStd(item.kind, @"button"),
+        @"itemId" : NSStringFromStd(item.itemId, @""),
+        @"title" : NSStringFromStd(item.title, @""),
+        @"systemItem" : NSStringFromStd(item.systemItem, @""),
+        @"iconType" : NSStringFromStd(item.iconType, @""),
+        @"iconName" : NSStringFromStd(item.iconName, @""),
+        @"iconRequest" : NSStringFromStd(item.iconRequest, @""),
+        @"iconUri" : NSStringFromStd(item.iconUri, @""),
+        @"iconScale" : @(item.iconScale),
+        @"iconTinted" : NSStringFromStd(item.iconTinted, @"true"),
+        @"prominent" : NSStringFromStd(item.prominent, @"false"),
+        @"accessibilityLabel" : NSStringFromStd(item.accessibilityLabel, @""),
+        @"testID" : NSStringFromStd(item.testID, @""),
+      }];
+    }
+    _view.keyboardToolbarItems = items;
+  }
+
   if (!prevProps || newProps.interactivity != prevProps->interactivity) {
     _view.interactivity = NSStringFromStd(newProps.interactivity, @"enabled");
   }
@@ -275,6 +365,55 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
     _view.spokenLabel = NSStringFromStd(newProps.spokenLabel, @"");
   }
 
+  if (!prevProps || newProps.leadingIconTestID != prevProps->leadingIconTestID) {
+    _view.leadingIconTestID = NSStringFromStd(newProps.leadingIconTestID, @"");
+  }
+  if (!prevProps || newProps.leadingIconSpokenLabel != prevProps->leadingIconSpokenLabel) {
+    _view.leadingIconSpokenLabel = NSStringFromStd(newProps.leadingIconSpokenLabel, @"");
+  }
+  if (!prevProps || newProps.trailingIconTestID != prevProps->trailingIconTestID) {
+    _view.trailingIconTestID = NSStringFromStd(newProps.trailingIconTestID, @"");
+  }
+  if (!prevProps || newProps.trailingIconSpokenLabel != prevProps->trailingIconSpokenLabel) {
+    _view.trailingIconSpokenLabel = NSStringFromStd(newProps.trailingIconSpokenLabel, @"");
+  }
+
+  // Colors arrive as SharedColor (already processed by React Native)
+  if (!prevProps || newProps.activeColor != prevProps->activeColor) {
+    _view.activeColor = RCTUIColorFromSharedColor(newProps.activeColor);
+  }
+  if (!prevProps || newProps.outlineColor != prevProps->outlineColor) {
+    _view.outlineColor = RCTUIColorFromSharedColor(newProps.outlineColor);
+  }
+  if (!prevProps || newProps.errorColor != prevProps->errorColor) {
+    _view.errorColor = RCTUIColorFromSharedColor(newProps.errorColor);
+  }
+  if (!prevProps || newProps.containerColor != prevProps->containerColor) {
+    _view.containerColor = RCTUIColorFromSharedColor(newProps.containerColor);
+  }
+  if (!prevProps || newProps.textColor != prevProps->textColor) {
+    _view.textColor = RCTUIColorFromSharedColor(newProps.textColor);
+  }
+  if (!prevProps || newProps.placeholderTextColor != prevProps->placeholderTextColor) {
+    _view.placeholderTextColor = RCTUIColorFromSharedColor(newProps.placeholderTextColor);
+  }
+
+  if (!prevProps || newProps.maxFontSizeMultiplier != prevProps->maxFontSizeMultiplier) {
+    _view.maxFontSizeMultiplier = newProps.maxFontSizeMultiplier;
+  }
+  if (!prevProps || newProps.textAlign != prevProps->textAlign) {
+    _view.textAlign = NSStringFromStd(newProps.textAlign, @"");
+  }
+  if (!prevProps || newProps.minLines != prevProps->minLines) {
+    _view.minLines = newProps.minLines;
+  }
+  if (!prevProps || newProps.maxLines != prevProps->maxLines) {
+    _view.maxLines = newProps.maxLines;
+  }
+  if (!prevProps || newProps.pressMode != prevProps->pressMode) {
+    _view.pressable = newProps.pressMode == "button";
+  }
+
   // ios: the text traits
   const auto &newIOS = newProps.ios;
   const auto &oldIOS = prevProps ? prevProps->ios : PCTextFieldIosStruct{};
@@ -305,6 +444,9 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
   if (!prevProps || newIOS.labelWidth != oldIOS.labelWidth) {
     _view.labelWidth = newIOS.labelWidth;
   }
+  if (!prevProps || newIOS.passwordRules != oldIOS.passwordRules) {
+    _view.passwordRules = NSStringFromStd(newIOS.passwordRules, @"");
+  }
 
   // autoFocus last, once the field is configured
   if (!prevProps || newProps.autoFocus != prevProps->autoFocus) {
@@ -313,8 +455,17 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
 
   // android: Android only
 
+  const bool testIdChanged = !prevProps || newProps.testId != prevProps->testId;
+
   [super updateProps:props oldProps:oldProps];
 
+  // testID belongs on the inner input: Detox types into and clears a
+  // UITextField / UITextView, and two views with one id would be ambiguous
+  if (testIdChanged) {
+    _view.inputTestID = NSStringFromStd(newProps.testId, @"");
+    self.accessibilityIdentifier = nil;
+  }
+
   // Update measurements when props change that affect layout
   [self updateMeasurements];
 }
@@ -346,6 +497,10 @@ static UIFont *FontFromTextStyle(const PCTextFieldTextStyleStruct &style) {
   [_view setText:text ?: @"" eventCount:eventCount];
 }
 
+- (void)setSelection:(NSInteger)eventCount start:(NSInteger)start end:(NSInteger)end {
+  [_view setSelectionWithStart:start end:end eventCount:eventCount];
+}
+
 #pragma mark - State (Measuring)
 
 - (void)updateState:(const State::Shared &)state