homeflowjs 0.13.17 → 0.13.19

package/package.json

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

package/properties/properties-map/draggable-map.js

@@ -60,6 +60,12 @@ export default class DraggableMap {
       this.render();
       this.buildPolygon();
       this.setMarkers();
+      if (!Homeflow.get('show_map_controls_on_mobile_popup_open')) {
+        // hides map controls when popup open on mobile so they don't
+        // sit on top of popup, z-index does not work for this as it 
+        // is a design feature
+        this.initControlsMobile();
+      }
       if (this.noLocationfound) { this.setToMarkeredBounds(); }
       if (Homeflow.get('custom_map_zoom')) {
         this.map.setZoom(Homeflow.get('custom_map_zoom'));
@@ -70,6 +76,29 @@ export default class DraggableMap {
     return this.mapLoadedTimes = 2;
   }
 
+  initControlsMobile() {
+    this.map.on('popupopen', () => {
+      if (window.innerWidth < 768) {
+        const zoomControls = document.querySelector('.leaflet-top.leaflet-right');
+        const drawControls = document.querySelector('.leaflet-bottom.leaflet-left');
+
+        zoomControls.style.visibility = 'hidden';
+        drawControls.style.visibility = 'hidden';
+      }
+    })
+
+    this.map.on('popupclose', () => {
+      if (window.innerWidth < 768) {
+        const zoomControls = document.querySelector('.leaflet-top.leaflet-right');
+        const drawControls = document.querySelector('.leaflet-bottom.leaflet-left');
+
+        zoomControls.style.visibility = 'visible';
+        drawControls.style.visibility = 'visible';
+      }
+    })
+
+  }
+
   render() {
     this.generateMap();
     if (!Homeflow.get('free_text_search')) {
@@ -277,6 +306,7 @@ export default class DraggableMap {
 
     this.properties.map(property => this.setPropertyMarker(property));
     this.clusteringMarkerLayer.addTo(this.map);
+    this.nonClusteringMarkerLayer.addTo(this.map);
 
     return this.bounds;
   }
@@ -630,7 +660,7 @@ export default class DraggableMap {
           this._running_update = false;
 
           if (json.properties) {
-            setSearchResponse(json);
+            this.setSearchResponse(json);
           }
       })
   }

package/properties/properties-map/drawable-map.js

@@ -91,6 +91,7 @@ export default class DrawableMap extends DraggableMap {
       if (!additionalDrawing) {
         this.drawnItems.clearLayers();
         if (this.marker_layer) { this.map.removeLayer(this.marker_layer); }
+        if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
         if (this.geo_marker_layer != null) { this.map.removeLayer(this.geo_marker_layer); }
         if (this.circle != null) { this.map.removeLayer(this.circle); }
       }
@@ -147,6 +148,7 @@ export default class DrawableMap extends DraggableMap {
     this.map.on("draw:drawstart", e => {
       this.first = false;
       this.map.removeLayer(this.marker_layer);
+      if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
       if (this.geo_marker_layer) { this.map.removeLayer(this.geo_marker_layer); }
       if (this.circle) { this.map.removeLayer(this.circle); }
       return Homeflow.kickEvent('drawbannertoggled', this);
@@ -235,6 +237,7 @@ export default class DrawableMap extends DraggableMap {
 
     return this.map.on("draw:deleted", e => {
       this.map.removeLayer(this.marker_layer);
+      if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
       if (this.geo_marker_layer != null) { this.map.removeLayer(this.geo_marker_layer); }
       store.dispatch(setSearchField({ poly: null }));
       this.updateURL();