fix(searchBox): add reusable SearchBox component (#3489)

algolia · Feb 25, 2019 · c073a9a · c073a9a
1 parent a2a800b
commit c073a9a
Show file tree

Hide file tree

Showing 16 changed files with 1,291 additions and 1,078 deletions.
diff --git a/src/components/RefinementList/RefinementList.js b/src/components/RefinementList/RefinementList.js
@@ -5,7 +5,7 @@ import isEqual from 'lodash/isEqual';
 import { isSpecialClick } from '../../lib/utils';
 import Template from '../Template/Template';
 import RefinementListItem from './RefinementListItem';
-import SearchBox from '../SearchBox/Searchbox';
+import SearchBox from '../SearchBox/SearchBox';
 
 class RefinementList extends Component {
   constructor(props) {
@@ -129,8 +129,8 @@ class RefinementList extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (this.searchbox && !nextProps.isFromSearch) {
-      this.searchbox.clearInput();
+    if (this.searchBox && !nextProps.isFromSearch) {
+      this.searchBox.resetInput();
     }
   }
 
@@ -177,13 +177,17 @@ class RefinementList extends Component {
     const searchBox = this.props.searchFacetValues && (
       <div className={this.props.cssClasses.searchBox}>
         <SearchBox
-          ref={i => {
-            this.searchbox = i;
-          }}
+          ref={searchBoxRef => (this.searchBox = searchBoxRef)}
           placeholder={this.props.searchPlaceholder}
-          onChange={this.props.searchFacetValues}
-          onValidate={() => this.refineFirstValue()}
           disabled={shouldDisableSearchBox}
+          cssClasses={this.props.cssClasses.searchable}
+          templates={this.props.templateProps.templates}
+          onChange={event => this.props.searchFacetValues(event.target.value)}
+          onReset={() => this.props.searchFacetValues('')}
+          onSubmit={() => this.refineFirstValue()}
+          // This sets the search box to a controlled state because
+          // we don't rely on the `refine` prop but on `onChange`.
+          searchAsYouType={false}
         />
       </div>
     );
@@ -247,6 +251,17 @@ RefinementList.propTypes = {
     showMore: PropTypes.string,
     disabledShowMore: PropTypes.string,
     disabledItem: PropTypes.string,
+    searchable: PropTypes.shape({
+      root: PropTypes.string,
+      form: PropTypes.string,
+      input: PropTypes.string,
+      submit: PropTypes.string,
+      submitIcon: PropTypes.string,
+      reset: PropTypes.string,
+      resetIcon: PropTypes.string,
+      loadingIndicator: PropTypes.string,
+      loadingIcon: PropTypes.string,
+    }),
   }).isRequired,
   depth: PropTypes.number,
   facetValues: PropTypes.array,

diff --git a/src/components/RefinementList/__tests__/RefinementList-test.js b/src/components/RefinementList/__tests__/RefinementList-test.js
@@ -28,6 +28,7 @@ describe('RefinementList', () => {
         ...defaultProps,
         cssClasses: {
           root: 'root',
+          searchable: {},
         },
       };
 
@@ -41,6 +42,7 @@ describe('RefinementList', () => {
         ...defaultProps,
         cssClasses: {
           item: 'item',
+          searchable: {},
         },
         facetValues: [{ value: 'foo', isRefined: true }],
       };
@@ -55,6 +57,7 @@ describe('RefinementList', () => {
         ...defaultProps,
         cssClasses: {
           selectedItem: 'active',
+          searchable: {},
         },
         facetValues: [
           { value: 'foo', isRefined: true },
@@ -232,6 +235,17 @@ describe('RefinementList', () => {
       noResults: 'noResults',
       showMore: 'showMore',
       disabledShowMore: 'disabledShowMore',
+      searchable: {
+        root: 'root',
+        form: 'form',
+        input: 'input',
+        submit: 'submit',
+        submitIcon: 'submitIcon',
+        reset: 'reset',
+        resetIcon: 'resetIcon',
+        loadingIndicator: 'loadingIndicator',
+        loadingIcon: 'loadingIcon',
+      },
     };
 
     it('without facets', () => {
@@ -263,6 +277,9 @@ describe('RefinementList', () => {
           templates: {
             item: item => item,
             searchableNoResults: x => x,
+            reset: 'reset',
+            submit: 'submit',
+            loadingIndicator: 'loadingIndicator',
           },
         },
         toggleRefinement: () => {},
@@ -397,6 +414,9 @@ describe('RefinementList', () => {
         templateProps: {
           templates: {
             item: item => item,
+            reset: 'reset',
+            submit: 'submit',
+            loadingIndicator: 'loadingIndicator',
           },
         },
         toggleRefinement: () => {},