Fix: [Fabric] [iOS] Fix app crash when selecting an empty value (#567)

react-native-picker · May 19, 2024 · 09026e1 · 09026e1
1 parent 7b7a95f
commit 09026e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ios/RNCPicker.mm b/ios/RNCPicker.mm
@@ -157,7 +157,7 @@ - (void)pickerView:(__unused UIPickerView *)pickerView
           std::dynamic_pointer_cast<const facebook::react::RNCPickerEventEmitter>(eventEmitter)
               ->onChange(facebook::react::RNCPickerEventEmitter::OnChange{
                   .newIndex = (int)row,
-                  .newValue =  RCTStringFromNSString(RCTNullIfNil(_items[row][@"value"])),
+                  .newValue =  RCTStringFromNSString(_items[row][@"value"]),
               });
         }
 }

diff --git a/ios/RNCPickerComponentView.mm b/ios/RNCPickerComponentView.mm
@@ -48,7 +48,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     for (RNCPickerItemsStruct item : newProps.items)
     {
         NSMutableDictionary *dictItem = [NSMutableDictionary new];
-        dictItem[@"value"] = RCTNSStringFromStringNilIfEmpty(item.value);
+        dictItem[@"value"] = RCTNSStringFromString(item.value);
         dictItem[@"label"] = RCTNSStringFromStringNilIfEmpty(item.label);
         dictItem[@"textColor"] = RCTUIColorFromSharedColor(item.textColor);
         dictItem[@"testID"] = RCTNSStringFromStringNilIfEmpty(item.testID);