homeflowjs 0.12.7 → 0.12.9

package/app/hf-initialize.jsx

@@ -109,7 +109,7 @@ const hfInitialize = () => {
       || pageRoute === 'counties#show'
       || pageRoute === 'postcodes#show'
       || pageRoute === 'locations#show'
-    ) {
+  ) {
     const searchFromFragment = parseFragment(window.location.pathname);
     const defaultStatus = store.getState().app.themePreferences.default_search_status;
 
@@ -123,17 +123,18 @@ const hfInitialize = () => {
 
       store.dispatch(setInitialSearch(searchFromFragment));
       store.dispatch(setSearch(searchFromFragment));
-    } else {
-      if (defaultStatus && !search.status) store.dispatch(setSearchField({ status: defaultStatus }));
     }
 
     const place = Homeflow.get('place');
     if (place) {
+      const initialSearchSet = Object.keys(store.getState().search?.initialSearch)?.length;
       store.dispatch(setPlace(place));
-      store.dispatch(setInitialSearch({
-        q: place.name + (place.county_name ? `, ${place.county_name}` : ''),
-        place,
-      }));
+      if (!initialSearchSet) {
+        store.dispatch(setInitialSearch({
+          q: place.name + (place.county_name ? `, ${place.county_name}` : ''),
+          place,
+        }));
+      }
     }
     const expandedPolygon = Homeflow.get('expanded_polygon');
     if (expandedPolygon) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.12.7",
+  "version": "0.12.9",
   "sideEffects": [
     "modal/**/*",
     "properties/properties-map/**/*",

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

@@ -281,7 +281,7 @@ export default class DraggableMap {
     const layer = Homeflow.get('pin_clustering') ? this.clusteringMarkerLayer : this.nonClusteringMarkerLayer;
 
     if (property.property_id === null || property.lat === 0 || property.lng === 0) return;
-    if (geonameId && Homeflow.get('breadcrumbs_map') && geonameId !== currentGeonameId()) return;
+    if (geonameId && Homeflow.get('breadcrumbs_map') && geonameId !== currentGeonameId() && !this.isDisplayProperties()) return;
 
     layer.addLayer(this.generateMarker(property));
   }

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

@@ -20,7 +20,11 @@ export default class DrawableMap extends DraggableMap {
     Homeflow.kickEvent('editbanner', this);
     Homeflow.kickEvent('deletebanner', this);
     this.repositionDrawControls();
-    return this.onMapDrag();
+    // note: I'm not 100% sure this is will ever be required if super.init() is called
+    // something to review in homeflow_next
+    if (!Homeflow.get('breadcrumbs_map')) {
+      return this.onMapDrag();
+    }
   }
 
   onMapDrag() {

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

@@ -28,6 +28,7 @@ class SearchForm extends Component {
       }
     } else {
       if (defaultSort && !search.sorted) setSearchField({ sorted: defaultSort });
+      if (defaultStatus && !search.status) setSearchField({ status: defaultStatus });
     }
 
     if (defaultChannel) setSearchField({ channel: defaultChannel });