Skip to content

Select: use bind sparingly #172

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

Merged
merged 1 commit into from
May 9, 2015
Merged

Select: use bind sparingly #172

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
60 changes: 34 additions & 26 deletions src/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,31 +98,32 @@ var Select = React.createClass({
this.autoloadAsyncOptions();
}

var self = this;
this._closeMenuIfClickedOutside = function(event) {
if (!this.state.isOpen) {
if (!self.state.isOpen) {
return;
}
var menuElem = this.refs.selectMenuContainer.getDOMNode();
var controlElem = this.refs.control.getDOMNode();
var menuElem = self.refs.selectMenuContainer.getDOMNode();
var controlElem = self.refs.control.getDOMNode();

var eventOccuredOutsideMenu = this.clickedOutsideElement(menuElem, event);
var eventOccuredOutsideControl = this.clickedOutsideElement(controlElem, event);
var eventOccuredOutsideMenu = self.clickedOutsideElement(menuElem, event);
var eventOccuredOutsideControl = self.clickedOutsideElement(controlElem, event);

// Hide dropdown menu if click occurred outside of menu
if (eventOccuredOutsideMenu && eventOccuredOutsideControl) {
this.setState({
self.setState({
isOpen: false
}, this._unbindCloseMenuIfClickedOutside);
}, self._unbindCloseMenuIfClickedOutside);
}
}.bind(this);
};

this._bindCloseMenuIfClickedOutside = (function() {
document.addEventListener('click', this._closeMenuIfClickedOutside);
}).bind(this);
this._bindCloseMenuIfClickedOutside = function() {
document.addEventListener('click', self._closeMenuIfClickedOutside);
};

this._unbindCloseMenuIfClickedOutside = (function() {
document.removeEventListener('click', this._closeMenuIfClickedOutside);
}).bind(this);
this._unbindCloseMenuIfClickedOutside = function() {
document.removeEventListener('click', self._closeMenuIfClickedOutside);
};
},

componentWillUnmount: function() {
Expand All @@ -147,12 +148,15 @@ var Select = React.createClass({
},

componentDidUpdate: function() {
var self = this;

if (!this.props.disabled && this._focusAfterUpdate) {
clearTimeout(this._blurTimeout);

this._focusTimeout = setTimeout(function() {
this.getInputNode().focus();
this._focusAfterUpdate = false;
}.bind(this), 50);
self.getInputNode().focus();
self._focusAfterUpdate = false;
}, 50);
}

if (this._focusedOptionReveal) {
Expand Down Expand Up @@ -320,12 +324,15 @@ var Select = React.createClass({
},

handleInputBlur: function(event) {
var self = this;

this._blurTimeout = setTimeout(function() {
if (this._focusAfterUpdate) return;
this.setState({
if (self._focusAfterUpdate) return;

self.setState({
isFocused: false
});
}.bind(this), 50);
}, 50);

if (this.props.onBlur) {
this.props.onBlur(event);
Expand Down Expand Up @@ -445,32 +452,33 @@ var Select = React.createClass({
}
}

var self = this;
this.props.asyncOptions(input, function(err, data) {

if (err) throw err;

this._optionsCache[input] = data;
self._optionsCache[input] = data;

if (thisRequestId !== this._currentRequestId) {
if (thisRequestId !== self._currentRequestId) {
return;
}
var filteredOptions = this.filterOptions(data.options);
var filteredOptions = self.filterOptions(data.options);

var newState = {
options: data.options,
filteredOptions: filteredOptions,
focusedOption: this._getNewFocusedOption(filteredOptions)
focusedOption: self._getNewFocusedOption(filteredOptions)
};
for (var key in state) {
if (state.hasOwnProperty(key)) {
newState[key] = state[key];
}
}
this.setState(newState);
self.setState(newState);

if(callback) callback({});

}.bind(this));
});
},

filterOptions: function(options, values) {
Expand Down