homeflowjs 0.10.9 → 0.10.10

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

@@ -13,7 +13,7 @@ import ReactLeafletGoogleLayer from 'react-leaflet-google-layer';
 import 'leaflet/dist/leaflet.css';
 
 const BranchesMap = ({
-  CustomPopup, google, gmapsKey, iconConfig, fallbackLatLng,
+  CustomPopup, google, gmapsKey, iconConfig, fallbackLatLng, scrollWheelZoom
 }) => {
   let branches = Homeflow.get('branches');
   let showMarkers = true;
@@ -30,12 +30,24 @@ const BranchesMap = ({
     shadowUrl: '/assets/marker-shadow.png',
   };
 
-  const icon = L.icon(iconConfig || defaultIconConfig);
+  let icon = L.icon(iconConfig || defaultIconConfig);
 
   const bounds = latLngBounds([branches[0].lat, branches[0].lng]);
 
   const markers = branches.map((branch) => {
     bounds.extend([branch.lat, branch.lng]);
+    // check if branch object have mapIcon payload, example:
+    // mapIcon: {
+    //   iconUrl: 'specific-path.png' || 'data:image/svg+xml;utf8,<svg></svg>',
+    //   iconSize: [149, 66],
+    // }
+    if ('mapIcon' in branch) icon = L.icon(branch.mapIcon);
+    // check if branch object have mapDivIcon payload, example:
+    // mapDivIcon: {
+    //   html: 'html string',
+    //   iconSize: [149, 66],
+    // }
+    if ('mapDivIcon' in branch) icon = L.divIcon(branch.mapDivIcon);
 
     return (
       <Marker
@@ -77,7 +89,7 @@ const BranchesMap = ({
     <MapContainer
       center={[branches[0].lat, branches[0].lng]}
       bounds={bounds}
-      scrollWheelZoom={false}
+      scrollWheelZoom={scrollWheelZoom}
       style={{ height: '100%' }}
     >
       {google ? (
@@ -99,6 +111,7 @@ BranchesMap.propTypes = {
   gmapsKey: PropTypes.string,
   iconConfig: PropTypes.object,
   fallbackLatLng: PropTypes.object,
+  scrollWheelZoom: PropTypes.bool,
 };
 
 BranchesMap.defaultProps = {
@@ -107,6 +120,7 @@ BranchesMap.defaultProps = {
   gmapsKey: null,
   iconConfig: null,
   fallbackLatLng: { lat: 51.509865, lng: -0.118092 },
+  scrollWheelZoom: false,
 };
 
 const mapStateToProps = (state) => ({

package/package.json

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

package/properties/stamp-duty-calculator/stamp-duty-calculator.component.jsx

@@ -7,7 +7,7 @@ import './stamp-duty-calculator.styles.scss';
 
 const StampDutyCalculator = ({ scotland, themePreferences }) => {
   const [type, setType] = useState('residential');
-  const [purchaseType, setPurchaseType] = useState('additional')
+  const [purchaseType, setPurchaseType] = useState('firstTimeBuyer')
   const [purchasePrice, setPurchasePrice] = useState();
 
   const renderCalculator = () => {
@@ -62,19 +62,19 @@ const StampDutyCalculator = ({ scotland, themePreferences }) => {
         <div className="form-group">
           <button
             type="button"
-            className={`stamp-duty-cal__type ${purchaseType === 'additional' ? 'selected' : ''}`}
-            onClick={() => setPurchaseType('additional')}
+            className={`stamp-duty-cal__type ${purchaseType === 'firstTimeBuyer' ? 'selected' : ''}`}
+            onClick={() => setPurchaseType('firstTimeBuyer')}
           >
-            Additional Property
+            First Time Buyer
           </button>
         </div>
         <div className="form-group">
           <button
             type="button"
-            className={`stamp-duty-cal__type ${purchaseType === 'firstTimeBuyer' ? 'selected' : ''}`}
-            onClick={() => setPurchaseType('firstTimeBuyer')}
+            className={`stamp-duty-cal__type ${purchaseType === 'additional' ? 'selected' : ''}`}
+            onClick={() => setPurchaseType('additional')}
           >
-            First Time Buyer
+            Additional Property
           </button>
         </div>
       </div>