homeflowjs 0.13.20 → 0.13.22

package/instant-valuation/instant-valuation/instant-valuation.styles.scss

@@ -652,9 +652,70 @@
   }
 }
 
+// Loading
 .hfjs-instant-val__loader {
   margin-top: 180px;
+  position: absolute;
+  left: 0;
+  right: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  width: 80px;
+  height: 80px;
+  padding: 4rem;
+}
+// Loading
+.hfjs-instant-val__loader div {
+  position: absolute;
+  top: 33px;
+  width: 13px;
+  height: 13px;
+  border-radius: 50%;
+  background: #888;
+  animation-timing-function: cubic-bezier(0, 1, 1, 0);
 }
+.hfjs-instant-val__loader div:nth-child(1) {
+  left: 8px;
+  animation: valuation-loader1 0.6s infinite;
+}
+.hfjs-instant-val__loader div:nth-child(2) {
+  left: 8px;
+  animation: valuation-loader2 0.6s infinite;
+}
+.hfjs-instant-val__loader div:nth-child(3) {
+  left: 32px;
+  animation: valuation-loader2 0.6s infinite;
+}
+.hfjs-instant-val__loader div:nth-child(4) {
+  left: 56px;
+  animation: valuation-loader3 0.6s infinite;
+}
+@keyframes valuation-loader1 {
+  0% {
+    transform: scale(0);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+@keyframes valuation-loader2 {
+  0% {
+    transform: translate(0, 0);
+  }
+  100% {
+    transform: translate(24px, 0);
+  }
+}
+@keyframes valuation-loader3 {
+  0% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(0);
+  }
+}
+
 
 .instant-valuation__price-label {
   margin-bottom: 0;

package/package.json

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

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

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import DraggableMap from './draggable-map';
 import store from '../../store';
-import { currentGeonameId } from '../../utils/index';
+import { currentGeonameId, filterGeonames } from '../../utils/index';
 import { setProperties, setGeonames, setSelectedMarker } from '../../actions/properties.actions';
 import { setInitialSearch, setPlace, setSearchField } from '../../actions/search.actions';
 import { buildQueryString } from '../../search/property-search/property-search';
@@ -16,6 +16,7 @@ export default class GeonamesMap extends DraggableMap {
 
     this.geonameMarkerLayers = [];
     this.geonameMarkerHoverLayers = [];
+    this.currentGeonameIdFromLocationPath = currentGeonameId();
   }
 
   initOnMarkerClick() {
@@ -258,11 +259,15 @@ export default class GeonamesMap extends DraggableMap {
 
   setSearchResponse(json) {
     if (!json) return;
-
+  
     if (json.geonames) {
       this.geonames = this.concatenateDistinctObjects('geoname_id', this.geonames, json.geonames);
       window.markerType = 'geonames';
-      store.dispatch(setGeonames(json.geonames));
+      const currentAreaId = store.getState().search.currentSearch?.place?.area;
+      const geonamesFiltered = filterGeonames(
+        this.currentGeonameIdFromLocationPath, Number(currentAreaId), this.geonames
+      );
+      store.dispatch(setGeonames(geonamesFiltered));
     } else if (json.properties) {
       this.properties = this.concatenateDistinctObjects('property_id', this.properties, json.properties);
       window.markerType = 'properties';
@@ -285,7 +290,11 @@ export default class GeonamesMap extends DraggableMap {
       this.hideSuggestedDestinations();
       this.markersInitialized = true;
     } else if (window.markerType === 'geonames' && this.geonames?.length) {
-      this.geonames.forEach(geoname => this.setGeonameMarker(geoname));
+      const currentAreaId = store.getState().search.currentSearch?.place?.area;
+      const geonamesFiltered = filterGeonames(
+        this.currentGeonameIdFromLocationPath, Number(currentAreaId), this.geonames
+      );
+      geonamesFiltered.forEach(geoname => this.setGeonameMarker(geoname));
       this.showSuggestedDestinations();
       this.markersInitialized = true;
     }

package/shared/loader.component.jsx

@@ -9,6 +9,7 @@ const Loader = ({ containerClass, className, message }) => (
       <div />
       <div />
       <div />
+      <div />
     </div>
 
     {message && <p style={{ marginTop: '10px' }}>{message}</p>}

package/utils/index.js

@@ -1,3 +1,8 @@
+/* eslint-disable arrow-body-style */
+/* eslint-disable max-len */
+/* eslint-disable semi */
+/* eslint-disable no-undef */
+/* eslint-disable no-restricted-syntax */
 export { default as stampDutyCalculator } from './stamp-duty-calculator/stamp-duty-calculator';
 
 export const capitalizeFirstLetter = (str) => (
@@ -82,8 +87,16 @@ export const sanitizeText = (string) => new Option(string).innerHTML;
 
 export const currentGeonameId = (path) => {
   const pathname = path || window.location.pathname;
-  const segment = pathname.split('/').reverse().find(item => item.startsWith('gid-'))?.replace(/^gid-/, '')
+  const segment = pathname.split('/').reverse().find((item) => item.startsWith('gid-'))?.replace(/^gid-/, '');
   return parseInt(segment, 10) || null;
 };
 
 export const DEBOUNCE_DELAY = 200;
+
+export const filterGeonames = (geonameId = null, areaId = null, geonames) => {
+  if (!geonameId) return geonames;
+
+  if (areaId) return geonames.filter((geoname) => geoname?.geoname_id !== geonameId && geoname?.area < areaId);
+
+  return geonames.filter((geoname) => geoname?.geoname_id !== geonameId);
+};