homeflowjs 0.9.12 → 0.9.15

package/package.json

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

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

@@ -91,6 +91,7 @@ const BedroomsSelect = (props) => {
     maxBeds,
     reactSelect,
     bedValues,
+    allowUnderOver,
     ...otherProps
   } = props;
 
@@ -98,12 +99,12 @@ const BedroomsSelect = (props) => {
 
   let filteredBedValues = bedValues;
 
-  if (type === 'max' && minBeds) {
-    filteredBedValues = bedValues.filter(bedValue => bedValue > minBeds);
+  if (type === 'max' && minBeds && !allowUnderOver) {
+    filteredBedValues = bedValues.filter(bedValue => bedValue >= minBeds);
   }
 
-  if (type === 'min' && maxBeds) {
-    filteredBedValues = bedValues.filter(bedValue => bedValue < maxBeds);
+  if (type === 'min' && maxBeds && !allowUnderOver) {
+    filteredBedValues = bedValues.filter(bedValue => bedValue <= maxBeds);
   }
 
   if (reactSelect) {
@@ -121,12 +122,14 @@ BedroomsSelect.propTypes = {
   setSearchField: PropTypes.func.isRequired,
   optionClass: PropTypes.string,
   placeholder: PropTypes.string,
+  allowUnderOver: PropTypes.bool,
 };
 
 BedroomsSelect.defaultProps = {
   bedValues: defaultBedrooms,
   optionClass: '',
   placeholder: null,
+  allowUnderOver: false,
 };
 
 const mapStateToProps = ({ search: { currentSearch } }) => ({

package/search/bedrooms-select/bedrooms-select.test.js

@@ -50,7 +50,7 @@ describe('MinBedroomsSelect', () => {
     const wrapper = mount(<BedroomsSelect {...testProps} />);
 
     // includes the default unselected option
-    expect(wrapper.find('option').length).toEqual(2);
+    expect(wrapper.find('option').length).toEqual(3);
   });
 
   it('removes higher beds for min when selected for max', () => {
@@ -63,6 +63,6 @@ describe('MinBedroomsSelect', () => {
     const wrapper = mount(<BedroomsSelect {...testProps} />);
 
     // includes the default unselected option
-    expect(wrapper.find('option').length).toEqual(3);
+    expect(wrapper.find('option').length).toEqual(4);
   });
 });

package/search/channel-radio-button/channel-radio-button.component.jsx

@@ -5,11 +5,11 @@ import { Radio } from 'pretty-checkbox-react';
 
 import { setChannel } from '../../actions/search.actions';
 
-const PrettyRadio = ({ channel, value, setChannel, children }) => {
+const PrettyRadio = ({ channel, value, handleChange, children }) => {
   const checked = value === channel;
 
   return (
-    <Radio name={channel} checked={checked} onChange={() => setChannel(value)}>
+    <Radio name={channel} value={value} checked={checked} onChange={handleChange}>
       {children}
     </Radio>
   );
@@ -21,10 +21,16 @@ const ChannelRadioButton = (props) => {
     value,
     channel,
     setChannel,
+    onChange,
     ...otherProps
-  } = props
+  } = props;
 
-  if (pretty) return <PrettyRadio {...props} />;
+  const handleChange = (e) => {
+    setChannel(value);
+    if (onChange) onChange(e);
+  }
+
+  if (pretty) return <PrettyRadio {...props} handleChange={handleChange} />;
 
   return (
     <input
@@ -32,7 +38,7 @@ const ChannelRadioButton = (props) => {
       name="channel"
       aria-label={`${value}-radio`}
       value={value}
-      onChange={() => setChannel(value)}
+      onChange={handleChange}
       checked={channel === value}
       {...otherProps}
     />
@@ -43,11 +49,13 @@ ChannelRadioButton.propTypes = {
   value: PropTypes.oneOf(['sales', 'lettings']),
   channel: PropTypes.string.isRequired,
   setChannel: PropTypes.func.isRequired,
+  onChange: PropTypes.func,
 };
 
 ChannelRadioButton.defaultProps = {
   // TODO: make this configurable via prop
   value: 'sales',
+  onChange: null,
 };
 
 const mapStateToProps = state => ({