From 09026e17283c4f69c623385ae5972ae5ec243c9e Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <50919443+bernhardoj@users.noreply.github.com>
Date: Sun, 19 May 2024 09:18:38 +0800
Subject: [PATCH] Fix: [Fabric] [iOS] Fix app crash when selecting an empty
 value (#567)

---
 ios/RNCPicker.mm              | 2 +-
 ios/RNCPickerComponentView.mm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/RNCPicker.mm b/ios/RNCPicker.mm
index 65b953afb5..2d7a0800d9 100644
--- 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
index 0b9a726b25..f8c3fb1a85 100644
--- 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);