homeflowjs 0.7.22 → 0.7.26

package/Jenkinsfile

@@ -39,6 +39,8 @@ pipeline {
 
     stage('Publish Verification') {
       when {
+        branch 'master'
+
         anyOf {
           triggeredBy 'BitBucketPushCause'
           triggeredBy 'UserIdCause'

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

@@ -1,17 +1,18 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import L from 'leaflet';
 import { MapContainer, TileLayer, Marker } from 'react-leaflet';
 
-const BranchLeafletMap = () => {
+const BranchLeafletMap = ({ iconConfig }) => {
   const branch = Homeflow.get('branch');
 
-  const defaultIcon = L.icon({
+  const defaultIconConfig = {
     iconRetinaUrl: '/assets/marker-icon.png',
     iconUrl: '/assets/marker-icon.png',
     shadowUrl: '/assets/marker-shadow.png',
-  });
+  };
 
-  // debugger;
+  const icon = L.icon(iconConfig || defaultIconConfig);
 
   return (
     <MapContainer
@@ -24,9 +25,17 @@ const BranchLeafletMap = () => {
         attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
         url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
       />
-      <Marker position={[branch.lat, branch.lng]} icon={defaultIcon} />
+      <Marker position={[branch.lat, branch.lng]} icon={icon} />
     </MapContainer>
   );
 };
 
+BranchLeafletMap.propTypes = {
+  iconConfig: PropTypes.object,
+};
+
+BranchLeafletMap.defaultProps = {
+  iconConfig: null,
+};
+
 export default BranchLeafletMap;

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

@@ -59,10 +59,10 @@ class BranchMap extends React.Component {
   }
 
   render() {
-    const { google } = this.props;
+    const { google, iconConfig } = this.props;
 
     if (!google) {
-      return <LazyLeafletMap />;
+      return <LazyLeafletMap iconConfig={iconConfig} />;
     }
 
     return (
@@ -79,6 +79,7 @@ BranchMap.propTypes = {
   disableStreetview: PropTypes.bool,
   initGoogleMaps: PropTypes.func.isRequired,
   google: PropTypes.bool,
+  iconConfig: PropTypes.object,
 };
 
 BranchMap.defaultProps = {
@@ -88,6 +89,7 @@ BranchMap.defaultProps = {
   zoom: 15,
   disableStreetview: false,
   google: false,
+  iconConfig: null,
 };
 
 const mapDispatchToProps = {

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

@@ -12,14 +12,25 @@ import ReactLeafletGoogleLayer from 'react-leaflet-google-layer';
 
 import 'leaflet/dist/leaflet.css';
 
-const BranchesMap = ({ CustomPopup, google, gmapsKey }) => {
-  const branches = Homeflow.get('branches');
+const BranchesMap = ({
+  CustomPopup, google, gmapsKey, iconConfig, fallbackLatLng,
+}) => {
+  let branches = Homeflow.get('branches');
+  let showMarkers = true;
+
+  // If no branches found use fallback lat, long and set showMarkers to false
+  if (!branches) {
+    branches = [fallbackLatLng];
+    showMarkers = false;
+  }
 
-  const defaultIcon = L.icon({
+  const defaultIconConfig = {
     iconRetinaUrl: '/assets/marker-icon.png',
     iconUrl: '/assets/marker-icon.png',
     shadowUrl: '/assets/marker-shadow.png',
-  });
+  };
+
+  const icon = L.icon(iconConfig || defaultIconConfig);
 
   const bounds = latLngBounds([branches[0].lat, branches[0].lng]);
 
@@ -29,7 +40,7 @@ const BranchesMap = ({ CustomPopup, google, gmapsKey }) => {
     return (
       <Marker
         position={[branch.lat, branch.lng]}
-        icon={defaultIcon}
+        icon={icon}
         key={branch.branch_id}
       >
         {CustomPopup ? (
@@ -77,7 +88,7 @@ const BranchesMap = ({ CustomPopup, google, gmapsKey }) => {
           url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
         />
       )}
-      {markers}
+      {showMarkers && markers}
     </MapContainer>
   );
 };
@@ -86,12 +97,16 @@ BranchesMap.propTypes = {
   google: PropTypes.bool,
   CustomPopup: PropTypes.elementType,
   gmapsKey: PropTypes.string,
+  iconConfig: PropTypes.object,
+  fallbackLatLng: PropTypes.object,
 };
 
 BranchesMap.defaultProps = {
   google: false,
   CustomPopup: null,
   gmapsKey: null,
+  iconConfig: null,
+  fallbackLatLng: { lat: 51.509865, lng: -0.118092 },
 };
 
 const mapStateToProps = (state) => ({

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

@@ -3,9 +3,16 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import Autosuggest from 'react-autosuggest';
 import { setBranchesSearch } from '../../actions/branches.actions';
+import { autosuggestTheme } from '../../search/location-input/location-input.styles';
 
 const BranchesSearchInput = ({
-  branchesSearch, setBranchesSearch, placeholder, isSelected, setIsSelected,
+  branchesSearch,
+  setBranchesSearch,
+  placeholder,
+  isSelected,
+  setIsSelected,
+  className,
+  unstyled
 }) => {
   const [placeID, setPlaceID] = useState('');
   const [suggestions, setSuggestions] = useState([]);
@@ -68,12 +75,14 @@ const BranchesSearchInput = ({
         renderSuggestion={(suggestion) => renderSuggestion(suggestion.label)}
         inputProps={{
           placeholder,
+          className,
           value: branchesSearch,
           onChange: (_, { newValue, method }) => {
             setBranchesSearch(newValue);
           },
         }}
         highlightFirstSuggestion
+        theme={unstyled ? null : autosuggestTheme}
       />
     </>
   );
@@ -91,12 +100,16 @@ BranchesSearchInput.propTypes = {
     PropTypes.func,
     PropTypes.string,
   ]),
+  className: PropTypes.string,
+  unstyled: PropTypes.bool,
 };
 
 BranchesSearchInput.defaultProps = {
   placeholder: '',
   isSelected: '',
   setIsSelected: '',
+  className: '',
+  unstyled: false,
 };
 
 const mapStateToProps = (state) => ({

package/package.json

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

package/reducers/search.reducer.js

@@ -56,6 +56,8 @@ const searchReducer = (state = INITIAL_STATE, action) => {
         currentSearch: {
           ...state.currentSearch,
           ...action.payload,
+          // delete poly if user enters new search query
+          poly: action.payload.q ? null : state.currentSearch.poly,
         },
       };
     case SearchActionTypes.ADD_TAG: {