Changed SuggestionBox to clear its suggestions on losing focus

Этот коммит содержится в:
hmhealey
2015-12-03 15:13:25 -05:00
родитель b69cc7a94a
Коммит f103e4c815
6 изменённых файлов: 19 добавлений и 33 удалений

Просмотреть файл

@@ -35,7 +35,7 @@ export default class SearchSuggestionList extends SuggestionList {
}
render() {
if (this.state.items.length === 0 || !this.props.show) {
if (this.state.items.length === 0) {
return null;
}

Просмотреть файл

@@ -13,7 +13,6 @@ export default class SuggestionBox extends React.Component {
super(props);
this.handleDocumentClick = this.handleDocumentClick.bind(this);
this.handleFocus = this.handleFocus.bind(this);
this.handleChange = this.handleChange.bind(this);
this.handleCompleteWord = this.handleCompleteWord.bind(this);
@@ -21,10 +20,6 @@ export default class SuggestionBox extends React.Component {
this.handlePretextChanged = this.handlePretextChanged.bind(this);
this.suggestionId = Utils.generateId();
this.state = {
focused: false
};
}
componentDidMount() {
@@ -49,27 +44,11 @@ export default class SuggestionBox extends React.Component {
}
handleDocumentClick(e) {
if (!this.state.focused) {
return;
}
const container = $(ReactDOM.findDOMNode(this));
if (!(container.is(e.target) || container.has(e.target).length > 0)) {
// we can't just use blur for this because it fires and hides the children before
// their click handlers can be called
this.setState({
focused: false
});
}
}
handleFocus() {
this.setState({
focused: true
});
if (this.props.onFocus) {
this.props.onFocus();
EventHelpers.emitClearSuggestions(this.suggestionId);
}
}
@@ -134,7 +113,6 @@ export default class SuggestionBox extends React.Component {
render() {
const newProps = Object.assign({}, this.props, {
onFocus: this.handleFocus,
onChange: this.handleChange,
onKeyDown: this.handleKeyDown
});
@@ -162,10 +140,7 @@ export default class SuggestionBox extends React.Component {
return (
<div>
{textbox}
<SuggestionListComponent
suggestionId={this.suggestionId}
show={this.state.focused}
/>
<SuggestionListComponent suggestionId={this.suggestionId} />
</div>
);
}
@@ -184,6 +159,5 @@ SuggestionBox.propTypes = {
// explicitly name any input event handlers we override and need to manually call
onChange: React.PropTypes.func,
onKeyDown: React.PropTypes.func,
onFocus: React.PropTypes.func
onKeyDown: React.PropTypes.func
};

Просмотреть файл

@@ -82,7 +82,7 @@ export default class SuggestionList extends React.Component {
}
render() {
if (this.state.items.length === 0 || !this.props.show) {
if (this.state.items.length === 0) {
return null;
}
@@ -121,6 +121,5 @@ export default class SuggestionList extends React.Component {
}
SuggestionList.propTypes = {
suggestionId: React.PropTypes.string.isRequired,
show: React.PropTypes.bool.isRequired
suggestionId: React.PropTypes.string.isRequired
};