Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoComplete] Migrate to use popover #2634

Merged
merged 1 commit into from
Dec 23, 2015
Merged

[AutoComplete] Migrate to use popover #2634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 57 additions & 17 deletions src/auto-complete.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
import React from 'react';
import ReactTransitionGroup from 'react-addons-transition-group';
import ReactDOM from 'react-dom';
import StylePropable from './mixins/style-propable';
import ClickAwayable from './mixins/click-awayable';
import KeyCode from './utils/key-code';
import TextField from './text-field';
import Menu from './menus/menu';
import MenuItem from './menus/menu-item';
import Divider from './divider';
import Popover from './popover/popover';
import PropTypes from './utils/prop-types';

const AutoComplete = React.createClass({

mixins: [
StylePropable,
ClickAwayable,
],

contextTypes: {
muiTheme: React.PropTypes.object,
},

propTypes: {
anchorOrigin: PropTypes.origin,
animated: React.PropTypes.bool,
dataSource: React.PropTypes.array,
disableFocusRipple: React.PropTypes.bool,
Expand All @@ -39,12 +40,21 @@ const AutoComplete = React.createClass({
searchText: React.PropTypes.string,
showAllItems: React.PropTypes.bool,
style: React.PropTypes.object,
targetOrigin: PropTypes.origin,
touchTapCloseDelay: React.PropTypes.number,
updateWhenFocused: React.PropTypes.bool,
},

getDefaultProps() {
return {
anchorOrigin: {
vertical: 'bottom',
horizontal: 'left',
},
targetOrigin: {
vertical: 'top',
horizontal: 'left',
},
animated: true,
fullWidth: false,
open: false,
Expand All @@ -63,6 +73,7 @@ const AutoComplete = React.createClass({
return {
searchText: this.props.searchText,
open: this.props.open,
anchorEl: null,
};
},
componentWillReceiveProps: function(nextProps) {
Expand All @@ -78,12 +89,13 @@ const AutoComplete = React.createClass({
},

componentClickAway() {
this.setState({open: false});
this._close();
this.focusOnInput = false;
},

render() {
let {
anchorOrigin,
animated,
style,
errorStyle,
Expand All @@ -94,9 +106,12 @@ const AutoComplete = React.createClass({
menuProps,
listStyle,
showAllItems,
targetOrigin,
...other,
} = this.props;

const {open, anchorEl} = this.state;

let styles = {
root: {
display: 'inline-block',
Expand All @@ -108,8 +123,6 @@ const AutoComplete = React.createClass({
error: {
},
menu: {
top: this.props.floatingLabelText ? 64 : 40,
left: 0,
width: '100%',
},
list: {
Expand Down Expand Up @@ -155,19 +168,17 @@ const AutoComplete = React.createClass({

this.requestsList = requestsList;

let menu = this.state.open && (this.state.searchText !== '' || showAllItems)
let menu = open && (this.state.searchText !== '' || showAllItems)
&& requestsList.length > 0 ? (
<Menu
{...menuProps}
ref="menu"
key="dropDownMenu"
animated={animated}
autoWidth={false}
onEscKeyDown={this._close}
initiallyKeyboardFocused={false}
onEscKeyDown={() => this.setState({open: false})}
onItemTouchTap={this._handleItemTouchTap}
listStyle={this.mergeAndPrefix(styles.list, listStyle)}
openDirection="bottom-left"
style={mergedMenuStyles}>
{
requestsList.map((request, index) => {
Expand Down Expand Up @@ -201,6 +212,11 @@ const AutoComplete = React.createClass({
</Menu>
) : null;

let popoverStyle;
if (anchorEl && fullWidth) {
popoverStyle = {width: anchorEl.clientWidth};
}

return (
<div style={mergedRootStyles}
onKeyDown={this._handleKeyDown}>
Expand All @@ -214,7 +230,7 @@ const AutoComplete = React.createClass({
value={this.state.searchText}
onEnterKeyDown={() => {
setTimeout(() => {
this.setState({open: false});
this._close();
}, this.props.touchTapCloseDelay);
this.props.onNewRequest(this.state.searchText);
}}
Expand All @@ -223,11 +239,11 @@ const AutoComplete = React.createClass({
this._updateRequests(searchText);
}}
onBlur={() => {
if (this.focusOnInput && this.state.open)
if (this.focusOnInput && open)
this.refs.searchTextField.focus();
}}
onFocus={() => {
if (!this.state.open && ( showAllItems ||
if (!open && ( showAllItems ||
this.props.updateWhenFocused || this.state.searchText !== '')) {
this._updateRequests(this.state.searchText);
}
Expand All @@ -236,11 +252,34 @@ const AutoComplete = React.createClass({

{...textFieldProps} />
</div>
<ReactTransitionGroup>{menu}</ReactTransitionGroup>
<Popover
style={popoverStyle}
anchorOrigin={anchorOrigin}
targetOrigin={targetOrigin}
open={open}
anchorEl={anchorEl}
useLayerForClickAway={false}
onRequestClose={this._close}>
{menu}
</Popover>
</div>
);
},

_open() {
this.setState({
open: true,
anchorEl: ReactDOM.findDOMNode(this.refs.searchTextField),
});
},

_close() {
this.setState({
open: false,
anchorEl: null,
});
},

setValue(textValue) {
this.setState({
searchText: textValue,
Expand All @@ -256,6 +295,7 @@ const AutoComplete = React.createClass({
this.setState({
searchText: searchText,
open: true,
anchorEl: ReactDOM.findDOMNode(this.refs.searchTextField),
});

this.focusOnInput = true;
Expand All @@ -266,7 +306,7 @@ const AutoComplete = React.createClass({

_handleItemTouchTap(e, child) {
setTimeout(() => {
this.setState({open: false});
this._close();
}, this.props.touchTapCloseDelay);

let dataSource = this.props.dataSource;
Expand All @@ -293,13 +333,13 @@ const AutoComplete = React.createClass({
_handleKeyDown(e) {
switch (e.keyCode) {
case KeyCode.ESC:
this.setState({open: false});
this._close();
break;
case KeyCode.DOWN:
if (this.focusOnInput && this.state.open) {
e.preventDefault();
this.focusOnInput = false;
this.setState({open: true});
this._open();
}
break;
default:
Expand Down