ordering-components-external 13.2.17 → 13.2.18

package/_modules/components/GoogleAutocompleteInput/index.js

@@ -82,7 +82,7 @@ var AutocompleteInput = function AutocompleteInput(props) {
               if (addressType === 'locality') {
                 addressObj.locality = component.long_name;
               }
-              if (((_component$types = component.types) === null || _component$types === void 0 ? void 0 : _component$types.includes('sublocality')) === 'sublocality') {
+              if ((_component$types = component.types) !== null && _component$types !== void 0 && _component$types.includes('sublocality')) {
                 addressObj.sublocality = component.long_name;
               }
               if (addressType === 'country') {

package/_modules/components/GoogleMaps/index.js

@@ -189,18 +189,43 @@ var GoogleMaps = exports.GoogleMaps = function GoogleMaps(props) {
         latLng: pos
       }, function (results) {
         var _results$;
-        var zipcode = null;
         if (results && results.length > 0 && results !== null && results !== void 0 && (_results$ = results[0]) !== null && _results$ !== void 0 && _results$.address_components) {
           var _address$location, _address$location2;
+          var addressObj = {};
           var _iterator2 = _createForOfIteratorHelper(results[0].address_components),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var _component$types;
               var component = _step2.value;
               var addressType = component.types[0];
               if (addressType === 'postal_code') {
-                zipcode = component.short_name;
-                break;
+                addressObj.zipcode = component.short_name;
+              }
+              if (addressType === 'street_number') {
+                addressObj.street_number = component.long_name;
+              }
+              if (addressType === 'neighborhood') {
+                addressObj.neighborhood = component.long_name;
+              }
+              if (addressType === 'route') {
+                addressObj.route = component.short_name;
+              }
+              if (addressType === 'locality') {
+                addressObj.locality = component.long_name;
+              }
+              if ((_component$types = component.types) !== null && _component$types !== void 0 && _component$types.includes('sublocality')) {
+                addressObj.sublocality = component.long_name;
+              }
+              if (addressType === 'country') {
+                addressObj.country = component.long_name;
+                addressObj.country_code = component.short_name;
+              }
+              if (addressType === 'administrative_area_level_1') {
+                addressObj.state = component.long_name;
+              }
+              if (addressType === 'administrative_area_level_2') {
+                addressObj.city = component.long_name;
               }
             }
           } catch (err) {
@@ -208,14 +233,13 @@ var GoogleMaps = exports.GoogleMaps = function GoogleMaps(props) {
           } finally {
             _iterator2.f();
           }
-          var address = {
+          var address = _objectSpread({
             address: results[0].formatted_address,
             location: {
               lat: pos === null || pos === void 0 ? void 0 : pos.lat(),
               lng: pos === null || pos === void 0 ? void 0 : pos.lng()
             }
-          };
-          if (zipcode) address.zipcode = zipcode;
+          }, addressObj);
           handleChangeAddressMap && handleChangeAddressMap(address);
           center.lat = (_address$location = address.location) === null || _address$location === void 0 ? void 0 : _address$location.lat;
           center.lng = (_address$location2 = address.location) === null || _address$location2 === void 0 ? void 0 : _address$location2.lng;

package/_modules/components/GpsButton/index.js

@@ -13,6 +13,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -60,16 +65,42 @@ var GpsButton = exports.GpsButton = function GpsButton(props) {
           var _results$;
           setIsLoading(false);
           var postalCode = null;
+          var addressObj = {};
           if (results !== null && results !== void 0 && (_results$ = results[0]) !== null && _results$ !== void 0 && _results$.address_components) {
             var _iterator = _createForOfIteratorHelper(results[0].address_components),
               _step;
             try {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                var _component$types;
                 var component = _step.value;
                 var addressType = component.types[0];
                 if (addressType === 'postal_code') {
                   postalCode = component.short_name;
-                  break;
+                }
+                if (addressType === 'street_number') {
+                  addressObj.street_number = component.long_name;
+                }
+                if (addressType === 'neighborhood') {
+                  addressObj.neighborhood = component.long_name;
+                }
+                if (addressType === 'route') {
+                  addressObj.route = component.short_name;
+                }
+                if (addressType === 'locality') {
+                  addressObj.locality = component.long_name;
+                }
+                if ((_component$types = component.types) !== null && _component$types !== void 0 && _component$types.includes('sublocality')) {
+                  addressObj.sublocality = component.long_name;
+                }
+                if (addressType === 'country') {
+                  addressObj.country = component.long_name;
+                  addressObj.country_code = component.short_name;
+                }
+                if (addressType === 'administrative_area_level_1') {
+                  addressObj.state = component.long_name;
+                }
+                if (addressType === 'administrative_area_level_2') {
+                  addressObj.city = component.long_name;
                 }
               }
             } catch (err) {
@@ -78,7 +109,7 @@ var GpsButton = exports.GpsButton = function GpsButton(props) {
               _iterator.f();
             }
             if (status === 'OK') {
-              onAddress({
+              onAddress(_objectSpread({
                 address: results[0].formatted_address,
                 location: location,
                 utc_offset: new Date().getTimezoneOffset(),
@@ -87,7 +118,7 @@ var GpsButton = exports.GpsButton = function GpsButton(props) {
                   library: 'google',
                   place_id: results[0].place_id
                 }
-              });
+              }, addressObj));
             } else {
               onError && onError(t('ERROR_GPS_BUTTON', 'Error to get result with gps button'));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.2.17",
+  "version": "13.2.18",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/GoogleAutocompleteInput/index.js

@@ -27,8 +27,8 @@ const AutocompleteInput = (props) => {
   })
 
   const options = {
-    types: types,
-    fields: fields
+    types,
+    fields
   }
 
   if (countryCode !== '*') {
@@ -61,7 +61,7 @@ const AutocompleteInput = (props) => {
             if (addressType === 'locality') {
               addressObj.locality = component.long_name
             }
-            if (component.types?.includes('sublocality') === 'sublocality') {
+            if (component.types?.includes('sublocality')) {
               addressObj.sublocality = component.long_name
             }
             if (addressType === 'country') {

package/src/components/GoogleMaps/index.js

@@ -130,20 +130,44 @@ export const GoogleMaps = (props) => {
       const geocoder = new window.google.maps.Geocoder()
 
       geocoder.geocode({ latLng: pos }, (results) => {
-        let zipcode = null
         if (results && results.length > 0 && results?.[0]?.address_components) {
+          const addressObj = {}
           for (const component of results[0].address_components) {
             const addressType = component.types[0]
             if (addressType === 'postal_code') {
-              zipcode = component.short_name
-              break
+              addressObj.zipcode = component.short_name
+            }
+            if (addressType === 'street_number') {
+              addressObj.street_number = component.long_name
+            }
+            if (addressType === 'neighborhood') {
+              addressObj.neighborhood = component.long_name
+            }
+            if (addressType === 'route') {
+              addressObj.route = component.short_name
+            }
+            if (addressType === 'locality') {
+              addressObj.locality = component.long_name
+            }
+            if (component.types?.includes('sublocality')) {
+              addressObj.sublocality = component.long_name
+            }
+            if (addressType === 'country') {
+              addressObj.country = component.long_name
+              addressObj.country_code = component.short_name
+            }
+            if (addressType === 'administrative_area_level_1') {
+              addressObj.state = component.long_name
+            }
+            if (addressType === 'administrative_area_level_2') {
+              addressObj.city = component.long_name
             }
           }
           const address = {
             address: results[0].formatted_address,
-            location: { lat: pos?.lat(), lng: pos?.lng() }
+            location: { lat: pos?.lat(), lng: pos?.lng() },
+            ...addressObj
           }
-          if (zipcode) address.zipcode = zipcode
 
           handleChangeAddressMap && handleChangeAddressMap(address)
 

package/src/components/GpsButton/index.js

@@ -38,12 +38,37 @@ export const GpsButton = (props) => {
         geocoder.geocode({ location }, (results, status) => {
           setIsLoading(false)
           let postalCode = null
+          const addressObj = {}
           if (results?.[0]?.address_components) {
             for (const component of results[0].address_components) {
               const addressType = component.types[0]
               if (addressType === 'postal_code') {
                 postalCode = component.short_name
-                break
+              }
+              if (addressType === 'street_number') {
+                addressObj.street_number = component.long_name
+              }
+              if (addressType === 'neighborhood') {
+                addressObj.neighborhood = component.long_name
+              }
+              if (addressType === 'route') {
+                addressObj.route = component.short_name
+              }
+              if (addressType === 'locality') {
+                addressObj.locality = component.long_name
+              }
+              if (component.types?.includes('sublocality')) {
+                addressObj.sublocality = component.long_name
+              }
+              if (addressType === 'country') {
+                addressObj.country = component.long_name
+                addressObj.country_code = component.short_name
+              }
+              if (addressType === 'administrative_area_level_1') {
+                addressObj.state = component.long_name
+              }
+              if (addressType === 'administrative_area_level_2') {
+                addressObj.city = component.long_name
               }
             }
             if (status === 'OK') {
@@ -55,7 +80,8 @@ export const GpsButton = (props) => {
                 map_data: {
                   library: 'google',
                   place_id: results[0].place_id
-                }
+                },
+                ...addressObj
               })
             } else {
               onError && onError(t('ERROR_GPS_BUTTON', 'Error to get result with gps button'))