homeflowjs 0.10.3 → 0.10.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",
   "scripts": {

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

@@ -5,7 +5,7 @@ import base64 from '../../utils/base64';
 import store from '../../store';
 import { buildQueryString } from '../../search/property-search/property-search';
 import { setPlace, setSearchField } from '../../actions/search.actions';
-import { setProperties, setSelectedMarker } from '../../actions/properties.actions';
+import { setProperties, setSelectedMarker, setPagination } from '../../actions/properties.actions';
 import { setLoading } from '../../actions/app.actions';
 
 const element = function (X, Y) {
@@ -560,6 +560,7 @@ export default class DraggableMap {
       .then((response) => response.json())
       .then((json) => {
           store.dispatch(setProperties(json.properties));
+          store.dispatch(setPagination(json.pagination))
           // TODO: implement user history
           // Ctesius.getUserHistoryCollection().addSearch(s);
           Homeflow.kickEvent('clear_search_box');

package/reducers/search.reducer.js

@@ -9,6 +9,7 @@ const INITIAL_STATE = {
     isQuerySearch: true,
     suggestions: [],
     tags: [],
+    poly: '',
   },
   initialSearch: {}, // original search when the page first loads
   savedSearches: [],
@@ -57,7 +58,7 @@ const searchReducer = (state = INITIAL_STATE, action) => {
           ...state.currentSearch,
           ...action.payload,
           // delete poly if user enters new search query
-          poly: action.payload.q ? null : state.currentSearch.poly,
+          ...(action.payload.q) && { poly: null },
         },
       };
     case SearchActionTypes.ADD_TAG: {

package/search/bedrooms-select/bedrooms-select.component.jsx

@@ -20,36 +20,50 @@ const NormalSelect = ({
   placeholder,
   bedOptionText,
   ...otherProps
-}) => (
-  <select
-    value={value}
-    onChange={e => setSearchField({
-      [e.target.name]: e.target.value ? parseInt(e.target.value) : null
-    })}
-    name={`${type}Beds`}
-    {...otherProps}
-  >
-    <option
-      value=""
-      title={`${type} beds`}
-      className={optionClass}
+}) => {
+  const isNumberArray = (array) => array.every((item) => typeof item === 'number');
+
+  return (
+    <select
+      value={value}
+      onChange={(e) => setSearchField({
+        [e.target.name]: e.target.value ? parseInt(e.target.value) : null,
+      })}
+      name={`${type}Beds`}
+      {...otherProps}
     >
-      {placeholder || `${capitalizeFirstLetter(type)}. bedrooms`}
-    </option>
-    {bedValues.map((_, i) => (
       <option
-        key={i}
-        value={i + 1}
-        title={`${i + 1} Bed`}
+        value=""
+        title={`${type} beds`}
         className={optionClass}
       >
-        {i + 1}
-        {' '}
-        {bedOptionText}
+        {placeholder || `${capitalizeFirstLetter(type)}. bedrooms`}
       </option>
-    ))}
-  </select>
-);
+      {bedValues.map((item) => (
+        isNumberArray(bedValues) ? (
+          <option
+            key={item}
+            value={item}
+            title={`${item} Bed`}
+            className={optionClass}
+          >
+            {item}
+            {' '}
+            {bedOptionText}
+          </option>
+        ) : (
+          <option
+            key={item.label}
+            value={item.value}
+            title={`${item.value} Bed`}
+            className={optionClass}
+          >
+            {item.label}
+          </option>
+        )))}
+    </select>
+  );
+};
 
 const ReactSelect = (props) => {
   const {
@@ -63,7 +77,7 @@ const ReactSelect = (props) => {
     bedOptionText,
   } = props;
 
-  const bedOptions = bedValues.map(bedValue => (
+  const bedOptions = bedValues.map((bedValue) => (
     { value: bedValue, label: `${bedValue} ${bedOptionText}` }
   ));
 
@@ -76,17 +90,17 @@ const ReactSelect = (props) => {
       options={bedOptions}
       styles={styles}
       placeholder={placeholder || `${capitalizeFirstLetter(type)} bedrooms`}
-      value={bedOptions.find(option => option.value === value)}
+      value={bedOptions.find((option) => option.value === value)}
       setValue={() => value}
       isSearchable={false}
       onChange={({ value }) => {
         setSearchField({
-          [`${type}Beds`]: value ? parseInt(value) : null
-        })}
-      }
+          [`${type}Beds`]: value ? parseInt(value) : null,
+        });
+      }}
     />
-  )
-}
+  );
+};
 
 const BedroomsSelect = (props) => {
   const {
@@ -104,18 +118,18 @@ const BedroomsSelect = (props) => {
   let filteredBedValues = bedValues;
 
   if (type === 'max' && minBeds && !allowUnderOver) {
-    filteredBedValues = bedValues.filter(bedValue => bedValue >= minBeds);
+    filteredBedValues = bedValues.filter((bedValue) => (bedValue.value || bedValue) >= minBeds);
   }
 
   if (type === 'min' && maxBeds && !allowUnderOver) {
-    filteredBedValues = bedValues.filter(bedValue => bedValue <= maxBeds);
+    filteredBedValues = bedValues.filter((bedValue) => (bedValue.value || bedValue) <= maxBeds);
   }
 
   if (reactSelect) {
-    return <ReactSelect type={type} value={value || ''} bedValues={filteredBedValues} {...otherProps} />;
+    return <ReactSelect type={type} value={value || value === 0 ? value : ''} bedValues={filteredBedValues} {...otherProps} />;
   }
 
-  return <NormalSelect type={type} value={value || ''} bedValues={filteredBedValues} {...otherProps} />;
+  return <NormalSelect type={type} value={value || value === 0 ? value : ''} bedValues={filteredBedValues} {...otherProps} />;
 };
 
 BedroomsSelect.propTypes = {

package/search/property-search/property-search.js

@@ -17,6 +17,8 @@ const fragmentize = (key, value) => {
   return `${pattern[0] ? pattern[0] : ''}${value}${pattern[1] ? pattern[1] : ''}`;
 };
 
+const minOrMaxBedZero = (key, value) => (key === 'minBeds' || key === 'maxBeds') && value === 0;
+
 export const buildQueryString = (search) => {
   const queryParams = [];
   const fragmentParams = [];
@@ -24,7 +26,7 @@ export const buildQueryString = (search) => {
   Object.keys(search).forEach((key) => {
     const value = search[key];
 
-    if (value === 0 && key === 'maxBeds') return fragmentParams.push(fragmentize(key, value));
+    if (minOrMaxBedZero(key, value)) return fragmentParams.push(fragmentize(key, value));
 
     if (!value) return;