homeflowjs 0.8.13 → 0.8.16

package/branches/branch-map/branch-map.component.jsx

@@ -3,7 +3,6 @@
 import React, { Suspense } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-
 import { initGoogleMaps } from '../../actions/app.actions';
 import { simpleBW } from '../../shared/custom-gmap-styles';
 
@@ -105,4 +104,4 @@ const mapDispatchToProps = {
 export default connect(
   null,
   mapDispatchToProps,
-)(BranchMap);
+)(BranchMap);

package/package.json

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

package/properties/load-more-button/load-more-button.component.jsx

@@ -3,13 +3,14 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { loadNext } from '../../actions/properties.actions';
-import Loader from '../../shared/loader.component';
+import DefaultLoader from '../../shared/loader.component';
 
 const LoadMoreButton = (props) => {
   const {
     loadNext,
     pagination,
     children,
+    Loader = DefaultLoader,
     ...otherProps
   } = props;
 

package/properties/properties-display/properties-display.component.jsx

@@ -34,10 +34,12 @@ const PropertiesDisplay = ({
       <p>There were no properties matching your search.</p>
     );
   }
+
   const addWrapper = displayType === 'list';
 
-  const items = propertiesByPage(properties).map((page) => (
+  const items = propertiesByPage(properties).map((page, i) => (
     <ConditionalWrapper
+      key={i}
       condition={addWrapper}
       wrapper={(children) => (
         <div

package/properties/properties-map/properties-map.component.jsx

@@ -51,6 +51,7 @@ window.$ = () => ({
 const PropertiesMap = ({ leaflet, gmapKey, googleLayer }) => {
   const addLegacyMaps = () => {
     const needsGoogle = !leaflet || googleLayer;
+
     if (needsGoogle && !document.getElementById('hfjs-gmaps') && gmapKey) {
       const gmapScript = document.createElement('script');
       gmapScript.setAttribute('src', `https://maps.google.com/maps/api/js?key=${gmapKey}`);

package/properties/property-map/property-map.component.jsx

@@ -3,7 +3,6 @@
 import React, { Suspense } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-
 import { initGoogleMaps } from '../../actions/app.actions';
 import { simpleBW } from '../../shared/custom-gmap-styles';
 
@@ -32,6 +31,7 @@ class PropertyMap extends React.Component {
       zoom,
       disableStreetview,
       custom,
+      iconConfig,
     } = this.props;
 
     // Should this be added to Redux?
@@ -53,14 +53,15 @@ class PropertyMap extends React.Component {
     const marker = new google.maps.Marker({
       position: { lat: property.lat, lng: property.lng },
       map,
+      ...(iconConfig && { icon: iconConfig.iconUrl }),
     });
   }
 
   render() {
-    const { google } = this.props;
+    const { google, iconConfig } = this.props;
 
     if (!google) {
-      return <LazyLeafletMap />;
+      return <LazyLeafletMap iconConfig={iconConfig} />;
     }
 
     return (
@@ -77,6 +78,7 @@ PropertyMap.propTypes = {
   disableStreetview: PropTypes.bool,
   initGoogleMaps: PropTypes.func.isRequired,
   google: PropTypes.bool,
+  iconConfig: PropTypes.object,
 };
 
 PropertyMap.defaultProps = {
@@ -86,6 +88,7 @@ PropertyMap.defaultProps = {
   zoom: 15,
   disableStreetview: false,
   google: false,
+  iconConfig: null,
 };
 
 const mapDispatchToProps = {
@@ -95,4 +98,4 @@ const mapDispatchToProps = {
 export default connect(
   null,
   mapDispatchToProps,
-)(PropertyMap);
+)(PropertyMap);

package/search/property-search/parse-fragment.js

@@ -38,6 +38,7 @@ export default (fragment) => {
 
     if (part.startsWith('tag-')) {
       search.tags = part.replace('tag-', '').split(',');
+      return;
     }
 
     if (orderParams.includes(part)) {

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

@@ -47,6 +47,7 @@ class SearchForm extends Component {
       setPlace(place);
       setInitialSearch({
         q: place.name + (place.county_name ? `, ${place.county_name}` : ''),
+        place,
       });
     }
     const expandedPolygon = Homeflow.get('expanded_polygon');