homeflowjs 0.12.8 → 0.12.10

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.8",
+  "version": "0.12.10",
   "sideEffects": [
     "modal/**/*",
     "properties/properties-map/**/*",

package/properties/remove-saved-property-button/remove-saved-property-button.component.jsx

@@ -20,12 +20,14 @@ const RemoveSavedPropertyButton = (props) => {
   };
 
   return (
-    <a
+    <button
+      type="button"
       onClick={removeProperty}
       {...otherProps}
+      aria-label="Remove saved property"
     >
       {children}
-    </a>
+    </button>
   );
 };
 

package/properties/save-property-button/save-property-button.component.jsx

@@ -38,13 +38,15 @@ const SavePropertyButton = (props) => {
 
   return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/anchor-is-valid
-    <a
+    <button
+      type="button"
       style={style}
       onClick={toggleProperty}
       className={`${className} ${isSaved ? 'saved' : ''}`}
+      aria-label="Save"
     >
       {isSaved ? SavedComponent : UnsavedComponent}
-    </a>
+    </button>
   );
 };
 

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 });