Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored Async. Cache not yet implemented. Pushing for discussion
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,181 +1,145 @@ | ||
| import React, { Component, PropTypes } from 'react'; | ||
| import Select from './Select'; | ||
| import stripDiacritics from './utils/stripDiacritics'; | ||
|
|
||
| // @TODO Implement cache | ||
|
|
||
| const propTypes = { | ||
| autoload: React.PropTypes.bool.isRequired, | ||
| children: React.PropTypes.func.isRequired, // Child function responsible for creating the inner Select component; (props: Object): PropTypes.element | ||
| ignoreAccents: React.PropTypes.bool, // whether to strip diacritics when filtering (shared with Select) | ||
| ignoreCase: React.PropTypes.bool, // whether to perform case-insensitive filtering (shared with Select) | ||
| loadingPlaceholder: PropTypes.string.isRequired, | ||
| loadOptions: React.PropTypes.func.isRequired, | ||
| options: PropTypes.array.isRequired, | ||
| placeholder: React.PropTypes.oneOfType([ | ||
| React.PropTypes.string, | ||
| React.PropTypes.node | ||
| ]), | ||
| searchPromptText: React.PropTypes.oneOfType([ | ||
| React.PropTypes.string, | ||
| React.PropTypes.node | ||
| ]), | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| autoload: true, | ||
| children: defaultChildren, | ||
| ignoreAccents: true, | ||
| ignoreCase: true, | ||
| loadingPlaceholder: 'Loading...', | ||
| options: [], | ||
| searchPromptText: 'Type to search', | ||
| }; | ||
|
|
||
| export default class Async extends Component { | ||
| constructor (props, context) { | ||
| super(props, context); | ||
|
|
||
| this.state = { | ||
| isLoading: false, | ||
| options: props.options, | ||
| }; | ||
|
|
||
| this._onInputChange = this._onInputChange.bind(this); | ||
| } | ||
|
|
||
| componentDidMount () { | ||
| const { autoload } = this.props; | ||
|
|
||
| if (autoload) { | ||
| this.loadOptions(''); | ||
| } | ||
| } | ||
|
|
||
| componentWillUpdate (nextProps, nextState) { | ||
| const propertiesToSync = ['options']; | ||
| propertiesToSync.forEach((prop) => { | ||
| if (this.props[prop] !== nextProps[prop]) { | ||
| this.setState({ | ||
| [prop]: nextProps[prop] | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| loadOptions (inputValue) { | ||
| const { loadOptions } = this.props; | ||
|
|
||
| const callback = (error, data) => { | ||
| if (callback === this._callback) { | ||
| this._callback = null; | ||
|
|
||
| const options = data && data.options || []; | ||
|
|
||
| this.setState({ | ||
| isLoading: false, | ||
| options | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| // Ignore all but the most recent request | ||
| this._callback = callback; | ||
|
|
||
| const promise = loadOptions(inputValue, callback); | ||
| if (promise) { | ||
| promise.then( | ||
| (data) => callback(null, data), | ||
| (error) => callback(error) | ||
| ); | ||
| } | ||
This comment has been minimized.
Sorry, something went wrong. |
||
|
|
||
| if ( | ||
| this._callback && | ||
| !this.state.isLoading | ||
| ) { | ||
| this.setState({ | ||
| isLoading: true | ||
| }); | ||
| } | ||
|
|
||
| return inputValue; | ||
| } | ||
|
|
||
| _onInputChange (inputValue) { | ||
| const { ignoreAccents, ignoreCase } = this.props; | ||
|
|
||
| if (ignoreAccents) { | ||
| inputValue = stripDiacritics(inputValue); | ||
| } | ||
|
|
||
| if (ignoreCase) { | ||
| inputValue = inputValue.toLowerCase(); | ||
| } | ||
|
|
||
| return this.loadOptions(inputValue); | ||
| } | ||
|
|
||
| render () { | ||
| const { children, loadingPlaceholder, placeholder, searchPromptText } = this.props; | ||
| const { isLoading, options } = this.state; | ||
|
|
||
| const props = { | ||
| noResultsText: isLoading ? loadingPlaceholder : searchPromptText, | ||
| placeholder: isLoading ? loadingPlaceholder : placeholder, | ||
| options: isLoading ? [] : options | ||
| }; | ||
|
|
||
| return children({ | ||
| ...this.props, | ||
| ...props, | ||
| isLoading, | ||
| onInputChange: this._onInputChange | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| Async.propTypes = propTypes; | ||
| Async.defaultProps = defaultProps; | ||
|
|
||
| function defaultChildren (props) { | ||
| return ( | ||
| <Select {...props} /> | ||
| ); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Was focus removed accidentally here? Or is there another reason?