Stop pushing null to the arr in search

Author: adelreda97

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-select-dropdown",
-  "version": "3.3.4",
+  "version": "3.4.0",
   "description": "react-native-select-dropdown is a highly customized dropdown | select | picker | menu for react native that works for andriod and iOS platforms.",
   "main": "index.js",
   "typings": "index.d.ts",

src/SelectDropdown.js

@@ -10,6 +10,7 @@ import DropdownWindow from './components/DropdownWindow';
 import {useSelectDropdown} from './hooks/useSelectDropdown';
 import {useLayoutDropdown} from './hooks/useLayoutDropdown';
 import {useRefs} from './hooks/useRefs';
+import {findIndexInArr} from './helpers/findIndexInArr';
 
 const SelectDropdown = (
   {
@@ -116,9 +117,10 @@ const SelectDropdown = (
     }
   };
   const onSelectItem = (item, index) => {
+    const indexInOriginalArr = findIndexInArr(item, data);
     closeDropdown();
-    onSelect && onSelect(item, index);
-    selectItem(index);
+    onSelect && onSelect(item, indexInOriginalArr);
+    selectItem(indexInOriginalArr);
   };
   /* ******************** Render Methods ******************** */
   const renderSearchView = () => {
@@ -143,7 +145,8 @@ const SelectDropdown = (
     );
   };
   const renderFlatlistItem = ({item, index}) => {
-    const isSelected = index == selectedIndex;
+    const selectedItemIndex = findIndexInArr(selectedItem, dataArr);
+    const isSelected = index == selectedItemIndex;
     return (
       isExist(item) && (
         <TouchableOpacity

src/helpers/deepSearchInArr.js

@@ -24,8 +24,6 @@ export const deepSearchInArr = (query, arr) => {
   for (let i = 0; i <= arr.length - 1; i++) {
     if (contains(arr[i], query)) {
       array.push(arr[i]);
-    } else {
-      array.push(null);
     }
     if (i == arr.length - 1) {
       return array;

src/hooks/useSelectDropdown.js

@@ -13,7 +13,7 @@ export const useSelectDropdown = (data, defaultValueByIndex, defaultValue, disab
     if (!data || data.length == 0) {
       reset();
     }
-  }, [data]);
+  }, [JSON.stringify(data)]);
 
   // default value by index added or changed
   useEffect(() => {
@@ -23,7 +23,7 @@ export const useSelectDropdown = (data, defaultValueByIndex, defaultValue, disab
         selectItem(defaultValueByIndex);
       }
     }
-  }, [defaultValueByIndex]);
+  }, [JSON.stringify(defaultValueByIndex)]);
   // default value added or changed
   useEffect(() => {
     // defaultValue may be equals zero
@@ -32,14 +32,14 @@ export const useSelectDropdown = (data, defaultValueByIndex, defaultValue, disab
         selectItem(findIndexInArr(defaultValue, data));
       }
     }
-  }, [defaultValue]);
+  }, [JSON.stringify(defaultValue)]);
 
   const dataArr = useMemo(() => {
     if (disabledInternalSearch) {
       return data;
     }
     return searchTxt ? deepSearchInArr(searchTxt, data) : data;
-  }, [data, searchTxt]);
+  }, [JSON.stringify(data), searchTxt]);
 
   const selectItem = index => {
     setSelectedItem(data[index]);