react-native-google-places-autocomplete 2.6.1 → 2.6.4

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint-staged

package/GooglePlacesAutocomplete.js

@@ -166,6 +166,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
   const [listViewDisplayed, setListViewDisplayed] = useState(
     listViewDisplayedProp === 'auto' ? false : listViewDisplayedProp,
   );
+  const [listWasDismissed, setListWasDismissed] = useState(false);
   const [url, setUrl] = useState('');
   const [listLoaderDisplayed, setListLoaderDisplayed] = useState(false);
   const [sessionToken, setSessionToken] = useState(uuid.v4());
@@ -395,6 +396,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
                 listViewDisplayedProp === 'auto' &&
                 newDataSource.length > 0
               ) {
+                setListWasDismissed(false);
                 setListViewDisplayed(true);
               }
             }
@@ -499,6 +501,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
             setDataSource(newDataSource);
             // Auto-show list when results arrive if in 'auto' mode
             if (listViewDisplayedProp === 'auto' && newDataSource.length > 0) {
+              setListWasDismissed(false);
               setListViewDisplayed(true);
             }
           }
@@ -512,6 +515,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
             setDataSource(newDataSource);
             // Auto-show list when results arrive if in 'auto' mode
             if (listViewDisplayedProp === 'auto' && newDataSource.length > 0) {
+              setListWasDismissed(false);
               setListViewDisplayed(true);
             }
           }
@@ -663,6 +667,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
         return;
       }
 
+      hideListView(true);
       Keyboard.dismiss();
 
       _abortRequests();
@@ -750,6 +755,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
 
       request.send();
     } else if (rowData.isCurrentLocation === true) {
+      hideListView(true);
       // display loader
       _enableRowLoader(rowData);
 
@@ -758,6 +764,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
       delete rowData.isLoading;
       getCurrentLocation();
     } else {
+      hideListView(true);
       setStateText(_renderDescription(rowData));
 
       _onBlur();
@@ -770,6 +777,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
   };
 
   const _onChangeText = (text) => {
+    setListWasDismissed(false);
     setStateText(text);
     debounceData(text);
   };
@@ -784,6 +792,16 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
     }
   };
 
+  const hideListView = useCallback(
+    (force = false) => {
+      if (!keepResultsAfterBlur || force) {
+        setListWasDismissed(true);
+        setListViewDisplayed(false);
+      }
+    },
+    [keepResultsAfterBlur],
+  );
+
   const isNewFocusInAutocompleteResultList = ({
     relatedTarget,
     currentTarget,
@@ -803,13 +821,12 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
   const _onBlur = (e) => {
     if (e && isNewFocusInAutocompleteResultList(e)) return;
 
-    if (!keepResultsAfterBlur) {
-      setListViewDisplayed(false);
-    }
+    hideListView();
     inputRef?.current?.blur();
   };
 
   const _onFocus = () => {
+    setListWasDismissed(false);
     setListViewDisplayed(true);
   };
 
@@ -1002,7 +1019,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
     const shouldShowList =
       supportedPlatform() &&
       dataSource.length > 0 &&
-      (listViewDisplayed === true || isAutoMode);
+      (listViewDisplayed === true || (isAutoMode && !listWasDismissed));
 
     if (shouldShowList) {
       return (
@@ -1010,6 +1027,7 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
           nativeID='result-list-id'
           scrollEnabled={!disableScroll}
           nestedScrollEnabled={true}
+          keyboardShouldPersistTaps={keyboardShouldPersistTaps}
           style={[
             suppressDefaultStyles ? {} : defaultStyles.listView,
             styles?.listView,
@@ -1095,11 +1113,17 @@ export const GooglePlacesAutocomplete = forwardRef((props, ref) => {
     if (
       listViewDisplayedProp === 'auto' &&
       dataSource.length > 0 &&
-      !listViewDisplayed
+      !listViewDisplayed &&
+      !listWasDismissed
     ) {
       setListViewDisplayed(true);
     }
-  }, [dataSource.length, listViewDisplayedProp, listViewDisplayed]);
+  }, [
+    dataSource.length,
+    listViewDisplayedProp,
+    listViewDisplayed,
+    listWasDismissed,
+  ]);
 
   // ==========================================================================
   // IMPERATIVE HANDLE

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "react-native-google-places-autocomplete",
-  "version": "2.6.1",
+  "version": "2.6.4",
   "description": "Customizable Google Places autocomplete component for iOS and Android React-Native apps",
   "main": "GooglePlacesAutocomplete.js",
   "types": "GooglePlacesAutocomplete.d.ts",
   "scripts": {
     "lint": "eslint . && prettier --write .",
     "release": "npx release-it",
-    "prettier": "prettier --write ."
+    "prettier": "prettier --write .",
+    "prepare": "husky install"
   },
   "author": "Farid from Safi",
   "license": "MIT",
@@ -30,14 +31,14 @@
   "homepage": "https://github.com/FaridSafi/react-native-google-places-autocomplete#readme",
   "dependencies": {
     "lodash.debounce": "^4.0.8",
-    "qs": "~6.9.1",
+    "qs": "^6.14.1",
     "react-native-uuid": "^2.0.3"
   },
   "devDependencies": {
     "@react-native-community/eslint-config": "2.0.0",
     "eslint": "7.10.0",
     "eslint-plugin-prettier": "^3.1.2",
-    "husky": "4.3.0",
+    "husky": "^8.0.3",
     "lint-staged": "10.4.0",
     "prettier": "2.1.2",
     "typescript": "^3.8.3"
@@ -45,12 +46,13 @@
   "peerDependencies": {
     "react-native": ">= 0.59"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "lint-staged": {
-    "*/**": "yarn lint"
+    "*.{js,jsx,ts,tsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{json,md,yml,yaml}": [
+      "prettier --write"
+    ]
   }
 }