Merge pull request lawnstarter#42 from fkrauthan/master

Fixed placeholder handling
Bigood · Jun 27, 2018 · 9d5c200 · 9d5c200
2 parents 5fdc8f9 + c148a4c
commit 9d5c200
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -34,17 +34,16 @@ export default class RNPickerSelect extends PureComponent {
         // update items if items prop changes
         const itemsChanged = !isEqual(prevState.items, nextProps.items);
         // update selectedItem if value prop is defined and differs from currently selected item
-        const newSelectedItem = getSelectedItem({ items: nextProps.items, value: nextProps.value });
+        const newItems = handlePlaceholder({ placeholder: nextProps.placeholder }).concat(nextProps.items);
+        const newSelectedItem = getSelectedItem({ items: newItems, value: nextProps.value });
         const selectedItemChanged =
             !isEqual(nextProps.value, undefined) &&
             !isEqual(prevState.selectedItem, newSelectedItem);
 
         if (itemsChanged || selectedItemChanged) {
             return {
                 items: itemsChanged
-                    ? handlePlaceholder({ placeholder: nextProps.placeholder }).concat(
-                          nextProps.items
-                      )
+                    ? newItems
                     : prevState.items,
                 selectedItem: selectedItemChanged ? newSelectedItem : prevState.selectedItem,
             };