From bd4d31c2a05d37c476a456fda8744f1fa6b985df Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Fri, 23 Feb 2018 17:51:20 +0200 Subject: [PATCH] SelectMultipleFilterMobile -> SelectMultipleFilterPlain and same for SelectSingleFilterMobile --- .../SearchFiltersMobile.js | 8 +++---- .../SearchFiltersPanel/SearchFiltersPanel.js | 2 +- .../SelectMultipleFilterPlain.css} | 0 .../SelectMultipleFilterPlain.example.js} | 4 ++-- .../SelectMultipleFilterPlain.js} | 22 +++++++++---------- .../SelectMultipleFilterPlainForm.js} | 10 ++++----- .../SelectSingleFilterPlain.css} | 0 .../SelectSingleFilterPlain.js} | 12 +++++----- src/components/index.js | 8 +++---- src/examples.js | 4 ++-- src/translations/en.json | 6 ++--- 11 files changed, 38 insertions(+), 38 deletions(-) rename src/components/{SelectMultipleFilterMobile/SelectMultipleFilterMobile.css => SelectMultipleFilterPlain/SelectMultipleFilterPlain.css} (100%) rename src/components/{SelectMultipleFilterMobile/SelectMultipleFilterMobile.example.js => SelectMultipleFilterPlain/SelectMultipleFilterPlain.example.js} (93%) rename src/components/{SelectMultipleFilterMobile/SelectMultipleFilterMobile.js => SelectMultipleFilterPlain/SelectMultipleFilterPlain.js} (80%) rename src/components/{SelectMultipleFilterMobile/SelectMultipleFilterMobileForm.js => SelectMultipleFilterPlain/SelectMultipleFilterPlainForm.js} (70%) rename src/components/{SelectSingleFilterMobile/SelectSingleFilterMobile.css => SelectSingleFilterPlain/SelectSingleFilterPlain.css} (100%) rename src/components/{SelectSingleFilterMobile/SelectSingleFilterMobile.js => SelectSingleFilterPlain/SelectSingleFilterPlain.js} (91%) diff --git a/src/components/SearchFiltersMobile/SearchFiltersMobile.js b/src/components/SearchFiltersMobile/SearchFiltersMobile.js index e704940f..552dbe58 100644 --- a/src/components/SearchFiltersMobile/SearchFiltersMobile.js +++ b/src/components/SearchFiltersMobile/SearchFiltersMobile.js @@ -11,8 +11,8 @@ import { SecondaryButton, ModalInMobile, Button, - SelectSingleFilterMobile, - SelectMultipleFilterMobile, + SelectSingleFilterPlain, + SelectMultipleFilterPlain, } from '../../components'; import css from './SearchFiltersMobile.css'; @@ -156,7 +156,7 @@ class SearchFiltersMobileComponent extends Component { const initialCategory = urlQueryParams[CATEGORY_URL_PARAM]; const categoryFilter = categories ? ( - { const initialValues = !!amenities ? amenities.split(',') : []; return ( - {labelText} - { +const SelectMultipleFilterPlainFormComponent = props => { const { form, className, name, options, twoColumns } = props; return ( @@ -19,12 +19,12 @@ const SelectMultipleFilterMobileFormComponent = props => { ); }; -SelectMultipleFilterMobileFormComponent.defaultProps = { +SelectMultipleFilterPlainFormComponent.defaultProps = { className: null, twoColumns: false, }; -SelectMultipleFilterMobileFormComponent.propTypes = { +SelectMultipleFilterPlainFormComponent.propTypes = { ...formPropTypes, className: string, name: string.isRequired, @@ -37,6 +37,6 @@ SelectMultipleFilterMobileFormComponent.propTypes = { twoColumns: bool, }; -const SelectMultipleFilterMobileForm = reduxForm({})(SelectMultipleFilterMobileFormComponent); +const SelectMultipleFilterPlainForm = reduxForm({})(SelectMultipleFilterPlainFormComponent); -export default SelectMultipleFilterMobileForm; +export default SelectMultipleFilterPlainForm; diff --git a/src/components/SelectSingleFilterMobile/SelectSingleFilterMobile.css b/src/components/SelectSingleFilterPlain/SelectSingleFilterPlain.css similarity index 100% rename from src/components/SelectSingleFilterMobile/SelectSingleFilterMobile.css rename to src/components/SelectSingleFilterPlain/SelectSingleFilterPlain.css diff --git a/src/components/SelectSingleFilterMobile/SelectSingleFilterMobile.js b/src/components/SelectSingleFilterPlain/SelectSingleFilterPlain.js similarity index 91% rename from src/components/SelectSingleFilterMobile/SelectSingleFilterMobile.js rename to src/components/SelectSingleFilterPlain/SelectSingleFilterPlain.js index f9f70573..63a085c9 100644 --- a/src/components/SelectSingleFilterMobile/SelectSingleFilterMobile.js +++ b/src/components/SelectSingleFilterPlain/SelectSingleFilterPlain.js @@ -3,9 +3,9 @@ import { arrayOf, bool, func, shape, string } from 'prop-types'; import classNames from 'classnames'; import { FormattedMessage } from 'react-intl'; -import css from './SelectSingleFilterMobile.css'; +import css from './SelectSingleFilterPlain.css'; -class SelectSingleFilterMobile extends Component { +class SelectSingleFilterPlain extends Component { constructor(props) { super(props); this.state = { isOpen: true }; @@ -57,7 +57,7 @@ class SelectSingleFilterMobile extends Component { {label}
@@ -92,7 +92,7 @@ class SelectSingleFilterMobile extends Component { } } -SelectSingleFilterMobile.defaultProps = { +SelectSingleFilterPlain.defaultProps = { rootClassName: null, className: null, initialValue: null, @@ -100,7 +100,7 @@ SelectSingleFilterMobile.defaultProps = { useBullets: false, }; -SelectSingleFilterMobile.propTypes = { +SelectSingleFilterPlain.propTypes = { rootClassName: string, className: string, urlParam: string.isRequired, @@ -118,4 +118,4 @@ SelectSingleFilterMobile.propTypes = { useBullets: bool, }; -export default SelectSingleFilterMobile; +export default SelectSingleFilterPlain; diff --git a/src/components/index.js b/src/components/index.js index a0f9c3e5..e0e8849b 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -111,12 +111,12 @@ export { default as SectionThumbnailLinks } from './SectionThumbnailLinks/Sectio export { default as SelectField } from './SelectField/SelectField'; export { default as SelectMultipleFilter } from './SelectMultipleFilter/SelectMultipleFilter'; export { - default as SelectMultipleFilterMobile, -} from './SelectMultipleFilterMobile/SelectMultipleFilterMobile'; + default as SelectMultipleFilterPlain, +} from './SelectMultipleFilterPlain/SelectMultipleFilterPlain'; export { default as SelectSingleFilter } from './SelectSingleFilter/SelectSingleFilter'; export { - default as SelectSingleFilterMobile, -} from './SelectSingleFilterMobile/SelectSingleFilterMobile'; + default as SelectSingleFilterPlain, +} from './SelectSingleFilterPlain/SelectSingleFilterPlain'; export { default as StripeBankAccountTokenInputField, } from './StripeBankAccountTokenInputField/StripeBankAccountTokenInputField'; diff --git a/src/examples.js b/src/examples.js index 3e0e6e4b..9ba919e2 100644 --- a/src/examples.js +++ b/src/examples.js @@ -47,7 +47,7 @@ import * as Reviews from './components/Reviews/Reviews.example'; import * as SectionThumbnailLinks from './components/SectionThumbnailLinks/SectionThumbnailLinks.example'; import * as SelectField from './components/SelectField/SelectField.example'; import * as SelectMultipleFilter from './components/SelectMultipleFilter/SelectMultipleFilter.example'; -import * as SelectMultipleFilterMobile from './components/SelectMultipleFilterMobile/SelectMultipleFilterMobile.example'; +import * as SelectMultipleFilterPlain from './components/SelectMultipleFilterPlain/SelectMultipleFilterPlain.example'; import * as StripeBankAccountTokenInputField from './components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.example'; import * as TabNav from './components/TabNav/TabNav.example'; import * as TabNavHorizontal from './components/TabNavHorizontal/TabNavHorizontal.example'; @@ -141,7 +141,7 @@ export { SectionThumbnailLinks, SelectField, SelectMultipleFilter, - SelectMultipleFilterMobile, + SelectMultipleFilterPlain, SendMessageForm, SignupForm, StripeBankAccountTokenInputField, diff --git a/src/translations/en.json b/src/translations/en.json index d513ca14..332f844b 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -532,10 +532,10 @@ "SelectMultipleFilterForm.cancel": "Cancel", "SelectMultipleFilterForm.clear": "Clear", "SelectMultipleFilterForm.submit": "Apply", - "SelectMultipleFilterMobileForm.clear": "Clear", - "SelectMultipleFilterMobileForm.labelSelected": "{labelText} • {count}", + "SelectMultipleFilterPlainForm.clear": "Clear", + "SelectMultipleFilterPlainForm.labelSelected": "{labelText} • {count}", "SelectSingleFilter.clear": "Clear", - "SelectSingleFilterMobile.clear": "Clear", + "SelectSingleFilterPlain.clear": "Clear", "SendMessageForm.sendFailed": "Failed to send. Please try again.", "SendMessageForm.sendMessage": "Send message", "SignupForm.emailInvalid": "A valid email address is required",