homeflowjs 0.13.2 → 0.13.4

package/branches/branch-map/branch-map.component.jsx

@@ -30,22 +30,24 @@ class BranchMap extends React.Component {
     const {
       mapTypeControl,
       scrollWheel,
-      zoom,
+      defaultZoom,
       disableStreetview,
       custom,
       iconConfig,
       fullscreenControl,
       zoomControl,
+      googleMapsBranchZoomLevel,
     } = this.props;
 
     // Should this be added to Redux?
     const branch = Homeflow.get('branch');
+    const usedZoom = parseInt(googleMapsBranchZoomLevel || defaultZoom, 10);
 
     const options = {
       center: new google.maps.LatLng(branch.lat, branch.lng),
       mapTypeControl,
       scrollWheel,
-      zoom,
+      zoom: usedZoom,
       streetViewControl: !disableStreetview,
       fullscreenControl: false,
       zoomControl,
@@ -110,7 +112,7 @@ BranchMap.defaultProps = {
   mapTypeControl: false,
   scrollWheel: false,
   custom: null,
-  zoom: 15,
+  defaultZoom: 15,
   disableStreetview: false,
   google: false,
   iconConfig: null,
@@ -118,11 +120,15 @@ BranchMap.defaultProps = {
   zoomControl: false,
 };
 
+const mapStateToProps = (state) => ({
+  googleMapsBranchZoomLevel: state.app.themePreferences.googleMapsBranchZoomLevel,
+});
+
 const mapDispatchToProps = {
   initGoogleMaps,
 };
 
 export default connect(
-  null,
+  mapStateToProps,
   mapDispatchToProps,
 )(BranchMap);

package/branches/branches-search-form/branches-search-input.component.jsx

@@ -16,6 +16,7 @@ const BranchesSearchInput = ({
   isRequired,
   submitOnSelect,
   resetPlaceId,
+  inputProps,
 }) => {
   const { branchesSearch } = useSelector((state) => state?.branches);
   const dispatch = useDispatch();
@@ -135,6 +136,7 @@ const BranchesSearchInput = ({
               setPlaceID('');
             }
           },
+          ...inputProps,
         }}
         highlightFirstSuggestion
       />
@@ -155,6 +157,7 @@ BranchesSearchInput.propTypes = {
     PropTypes.string,
   ]),
   submitOnSelect: PropTypes.bool,
+  inputProps: PropTypes.object,
 };
 
 BranchesSearchInput.defaultProps = {
@@ -164,6 +167,7 @@ BranchesSearchInput.defaultProps = {
   setIsSelected: '',
   isRequired: false,
   submitOnSelect: false,
+  inputProps: {},
 };
 
 export default BranchesSearchInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/properties/properties-map/geonames-map.js

@@ -80,6 +80,14 @@ export default class GeonamesMap extends DraggableMap {
      */
     setTimeout(() => {
       if (!this.markersInitialized) {
+        const { geonames, properties } = store.getState().properties
+        if (!properties && !geonames?.length) {
+          const place = store.getState().search.currentSearch?.place;
+          const { lat, lng } = place;
+          this.map.setView(new L.LatLng(lat, lng), 14);
+          this.onMapDrag();
+          this.hideLoader();
+        }
         this.setMarkerTypeforZoomLevel();
         this.setMarkers();
         this.setToMarkeredBounds();

package/properties/properties-map/map-loader.js

@@ -1,7 +1,7 @@
 export default `
 <div id="geonames-map-loader" class="js-geonames-map-loader geonames-map__loader-background">
   <div class="geonames-map__loader-inner">
-    <svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
+    <svg width="100" height="100" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="gray">
       <g fill="none" fill-rule="evenodd">
         <g transform="translate(1 1)" stroke-width="2">
           <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>