From 59dd1d9ea056425be757a0137e5731458ae68523 Mon Sep 17 00:00:00 2001 From: Jed Watson Date: Fri, 5 Sep 2014 17:17:29 +1000 Subject: [PATCH 01/31] Publishing examples to gh-pages --- LICENSE | 21 -- README.md | 49 --- .../public/build => build}/app-bundle.js | 0 {examples/public/build => build}/example.css | 0 .../public/build => build}/global-bundle.js | 0 .../public/build => build}/select-bundle.js | 0 dist/default.css | 118 ------- examples/src/app.js | 28 -- examples/src/example.less | 104 ------ gulpfile.js | 111 ------- examples/public/index.html => index.html | 0 less/default.less | 46 --- less/select-control.less | 102 ------ less/select-menu.less | 62 ---- less/select.less | 34 -- lib/select.js | 313 ------------------ package.json | 37 --- 17 files changed, 1025 deletions(-) delete mode 100644 LICENSE delete mode 100644 README.md rename {examples/public/build => build}/app-bundle.js (100%) rename {examples/public/build => build}/example.css (100%) rename {examples/public/build => build}/global-bundle.js (100%) rename {examples/public/build => build}/select-bundle.js (100%) delete mode 100644 dist/default.css delete mode 100644 examples/src/app.js delete mode 100644 examples/src/example.less delete mode 100644 gulpfile.js rename examples/public/index.html => index.html (100%) delete mode 100644 less/default.less delete mode 100644 less/select-control.less delete mode 100644 less/select-menu.less delete mode 100644 less/select.less delete mode 100644 lib/select.js delete mode 100644 package.json diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7862e5a65f..0000000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Jed Watson - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index 5be332b466..0000000000 --- a/README.md +++ /dev/null @@ -1,49 +0,0 @@ -React-Select -============ - -A Select control built with and for [React](http://facebook.github.io/react/index.html), initially being developed for use in [KeystoneJS](http://www.keystonejs.com). - -## Project Status - -This is currently a work in progress. - -It's loosely based on [Selectize](http://brianreavis.github.io/selectize.js/) (in terms of behaviour and user expereience) and [React-Autocomplete](https://github.com/rackt/react-autocomplete) (as a native React Combobox implemenation), as well as other select controls including [Chosen](http://harvesthq.github.io/chosen/) and [Select2](http://ivaynberg.github.io/select2/). - -TODO: - -- CSS Styles and theme support -- Multiselect -- Remote options loading -- Custom options rendering -- Cleanup of focus state management - -## Installation - -You currently need to install this component via NPM and include it in your own React build process (using [Browserify](http://browserify.org), etc). - -Standalone builds will be available in the future. - -``` -npm install react-select --save -``` - -## Usage - -React-Select generates a hidden text field containing the selected value, so you can submit it as part of a standard form. - -Options should be provided as an `Array` of `Object`s, each with a `value` and `label` property for rendering and searching. - -``` -var Select = require('react-select'); - -var options = [ - { value: 'one', label: 'One' }, - { value: 'two', label: 'Two' } -]; - - - ; - } -}); - -React.renderComponent( - , - document.getElementById('example') -); diff --git a/examples/src/example.less b/examples/src/example.less deleted file mode 100644 index 75f77dc635..0000000000 --- a/examples/src/example.less +++ /dev/null @@ -1,104 +0,0 @@ -// -// Common Example Styles -// ------------------------------ - - - -// Body - -body { - font-family: Helvetica Neue, Helvetica, Arial, sans-serif; - font-size: 14px; - color: #333; - margin: 0; - padding: 0; -} - -a { - color: #08c; - text-decoration: none; - - &:hover { - text-decoration: underline; - } -} - -.container { - margin-left: auto; - margin-right: auto; - max-width: 600px; - padding: 1em; -} - -.footer { - margin-top: 50px; - border-top: 1px solid #eee; - padding: 20px 0; - font-size: 12px; - color: #999; -} - - -// Type - -h1,h2,h3,h4,h5,h6 { - color: #222; - font-weight: 100; - margin: 0.5em 0; -} - - -// Forms - -label { - color: #999; - display: inline-block; - font-size: 0.85em; - font-weight: bold; - margin: 1em 0; - text-transform: uppercase; -} - -/* - -// include these styles to test normal form fields - -.form-input { - margin-bottom: 15px; -} - -.form-input input { - - font-size: 14px; - width: 100%; - background-color: white; - border: 1px solid @select-input-border-color; - border-color: lighten(@select-input-border-color, 5%) @select-input-border-color darken(@select-input-border-color, 10%); - border-radius: @select-input-border-radius; - box-sizing: border-box; - color: @select-text-color; - outline: none; - padding: @select-padding-vertical @select-padding-horizontal; - transition: all 200ms ease; - - &:hover { - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06); - } - - &:focus { - border-color: @select-input-border-focus lighten(@select-input-border-focus, 5%) lighten(@select-input-border-focus, 5%); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 5px -1px fade(@select-input-border-focus,50%); - } -} - -*/ - -.form-toolbar { - margin-top: 15px; -} - - -// -// Select Control -// ------------------------------ -@import "../../less/default.less"; diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index bdd94cf98e..0000000000 --- a/gulpfile.js +++ /dev/null @@ -1,111 +0,0 @@ -var del = require('del'), - gulp = require('gulp'), - gutil = require('gulp-util'), - less = require('gulp-less'), - browserify = require('browserify'), - watchify = require('watchify'), - reactify = require('reactify'), - source = require('vinyl-source-stream'), - merge = require('merge-stream'), - chalk = require('chalk'); - -/** - * Clean Everything - */ - -gulp.task('clean', function(done) { - del(['./examples/public/build'], done); -}); - -/** - * Build Default theme from LESS - */ - -gulp.task('less', function() { - return gulp.src('less/default.less') - .pipe(less()) - .pipe(gulp.dest('dist')); -}); - - -/** - * Build Examples - */ - -function doBundle(target, name, dest) { - return target.bundle() - .on('error', function(e) { - gutil.log('Browserify Error', e); - }) - .pipe(source(name)) - .pipe(gulp.dest(dest)); -} - -function watchBundle(target, name, dest) { - return watchify(target) - .on('update', function (scriptIds) { - scriptIds = scriptIds - .filter(function(i) { return i.substr(0,2) !== './' }) - .map(function(i) { return chalk.blue(i.replace(__dirname, '')) }); - if (scriptIds.length > 1) { - gutil.log(scriptIds.length + ' Scripts updated:\n* ' + scriptIds.join('\n* ') + '\nrebuilding...'); - } else { - gutil.log(scriptIds[0] + ' updated, rebuilding...'); - } - doBundle(target, name, dest); - }) - .on('time', function (time) { - gutil.log(chalk.green(name + ' built in ' + (Math.round(time / 10) / 100) + 's')); - }); -} - -function buildExamples(watch) { - - var opts = watch ? watchify.args : {}; - - opts.debug = true; - opts.hasExports = true; - - var dest = './examples/public/build'; - - var common = browserify(opts) - .require('react') - .require('underscore'); - - var select = browserify(opts) - .exclude('react') - .exclude('underscore') - .require('./lib/select.js', { expose: 'react-select' }); - - var app = browserify(opts) - .add('./examples/src/app.js') - .exclude('react') - .exclude('react-select') - .transform(reactify); - - var lessToCSS = gulp.src('examples/src/example.less') - .pipe(less()) - .pipe(gulp.dest(dest)); - - if (watch) { - watchBundle(app, 'app-bundle.js', dest); - watchBundle(select, 'select-bundle.js', dest); - // TODO: Watch LESS - } - - return merge( - doBundle(app, 'app-bundle.js', dest), - doBundle(select, 'select-bundle.js', dest), - doBundle(common, 'global-bundle.js', dest), - lessToCSS - ); - -} - -gulp.task('build-examples', ['clean'], function() { - return buildExamples(); -}); - -gulp.task('watch-examples', ['clean'], function() { - return buildExamples(true); -}); diff --git a/examples/public/index.html b/index.html similarity index 100% rename from examples/public/index.html rename to index.html diff --git a/less/default.less b/less/default.less deleted file mode 100644 index b12d82bbc5..0000000000 --- a/less/default.less +++ /dev/null @@ -1,46 +0,0 @@ -/** - * React Select - * ============ - * Created by Jed Watson and Joss Mackison for KeystoneJS, http://www.keystonejs.com/ - * https://twitter.com/jedwatson https://twitter.com/jossmackison https://twitter.com/keystonejs - * MIT License: https://github.com/keystonejs/react-select -*/ - -// -// Select Variables -// ------------------------------ - -@select-text-color: #333; -@select-input-border-color: #ccc; -@select-input-border-radius: 4px; -@select-input-placeholder: #aaa; -@select-input-border-focus: #08c; // blue - -@select-padding-vertical: 6px; -@select-padding-horizontal: 10px; - -@select-arrow-color: #999; - -@select-menu-zindex: 1000; - -@select-option-color: lighten(@select-text-color, 20%); -@select-option-focused-color: @select-text-color; -@select-option-focused-bg: #f2f9fc; // pale blue - -@select-noresults-color: lighten(@select-text-color, 40%); - -@select-clear-color: #999; -@select-clear-hover-color: #c0392b; // red - - -// wrapper - -.Select { - position: relative; -} - -// -// Imports -// ------------------------------ -@import "select-control.less"; -@import "select-menu.less"; diff --git a/less/select-control.less b/less/select-control.less deleted file mode 100644 index c5bbad3740..0000000000 --- a/less/select-control.less +++ /dev/null @@ -1,102 +0,0 @@ -// -// Control -// ------------------------------ - - -// base - -.Select-control { - background-color: white; - border: 1px solid @select-input-border-color; - border-color: lighten(@select-input-border-color, 5%) @select-input-border-color darken(@select-input-border-color, 10%); - border-radius: @select-input-border-radius; - box-sizing: border-box; - color: @select-text-color; - cursor: pointer; - outline: none; - padding: @select-padding-vertical @select-padding-horizontal; - transition: all 200ms ease; - - &:hover { - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06); - } -} - -.is-open > .Select-control { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - background: white; - border-color: darken(@select-input-border-color, 10%) @select-input-border-color lighten(@select-input-border-color, 5%); - cursor: text; - - // flip the arrow so its pointing up when the menu is open - > .Select-indicator { - border-color: transparent transparent @select-arrow-color; - border-width: 0 5px 5px; - } -} - -.is-focused:not(.is-open) > .Select-control { - border-color: @select-input-border-focus lighten(@select-input-border-focus, 5%) lighten(@select-input-border-focus, 5%); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 5px -1px fade(@select-input-border-focus,50%); - cursor: text; -} - - -// indicator arrow - -.Select-indicator { - border-color: @select-arrow-color transparent transparent; - border-style: solid; - border-width: 5px 5px 0; - content: " "; - display: block; - height: 0; - margin-top: -3px; - position: absolute; - right: @select-padding-horizontal; - top: 50%; - width: 0; -} - - -// the actual element users type in - -.Select-input { - background: none transparent; - border: 0 none; - cursor: pointer; - font-family: inherit; - font-size: inherit; - outline: none; - width: 100%; - -webkit-appearance: none; - - &::-moz-placeholder { color: @select-input-placeholder; - opacity: 1; } - &:-ms-input-placeholder { color: @select-input-placeholder; } - &::-webkit-input-placeholder { color: @select-input-placeholder; } - - .is-focused & { - cursor: text; - } -} - - -// the little cross that clears the field - -.Select-clear { - // todo: animate transition in - color: @select-clear-color; - cursor: pointer; - display: inline-block; - font-size: 1.1em; // make a bit more visible and fix line-height issue - padding: @select-padding-vertical @select-padding-horizontal; - position: absolute; - right: (@select-padding-horizontal * 2); - top: 0; - - &:hover { - color: @select-clear-hover-color; - } -} diff --git a/less/select-menu.less b/less/select-menu.less deleted file mode 100644 index 3013b4b1a3..0000000000 --- a/less/select-menu.less +++ /dev/null @@ -1,62 +0,0 @@ -// -// Select Menu -// ------------------------------ - - -// wrapper - -.Select-menu { - border-bottom-left-radius: @select-input-border-radius; - border-bottom-right-radius: @select-input-border-radius; - background-color: white; - border: 1px solid @select-input-border-color; - border-top-color: mix(white, @select-input-border-color, 50%); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06); - box-sizing: border-box; - margin-top: -1px; - max-height: 200px; - overflow-y: auto; - position: absolute; - top: 100%; - width: 100%; - z-index: @select-menu-zindex; - -webkit-overflow-scrolling: touch; -} - - -// options - -.Select-option { - box-sizing: border-box; - color: @select-option-color; - cursor: pointer; - display: block; - padding: @select-padding-vertical @select-padding-horizontal; - - &:last-child { - border-bottom-left-radius: @select-input-border-radius; - border-bottom-right-radius: @select-input-border-radius; - } - - &.is-focused { - background-color: @select-option-focused-bg; - color: @select-option-focused-color; - } - -} - - -// no results - -.Select-noresults { - box-sizing: border-box; - color: @select-noresults-color; - cursor: default; - display: block; - padding: @select-padding-vertical @select-padding-horizontal; - - &:last-child { - border-bottom-left-radius: @select-input-border-radius; - border-bottom-right-radius: @select-input-border-radius; - } -} diff --git a/less/select.less b/less/select.less deleted file mode 100644 index b01af94492..0000000000 --- a/less/select.less +++ /dev/null @@ -1,34 +0,0 @@ -/** - * React Select - * ============ - * Created by Jed Watson and Joss Mackison for KeystoneJS, http://www.keystonejs.com/ - * https://twitter.com/jedwatson https://twitter.com/jossmackison https://twitter.com/keystonejs - * MIT License: https://github.com/keystonejs/react-select -*/ - -/* - -Variables ---------- - -Ensure you have the following variables set before importing this file: - -@select-text-color -@select-input-border-color -@select-input-border-radius -@select-input-placeholder -@select-padding-vertical -@select-padding-horizontal -@select-arrow-color -@select-menu-zindex -@select-option-color -@select-option-focused-color -@select-option-focused-bg -@select-noresults-color -@select-clear-color -@select-clear-hover-color - -*/ - -@import "select-control.less"; -@import "select-menu.less"; diff --git a/lib/select.js b/lib/select.js deleted file mode 100644 index 6664fa1329..0000000000 --- a/lib/select.js +++ /dev/null @@ -1,313 +0,0 @@ -/** @jsx React.DOM */ - -var _ = require('underscore'), - React = require('react'); - -var noop = function() {}; - -var logEvent = function(msg) { - console.log(msg); -}; - -// comment out this line to debug the control state -logEvent = noop; - -var classes = function() { - var rtn = []; - for (var i = 0; i < arguments.length; i++) { - if ('string' === typeof arguments[i]) { - rtn.push(arguments[i]); - } else if (_.isObject(arguments[i])) { - _.each(arguments[i], function(val, key) { - if (val) { - rtn.push(key); - } - }); - } - } - return rtn.join(' ') || undefined; -} - -var Select = React.createClass({ - - getInitialState: function() { - return { - value: this.props.value, - inputValue: '', - placeholder: '', - focusedOption: null, - isFocused: false, - isOpen: false - }; - }, - - componentWillMount: function() { - this.setState(this.getStateFromValue(this.state.value)); - }, - - getStateFromValue: function(value) { - var selectedOption = ('string' === typeof value) ? _.findWhere(this.props.options, { value: value }) : value; - return selectedOption ? { - value: value, - inputValue: selectedOption.label, - placeholder: selectedOption.label, - focusedOption: selectedOption - } : { - value: '', - inputValue: '', - placeholder: this.props.placeholder || 'Select...', - focusedOption: null - }; - }, - - keyboardActions: { - 13: 'selectFocusedOption', - 27: 'closeOnEscape', - 38: 'focusPreviousOption', - 40: 'focusNextOption' - }, - - handleKeyDown: function(event) { - logEvent('------'); - logEvent(event); - var action = this.keyboardActions[event.keyCode]; - if (!action) { - return; - } - event.preventDefault(); - this[action].call(this); - }, - - handleMouseDown: function() { - logEvent('click: control'); - if (this.state.isOpen) { - this.setState({ - isOpen: false - }); - this._controlIsFocused = true; - this.refs.control.getDOMNode().focus(); - clearTimeout(this.blurTimer); - } else { - this.setState({ - isOpen: true, - inputValue: '' - }); - if (!this._inputIsFocused) { - this.refs.input.getDOMNode().focus(); - } - } - }, - - handleFocus: function() { - if (this._controlIsFocused) return; - logEvent('focus: control'); - this._controlIsFocused = true; - clearTimeout(this.blurTimer); - setTimeout(function() { - if (!this._inputIsFocused) { - this.refs.input.getDOMNode().focus(); - } - }.bind(this), 0); - this.setState({ - isFocused: true - }); - }, - - handleBlur: function(event) { - if (!this._controlIsFocused) return; - this._controlIsFocused = false; - clearTimeout(this.blurTimer); - this.blurTimer = setTimeout(function() { - logEvent('blur: control'); - var blurState = this.getStateFromValue(this.state.value); - blurState.isFocused = false; - blurState.isOpen = false; - this.setState(blurState); - }.bind(this), 100); - }, - - handleInputMouseDown: function(event) { - if (this._inputIsFocused) { - logEvent('click: input'); - event.stopPropagation(); - } - }, - - handleInputFocus: function(event) { - logEvent('focus: input'); - clearTimeout(this.blurTimer); - this._inputIsFocused = true; - }, - - handleInputBlur: function(event) { - logEvent('blur: input'); - this._inputIsFocused = false; - }, - - handleInputChange: function(event) { - this.setState({ - isOpen: true, - inputValue: event.target.value - }); - }, - - selectOption: function(option) { - this.setValue(option); - this.refs.control.getDOMNode().focus(); - }, - - setValue: function(option) { - var newState = this.getStateFromValue(option); - newState.isOpen = false; - this.setState(newState); - }, - - selectFocusedOption: function() { - return this.setValue(this.state.focusedOption); - }, - - clearValue: function(event) { - logEvent('clear value'); - this.setValue(null); - }, - - closeOnEscape: function() { - this.setValue(this.state.value); - }, - - focusOption: function(op) { - this.setState({ - focusedOption: op - }); - }, - - unfocusOption: function(op) { - if (this.state.focusedOption === op) { - this.setState({ - focusedOption: null - }); - } - }, - - focusNextOption: function() { - this.focusAdjacentOption('next'); - }, - - focusPreviousOption: function() { - this.focusAdjacentOption('previous'); - }, - - focusAdjacentOption: function(dir) { - - if (!this.state.isOpen) { - this.setState({ - isOpen: true, - inputValue: '' - }); - return; - } - - var ops = this.filterOptions(); - - if (!ops.length) { - return; - } - - var focusedIndex = -1; - - for (var i = 0; i < ops.length; i++) { - if (this.state.focusedOption === ops[i]) { - focusedIndex = i; - break; - } - } - - var focusedOption = ops[0]; - - if (dir === 'next' && focusedIndex > -1 && focusedIndex < ops.length - 1) { - focusedOption = ops[focusedIndex + 1]; - } else if (dir === 'previous') { - if (focusedIndex > 0) { - focusedOption = ops[focusedIndex - 1]; - } else { - focusedOption = ops[ops.length - 1]; - } - } - - this.setState({ - focusedOption: focusedOption - }); - - }, - - filterOptions: function() { - return _.filter(this.props.options, this.filterOption, this); - }, - - filterOption: function(op) { - return ( - !this.state.inputValue - || op.value.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0 - || op.label.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0 - ); - }, - - getOptions: function() { - - var ops = {}; - - _.each(this.filterOptions(), function(op) { - - var optionClass = classes({ - 'Select-option': true, - 'is-focused': this.state.focusedOption === op - }); - - var mouseEnter = this.focusOption.bind(this, op), - mouseLeave = this.unfocusOption.bind(this, op), - mouseDown = this.selectOption.bind(this, op); - - ops[op.value] = React.DOM.div({ - className: optionClass, - onMouseEnter: mouseEnter, - onMouseLeave: mouseLeave, - onMouseDown: mouseDown - }, op.label); - - }, this); - - if (_.isEmpty(ops)) { - ops._no_ops = React.DOM.div({className: "Select-noresults"}, "No results found"); - } - - return ops; - - }, - - render: function() { - - logEvent('render'); - // console.log(this.state); - - var menu = this.state.isOpen ? React.DOM.div({ className: "Select-menu" }, this.getOptions()) : null; - var clear = this.state.value ? React.DOM.span({ className: "Select-clear", onClick: this.clearValue, dangerouslySetInnerHTML: { __html: '×' } }) : null; - - var selectClass = classes('Select', { - 'is-open': this.state.isOpen, - 'is-focused': this.state.isFocused - }); - - return React.DOM.div({ className: selectClass }, - React.DOM.input({ type: "hidden", ref: "value", name: this.props.name, value: this.state.value }), - React.DOM.div({ className: "Select-control", tabIndex: "-1", ref: "control", onKeyDown: this.handleKeyDown, onMouseDown: this.handleMouseDown, onFocus: this.handleFocus, onBlur: this.handleBlur }, - React.DOM.input({ className: "Select-input", placeholder: this.state.placeholder, ref: "input", onMouseDown: this.handleInputMouseDown, value: this.state.inputValue, onFocus: this.handleInputFocus, onBlur: this.handleInputBlur, onChange: this.handleInputChange }), - React.DOM.span({ className: "Select-indicator" }), - clear - ), - menu - ); - } - -}); - -module.exports = Select; diff --git a/package.json b/package.json deleted file mode 100644 index 08ab6fba7e..0000000000 --- a/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "react-select", - "version": "0.0.3", - "description": "A Select control built with and for React", - "main": "lib/select.js", - "author": "Jed Watson", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/JedWatson/react-select.git" - }, - "dependencies": { - "underscore": "~1.7.0", - "react": "~0.11.1" - }, - "devDependencies": { - "browserify": "~5.11.1", - "chalk": "~0.5.1", - "del": "~0.1.2", - "gulp": "~3.8.5", - "gulp-less": "~1.3.5", - "gulp-util": "~3.0.0", - "merge-stream": "~0.1.5", - "reactify": "~0.14.0", - "vinyl-source-stream": "~0.1.1", - "watchify": "~1.0.1" - }, - "scripts": { - "test": "echo \"no tests yet\" && exit 0" - }, - "tags": [ - "react", - "combobox", - "select", - "ui" - ] -} From f5b45a16dc40524ca18e1e4d6393cc5f5495a740 Mon Sep 17 00:00:00 2001 From: Jed Watson Date: Tue, 9 Sep 2014 15:20:21 +1000 Subject: [PATCH 02/31] Update 2014-09-09T05:20:21.227Z --- .gitignore | 23 --------- build/app-bundle.js | 56 ++++++++++++++++++++- build/example.css | 46 +++++++++++++---- build/select-bundle.js | 109 ++++++++++++++++++++++++++++++++--------- index.html | 4 ++ 5 files changed, 181 insertions(+), 57 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 336f730cec..0000000000 --- a/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# Logs -logs -*.log - -# Runtime data -pids -*.pid -*.seed - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release - -# Dependency directory -node_modules diff --git a/build/app-bundle.js b/build/app-bundle.js index 1cb38b7859..f751a898f1 100755 --- a/build/app-bundle.js +++ b/build/app-bundle.js @@ -22,11 +22,63 @@ var SelectField = React.createClass({displayName: 'SelectField', ); } }); + +var RemoteSelectField = React.createClass({displayName: 'RemoteSelectField', + loadOptions: function(input, callback) { + + var rtn = { + options: [ + { label: 'One', value: 'one' }, + { label: 'Two', value: 'two' }, + { label: 'Three', value: 'three' } + ], + complete: true + }; + + if (input.slice(0,1) === 'a') { + if (input.slice(0,2) === 'ab') { + rtn = { + options: [ + { label: 'AB', value: 'ab' }, + { label: 'ABC', value: 'abc' }, + { label: 'ABCD', value: 'abcd' } + ], + complete: true + }; + } else { + rtn = { + options: [ + { label: 'A', value: 'a' }, + { label: 'AA', value: 'aa' }, + { label: 'AB', value: 'ab' } + ], + complete: false + }; + } + } else if (!input.length) { + rtn.complete = false; + } + + setTimeout(function() { + callback(null, rtn); + }, 500); + + }, + render: function() { + return React.DOM.div(null, + React.DOM.label(null, this.props.label), + Select({asyncOptions: this.loadOptions, value: this.props.value}) + ); + } +}); React.renderComponent( - SelectField({label: "State:"}), + React.DOM.div(null, + SelectField({label: "State:"}), + RemoteSelectField({label: "Remote:"}) + ), document.getElementById('example') ); },{"react":undefined,"react-select":undefined}]},{},[1]) -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9Vc2Vycy9KZWQvRGV2ZWxvcG1lbnQvUGFja2FnZXMvcmVhY3Qtc2VsZWN0L25vZGVfbW9kdWxlcy9icm93c2VyaWZ5L25vZGVfbW9kdWxlcy9icm93c2VyLXBhY2svX3ByZWx1ZGUuanMiLCIuL2V4YW1wbGVzL3NyYy9hcHAuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7QUNBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIoZnVuY3Rpb24gZSh0LG4scil7ZnVuY3Rpb24gcyhvLHUpe2lmKCFuW29dKXtpZighdFtvXSl7dmFyIGE9dHlwZW9mIHJlcXVpcmU9PVwiZnVuY3Rpb25cIiYmcmVxdWlyZTtpZighdSYmYSlyZXR1cm4gYShvLCEwKTtpZihpKXJldHVybiBpKG8sITApO3ZhciBmPW5ldyBFcnJvcihcIkNhbm5vdCBmaW5kIG1vZHVsZSAnXCIrbytcIidcIik7dGhyb3cgZi5jb2RlPVwiTU9EVUxFX05PVF9GT1VORFwiLGZ9dmFyIGw9bltvXT17ZXhwb3J0czp7fX07dFtvXVswXS5jYWxsKGwuZXhwb3J0cyxmdW5jdGlvbihlKXt2YXIgbj10W29dWzFdW2VdO3JldHVybiBzKG4/bjplKX0sbCxsLmV4cG9ydHMsZSx0LG4scil9cmV0dXJuIG5bb10uZXhwb3J0c312YXIgaT10eXBlb2YgcmVxdWlyZT09XCJmdW5jdGlvblwiJiZyZXF1aXJlO2Zvcih2YXIgbz0wO288ci5sZW5ndGg7bysrKXMocltvXSk7cmV0dXJuIHN9KSIsIi8qKiBAanN4IFJlYWN0LkRPTSAqL1xuXG52YXIgUmVhY3QgPSByZXF1aXJlKCdyZWFjdCcpLFxuXHRTZWxlY3QgPSByZXF1aXJlKCdyZWFjdC1zZWxlY3QnKTtcbiBcbnZhciBTZWxlY3RGaWVsZCA9IFJlYWN0LmNyZWF0ZUNsYXNzKHtkaXNwbGF5TmFtZTogJ1NlbGVjdEZpZWxkJyxcblx0cmVuZGVyOiBmdW5jdGlvbigpIHtcblx0XHR2YXIgb3BzID0gW1xuXHRcdFx0eyBsYWJlbDogJ0F1c3RyYWxpYW4gQ2FwaXRhbCBUZXJyaXRvcnknLCB2YWx1ZTogJ2F1c3RyYWxpYW4tY2FwaXRhbC10ZXJyaXRvcnknIH0sXG5cdFx0XHR7IGxhYmVsOiAnTmV3IFNvdXRoIFdhbGVzJywgdmFsdWU6ICduZXctc291dGgtd2FsZXMnIH0sXG5cdFx0XHR7IGxhYmVsOiAnVmljdG9yaWEnLCB2YWx1ZTogJ3ZpY3RvcmlhJyB9LFxuXHRcdFx0eyBsYWJlbDogJ1F1ZWVuc2xhbmQnLCB2YWx1ZTogJ3F1ZWVuc2xhbmQnIH0sXG5cdFx0XHR7IGxhYmVsOiAnV2VzdGVybiBBdXN0cmFsaWEnLCB2YWx1ZTogJ3dlc3Rlcm4tYXVzdHJhbGlhJyB9LFxuXHRcdFx0eyBsYWJlbDogJ1NvdXRoIEF1c3RyYWxpYScsIHZhbHVlOiAnc291dGgtYXVzdHJhbGlhJyB9LFxuXHRcdFx0eyBsYWJlbDogJ1Rhc21hbmlhJywgdmFsdWU6ICd0YXNtYW5pYScgfSxcblx0XHRcdHsgbGFiZWw6ICdOb3J0aGVybiBUZXJyaXRvcnknLCB2YWx1ZTogJ25vcnRoZXJuLXRlcnJpdG9yeScgfVxuXHRcdF07XG5cdFx0cmV0dXJuIFJlYWN0LkRPTS5kaXYobnVsbCwgXG5cdFx0XHRSZWFjdC5ET00ubGFiZWwobnVsbCwgdGhpcy5wcm9wcy5sYWJlbCksIFxuXHRcdFx0U2VsZWN0KHtvcHRpb25zOiBvcHMsIHZhbHVlOiB0aGlzLnByb3BzLnZhbHVlfSlcblx0XHQpO1xuXHR9XG59KTtcblxuUmVhY3QucmVuZGVyQ29tcG9uZW50KFxuXHRTZWxlY3RGaWVsZCh7bGFiZWw6IFwiU3RhdGU6XCJ9KSxcblx0ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2V4YW1wbGUnKVxuKTtcbiJdfQ== +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9Vc2Vycy9KZWQvRGV2ZWxvcG1lbnQvUGFja2FnZXMvcmVhY3Qtc2VsZWN0L25vZGVfbW9kdWxlcy9icm93c2VyaWZ5L25vZGVfbW9kdWxlcy9icm93c2VyLXBhY2svX3ByZWx1ZGUuanMiLCIuL2V4YW1wbGVzL3NyYy9hcHAuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7QUNBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIihmdW5jdGlvbiBlKHQsbixyKXtmdW5jdGlvbiBzKG8sdSl7aWYoIW5bb10pe2lmKCF0W29dKXt2YXIgYT10eXBlb2YgcmVxdWlyZT09XCJmdW5jdGlvblwiJiZyZXF1aXJlO2lmKCF1JiZhKXJldHVybiBhKG8sITApO2lmKGkpcmV0dXJuIGkobywhMCk7dmFyIGY9bmV3IEVycm9yKFwiQ2Fubm90IGZpbmQgbW9kdWxlICdcIitvK1wiJ1wiKTt0aHJvdyBmLmNvZGU9XCJNT0RVTEVfTk9UX0ZPVU5EXCIsZn12YXIgbD1uW29dPXtleHBvcnRzOnt9fTt0W29dWzBdLmNhbGwobC5leHBvcnRzLGZ1bmN0aW9uKGUpe3ZhciBuPXRbb11bMV1bZV07cmV0dXJuIHMobj9uOmUpfSxsLGwuZXhwb3J0cyxlLHQsbixyKX1yZXR1cm4gbltvXS5leHBvcnRzfXZhciBpPXR5cGVvZiByZXF1aXJlPT1cImZ1bmN0aW9uXCImJnJlcXVpcmU7Zm9yKHZhciBvPTA7bzxyLmxlbmd0aDtvKyspcyhyW29dKTtyZXR1cm4gc30pIiwiLyoqIEBqc3ggUmVhY3QuRE9NICovXG5cbnZhciBSZWFjdCA9IHJlcXVpcmUoJ3JlYWN0JyksXG5cdFNlbGVjdCA9IHJlcXVpcmUoJ3JlYWN0LXNlbGVjdCcpO1xuIFxudmFyIFNlbGVjdEZpZWxkID0gUmVhY3QuY3JlYXRlQ2xhc3Moe2Rpc3BsYXlOYW1lOiAnU2VsZWN0RmllbGQnLFxuXHRyZW5kZXI6IGZ1bmN0aW9uKCkge1xuXHRcdHZhciBvcHMgPSBbXG5cdFx0XHR7IGxhYmVsOiAnQXVzdHJhbGlhbiBDYXBpdGFsIFRlcnJpdG9yeScsIHZhbHVlOiAnYXVzdHJhbGlhbi1jYXBpdGFsLXRlcnJpdG9yeScgfSxcblx0XHRcdHsgbGFiZWw6ICdOZXcgU291dGggV2FsZXMnLCB2YWx1ZTogJ25ldy1zb3V0aC13YWxlcycgfSxcblx0XHRcdHsgbGFiZWw6ICdWaWN0b3JpYScsIHZhbHVlOiAndmljdG9yaWEnIH0sXG5cdFx0XHR7IGxhYmVsOiAnUXVlZW5zbGFuZCcsIHZhbHVlOiAncXVlZW5zbGFuZCcgfSxcblx0XHRcdHsgbGFiZWw6ICdXZXN0ZXJuIEF1c3RyYWxpYScsIHZhbHVlOiAnd2VzdGVybi1hdXN0cmFsaWEnIH0sXG5cdFx0XHR7IGxhYmVsOiAnU291dGggQXVzdHJhbGlhJywgdmFsdWU6ICdzb3V0aC1hdXN0cmFsaWEnIH0sXG5cdFx0XHR7IGxhYmVsOiAnVGFzbWFuaWEnLCB2YWx1ZTogJ3Rhc21hbmlhJyB9LFxuXHRcdFx0eyBsYWJlbDogJ05vcnRoZXJuIFRlcnJpdG9yeScsIHZhbHVlOiAnbm9ydGhlcm4tdGVycml0b3J5JyB9XG5cdFx0XTtcblx0XHRyZXR1cm4gUmVhY3QuRE9NLmRpdihudWxsLCBcblx0XHRcdFJlYWN0LkRPTS5sYWJlbChudWxsLCB0aGlzLnByb3BzLmxhYmVsKSwgXG5cdFx0XHRTZWxlY3Qoe29wdGlvbnM6IG9wcywgdmFsdWU6IHRoaXMucHJvcHMudmFsdWV9KVxuXHRcdCk7XG5cdH1cbn0pO1xuIFxudmFyIFJlbW90ZVNlbGVjdEZpZWxkID0gUmVhY3QuY3JlYXRlQ2xhc3Moe2Rpc3BsYXlOYW1lOiAnUmVtb3RlU2VsZWN0RmllbGQnLFxuXHRsb2FkT3B0aW9uczogZnVuY3Rpb24oaW5wdXQsIGNhbGxiYWNrKSB7XG5cdFx0XG5cdFx0dmFyIHJ0biA9IHtcblx0XHRcdG9wdGlvbnM6IFtcblx0XHRcdFx0eyBsYWJlbDogJ09uZScsIHZhbHVlOiAnb25lJyB9LFxuXHRcdFx0XHR7IGxhYmVsOiAnVHdvJywgdmFsdWU6ICd0d28nIH0sXG5cdFx0XHRcdHsgbGFiZWw6ICdUaHJlZScsIHZhbHVlOiAndGhyZWUnIH1cblx0XHRcdF0sXG5cdFx0XHRjb21wbGV0ZTogdHJ1ZVxuXHRcdH07XG5cdFx0XG5cdFx0aWYgKGlucHV0LnNsaWNlKDAsMSkgPT09ICdhJykge1xuXHRcdFx0aWYgKGlucHV0LnNsaWNlKDAsMikgPT09ICdhYicpIHtcblx0XHRcdFx0cnRuID0ge1xuXHRcdFx0XHRcdG9wdGlvbnM6IFtcblx0XHRcdFx0XHRcdHsgbGFiZWw6ICdBQicsIHZhbHVlOiAnYWInIH0sXG5cdFx0XHRcdFx0XHR7IGxhYmVsOiAnQUJDJywgdmFsdWU6ICdhYmMnIH0sXG5cdFx0XHRcdFx0XHR7IGxhYmVsOiAnQUJDRCcsIHZhbHVlOiAnYWJjZCcgfVxuXHRcdFx0XHRcdF0sXG5cdFx0XHRcdFx0Y29tcGxldGU6IHRydWVcblx0XHRcdFx0fTtcblx0XHRcdH0gZWxzZSB7XG5cdFx0XHRcdHJ0biA9IHtcblx0XHRcdFx0XHRvcHRpb25zOiBbXG5cdFx0XHRcdFx0XHR7IGxhYmVsOiAnQScsIHZhbHVlOiAnYScgfSxcblx0XHRcdFx0XHRcdHsgbGFiZWw6ICdBQScsIHZhbHVlOiAnYWEnIH0sXG5cdFx0XHRcdFx0XHR7IGxhYmVsOiAnQUInLCB2YWx1ZTogJ2FiJyB9XG5cdFx0XHRcdFx0XSxcblx0XHRcdFx0XHRjb21wbGV0ZTogZmFsc2Vcblx0XHRcdFx0fTtcblx0XHRcdH1cblx0XHR9IGVsc2UgaWYgKCFpbnB1dC5sZW5ndGgpIHtcblx0XHRcdHJ0bi5jb21wbGV0ZSA9IGZhbHNlO1xuXHRcdH1cblx0XHRcblx0XHRzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge1xuXHRcdFx0Y2FsbGJhY2sobnVsbCwgcnRuKTtcblx0XHR9LCA1MDApO1xuXHRcdFxuXHR9LFxuXHRyZW5kZXI6IGZ1bmN0aW9uKCkge1xuXHRcdHJldHVybiBSZWFjdC5ET00uZGl2KG51bGwsIFxuXHRcdFx0UmVhY3QuRE9NLmxhYmVsKG51bGwsIHRoaXMucHJvcHMubGFiZWwpLCBcblx0XHRcdFNlbGVjdCh7YXN5bmNPcHRpb25zOiB0aGlzLmxvYWRPcHRpb25zLCB2YWx1ZTogdGhpcy5wcm9wcy52YWx1ZX0pXG5cdFx0KTtcblx0fVxufSk7XG5cblJlYWN0LnJlbmRlckNvbXBvbmVudChcblx0UmVhY3QuRE9NLmRpdihudWxsLCBcblx0XHRTZWxlY3RGaWVsZCh7bGFiZWw6IFwiU3RhdGU6XCJ9KSwgXG5cdFx0UmVtb3RlU2VsZWN0RmllbGQoe2xhYmVsOiBcIlJlbW90ZTpcIn0pXG5cdCksXG5cdGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdleGFtcGxlJylcbik7XG4iXX0= diff --git a/build/example.css b/build/example.css index 51845c6837..7474f83242 100644 --- a/build/example.css +++ b/build/example.css @@ -15,7 +15,7 @@ a:hover { .container { margin-left: auto; margin-right: auto; - max-width: 600px; + max-width: 400px; padding: 1em; } .footer { @@ -43,6 +43,11 @@ label { margin: 1em 0; text-transform: uppercase; } +.hint { + margin: 15px 0; + font-style: italic; + color: #999; +} /* // include these styles to test normal form fields @@ -105,13 +110,13 @@ label { box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06); } .is-open > .Select-control { - border-bottom-left-radius: 0; border-bottom-right-radius: 0; + border-bottom-left-radius: 0; background: white; border-color: #b3b3b3 #cccccc #d9d9d9; cursor: text; } -.is-open > .Select-control > .Select-indicator { +.is-open > .Select-control > .Select-arrow { border-color: transparent transparent #999999; border-width: 0 5px 5px; } @@ -120,7 +125,7 @@ label { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 5px -1px rgba(0, 136, 204, 0.5); cursor: text; } -.Select-indicator { +.Select-arrow { border-color: #999999 transparent transparent; border-style: solid; border-width: 5px 5px 0; @@ -133,6 +138,23 @@ label { top: 50%; width: 0; } +.Select-loading { + -webkit-animation: spin 400ms infinite linear; + -o-animation: spin 400ms infinite linear; + animation: spin 400ms infinite linear; + width: 16px; + height: 16px; + box-sizing: border-box; + border-radius: 50%; + border: 2px solid #cccccc; + border-right-color: #333333; + display: inline-block; + position: relative; + margin-top: -8px; + position: absolute; + right: 30px; + top: 50%; +} .Select-input { background: none transparent; border: 0 none; @@ -170,8 +192,8 @@ label { color: #c0392b; } .Select-menu { - border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; background-color: white; border: 1px solid #cccccc; border-top-color: #e6e6e6; @@ -194,8 +216,8 @@ label { padding: 6px 10px; } .Select-option:last-child { - border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } .Select-option.is-focused { background-color: #f2f9fc; @@ -208,7 +230,13 @@ label { display: block; padding: 6px 10px; } -.Select-noresults:last-child { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; +@keyframes spin { + to { + transform: rotate(1turn); + } +} +@-webkit-keyframes spin { + to { + -webkit-transform: rotate(1turn); + } } diff --git a/build/select-bundle.js b/build/select-bundle.js index c343859b30..d8fff65345 100755 --- a/build/select-bundle.js +++ b/build/select-bundle.js @@ -29,21 +29,38 @@ var classes = function() { return rtn.join(' ') || undefined; } +var requestId = 0; + var Select = React.createClass({ - + + getDefaultProps: function() { + return { + autoload: true + }; + }, + getInitialState: function() { return { value: this.props.value, inputValue: '', placeholder: '', + options: this.props.options || [], focusedOption: null, isFocused: false, - isOpen: false + isOpen: false, + isLoading: false }; }, componentWillMount: function() { + + this._optionsCache = {}; this.setState(this.getStateFromValue(this.state.value)); + + if (this.props.asyncOptions && this.props.autoload) { + this.autoloadAsyncOptions(); + } + }, getStateFromValue: function(value) { @@ -146,10 +163,67 @@ var Select = React.createClass({ }, handleInputChange: function(event) { - this.setState({ - isOpen: true, - inputValue: event.target.value - }); + if (this.props.asyncOptions) { + this.setState({ + isLoading: true, + inputValue: event.target.value + }); + this.loadAsyncOptions(event.target.value, { + isLoading: false, + isOpen: true + }); + } else { + this.setState({ + isOpen: true, + inputValue: event.target.value + }); + } + }, + + autoloadAsyncOptions: function() { + this.loadAsyncOptions('', {}, function() {}); + }, + + loadAsyncOptions: function(input, state) { + + for (var i = 0; i <= input.length; i++) { + var cacheKey = input.slice(0, i); + if (this._optionsCache[cacheKey] && (input === cacheKey || this._optionsCache[cacheKey].complete)) { + this.setState(_.extend({ + options: this._optionsCache[cacheKey].options + }, state)); + return; + } + } + + var thisRequestId = this._currentRequestId = requestId++; + + this.props.asyncOptions(input, function(err, data) { + + this._optionsCache[input] = data; + + if (thisRequestId !== this._currentRequestId) { + return; + } + + this.setState(_.extend({ + options: data.options + }, state)); + + }.bind(this)); + + }, + + filterOptions: function() { + return _.filter(this.state.options, this.filterOption, this); + }, + + filterOption: function(op) { + return ( + !this.state.inputValue + || op.value.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0 + || op.label.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0 + ); }, selectOption: function(option) { @@ -241,19 +315,7 @@ var Select = React.createClass({ }, - filterOptions: function() { - return _.filter(this.props.options, this.filterOption, this); - }, - - filterOption: function(op) { - return ( - !this.state.inputValue - || op.value.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0 - || op.label.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0 - ); - }, - - getOptions: function() { + buildMenu: function() { var ops = {}; @@ -288,9 +350,9 @@ var Select = React.createClass({ render: function() { logEvent('render'); - // console.log(this.state); - var menu = this.state.isOpen ? React.DOM.div({ className: "Select-menu" }, this.getOptions()) : null; + var menu = this.state.isOpen ? React.DOM.div({ className: "Select-menu" }, this.buildMenu()) : null; + var loading = this.state.isLoading ? React.DOM.span({ className: "Select-loading" }) : null; var clear = this.state.value ? React.DOM.span({ className: "Select-clear", onClick: this.clearValue, dangerouslySetInnerHTML: { __html: '×' } }) : null; var selectClass = classes('Select', { @@ -302,7 +364,8 @@ var Select = React.createClass({ React.DOM.input({ type: "hidden", ref: "value", name: this.props.name, value: this.state.value }), React.DOM.div({ className: "Select-control", tabIndex: "-1", ref: "control", onKeyDown: this.handleKeyDown, onMouseDown: this.handleMouseDown, onFocus: this.handleFocus, onBlur: this.handleBlur }, React.DOM.input({ className: "Select-input", placeholder: this.state.placeholder, ref: "input", onMouseDown: this.handleInputMouseDown, value: this.state.inputValue, onFocus: this.handleInputFocus, onBlur: this.handleInputBlur, onChange: this.handleInputChange }), - React.DOM.span({ className: "Select-indicator" }), + React.DOM.span({ className: "Select-arrow" }), + loading, clear ), menu @@ -314,4 +377,4 @@ var Select = React.createClass({ module.exports = Select; },{"react":undefined,"underscore":undefined}]},{},[]) -//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["/Users/Jed/Development/Packages/react-select/node_modules/browserify/node_modules/browser-pack/_prelude.js","./lib/select.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","/** @jsx React.DOM */\n\nvar _ = require('underscore'),\n\tReact = require('react');\n\nvar noop = function() {};\n\nvar logEvent = function(msg) {\n\tconsole.log(msg);\n};\n\n// comment out this line to debug the control state\nlogEvent = noop;\n\nvar classes = function() {\n\tvar rtn = [];\n\tfor (var i = 0; i < arguments.length; i++) {\n\t\tif ('string' === typeof arguments[i]) {\n\t\t\trtn.push(arguments[i]);\n\t\t} else if (_.isObject(arguments[i])) {\n\t\t\t_.each(arguments[i], function(val, key) {\n\t\t\t\tif (val) {\n\t\t\t\t\trtn.push(key);\n\t\t\t\t}\n\t\t\t});\n\t\t}\n\t}\n\treturn rtn.join(' ') || undefined;\n}\n\nvar Select = React.createClass({\n\t\t\n\tgetInitialState: function() {\n\t\treturn {\n\t\t\tvalue: this.props.value,\n\t\t\tinputValue: '',\n\t\t\tplaceholder: '',\n\t\t\tfocusedOption: null,\n\t\t\tisFocused: false,\n\t\t\tisOpen: false\n\t\t};\n\t},\n\t\n\tcomponentWillMount: function() {\n\t\tthis.setState(this.getStateFromValue(this.state.value));\n\t},\n\t\n\tgetStateFromValue: function(value) {\n\t\tvar selectedOption = ('string' === typeof value) ? _.findWhere(this.props.options, { value: value }) : value;\n\t\treturn selectedOption ? {\n\t\t\tvalue: value,\n\t\t\tinputValue: selectedOption.label,\n\t\t\tplaceholder: selectedOption.label,\n\t\t\tfocusedOption: selectedOption\n\t\t} : {\n\t\t\tvalue: '',\n\t\t\tinputValue: '',\n\t\t\tplaceholder: this.props.placeholder || 'Select...',\n\t\t\tfocusedOption: null\n\t\t};\n\t},\n\t\n\tkeyboardActions: {\n\t\t13: 'selectFocusedOption',\n\t\t27: 'closeOnEscape',\n\t\t38: 'focusPreviousOption',\n\t\t40: 'focusNextOption'\n\t},\n\t\n\thandleKeyDown: function(event) {\n\t\tlogEvent('------');\n\t\tlogEvent(event);\n\t\tvar action = this.keyboardActions[event.keyCode];\n\t\tif (!action) {\n\t\t\treturn;\n\t\t}\n\t\tevent.preventDefault();\n\t\tthis[action].call(this);\n\t},\n\t\n\thandleMouseDown: function() {\n\t\tlogEvent('click: control');\n\t\tif (this.state.isOpen) {\n\t\t\tthis.setState({\n\t\t\t\tisOpen: false\n\t\t\t});\n\t\t\tthis._controlIsFocused = true;\n\t\t\tthis.refs.control.getDOMNode().focus();\n\t\t\tclearTimeout(this.blurTimer);\n\t\t} else {\n\t\t\tthis.setState({\n\t\t\t\tisOpen: true,\n\t\t\t\tinputValue: ''\n\t\t\t});\n\t\t\tif (!this._inputIsFocused) {\n\t\t\t\tthis.refs.input.getDOMNode().focus();\n\t\t\t}\n\t\t}\n\t},\n\t\n\thandleFocus: function() {\n\t\tif (this._controlIsFocused) return;\n\t\tlogEvent('focus: control');\n\t\tthis._controlIsFocused = true;\n\t\tclearTimeout(this.blurTimer);\n\t\tsetTimeout(function() {\n\t\t\tif (!this._inputIsFocused) {\n\t\t\t\tthis.refs.input.getDOMNode().focus();\n\t\t\t}\n\t\t}.bind(this), 0);\n\t\tthis.setState({\n\t\t\tisFocused: true\n\t\t});\n\t},\n\t\n\thandleBlur: function(event) {\n\t\tif (!this._controlIsFocused) return;\n\t\tthis._controlIsFocused = false;\n\t\tclearTimeout(this.blurTimer);\n\t\tthis.blurTimer = setTimeout(function() {\n\t\t\tlogEvent('blur: control');\n\t\t\tvar blurState = this.getStateFromValue(this.state.value);\n\t\t\tblurState.isFocused = false;\n\t\t\tblurState.isOpen = false;\n\t\t\tthis.setState(blurState);\n\t\t}.bind(this), 100);\n\t},\n\t\n\thandleInputMouseDown: function(event) {\n\t\tif (this._inputIsFocused) {\n\t\t\tlogEvent('click: input');\n\t\t\tevent.stopPropagation();\n\t\t}\n\t},\n\t\n\thandleInputFocus: function(event) {\n\t\tlogEvent('focus: input');\n\t\tclearTimeout(this.blurTimer);\n\t\tthis._inputIsFocused = true;\n\t},\n\t\n\thandleInputBlur: function(event) {\n\t\tlogEvent('blur: input');\n\t\tthis._inputIsFocused = false;\n\t},\n\t\n\thandleInputChange: function(event) {\n\t\tthis.setState({\n\t\t\tisOpen: true,\n\t\t\tinputValue: event.target.value\n\t\t});\n\t},\n\t\n\tselectOption: function(option) {\n\t\tthis.setValue(option);\n\t\tthis.refs.control.getDOMNode().focus();\n\t},\n\t\n\tsetValue: function(option) {\n\t\tvar newState = this.getStateFromValue(option);\n\t\tnewState.isOpen = false;\n\t\tthis.setState(newState);\n\t},\n\t\n\tselectFocusedOption: function() {\n\t\treturn this.setValue(this.state.focusedOption);\n\t},\n\t\n\tclearValue: function(event) {\n\t\tlogEvent('clear value');\n\t\tthis.setValue(null);\n\t},\n\t\n\tcloseOnEscape: function() {\n\t\tthis.setValue(this.state.value);\n\t},\n\t\n\tfocusOption: function(op) {\n\t\tthis.setState({\n\t\t\tfocusedOption: op\n\t\t});\n\t},\n\t\n\tunfocusOption: function(op) {\n\t\tif (this.state.focusedOption === op) {\n\t\t\tthis.setState({\n\t\t\t\tfocusedOption: null\n\t\t\t});\n\t\t}\n\t},\n\t\n\tfocusNextOption: function() {\n\t\tthis.focusAdjacentOption('next');\n\t},\n\t\n\tfocusPreviousOption: function() {\n\t\tthis.focusAdjacentOption('previous');\n\t},\n\t\n\tfocusAdjacentOption: function(dir) {\n\t\t\n\t\tif (!this.state.isOpen) {\n\t\t\tthis.setState({\n\t\t\t\tisOpen: true,\n\t\t\t\tinputValue: ''\n\t\t\t});\n\t\t\treturn;\n\t\t}\n\t\t\n\t\tvar ops = this.filterOptions();\n\t\t\n\t\tif (!ops.length) {\n\t\t\treturn;\n\t\t}\n\t\t\n\t\tvar focusedIndex = -1;\n\t\t\n\t\tfor (var i = 0; i < ops.length; i++) {\n\t\t\tif (this.state.focusedOption === ops[i]) {\n\t\t\t\tfocusedIndex = i;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t\t\n\t\tvar focusedOption = ops[0];\n\t\t\n\t\tif (dir === 'next' && focusedIndex > -1 && focusedIndex < ops.length - 1) {\n\t\t\tfocusedOption = ops[focusedIndex + 1];\n\t\t} else if (dir === 'previous') {\n\t\t\tif (focusedIndex > 0) {\n\t\t\t\tfocusedOption = ops[focusedIndex - 1];\n\t\t\t} else {\n\t\t\t\tfocusedOption = ops[ops.length - 1];\n\t\t\t}\n\t\t}\n\t\t\n\t\tthis.setState({\n\t\t\tfocusedOption: focusedOption\n\t\t});\n\t\t\n\t},\n\t\n\tfilterOptions: function() {\n\t\treturn _.filter(this.props.options, this.filterOption, this);\n\t},\n\t\n\tfilterOption: function(op) {\n\t\treturn (\n\t\t\t!this.state.inputValue\n\t\t\t|| op.value.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0\n\t\t\t|| op.label.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0\n\t\t);\n\t},\n\t\n\tgetOptions: function() {\n\t\t\n\t\tvar ops = {};\n\t\t\n\t\t_.each(this.filterOptions(), function(op) {\n\t\t\t\n\t\t\tvar optionClass = classes({\n\t\t\t\t'Select-option': true,\n\t\t\t\t'is-focused': this.state.focusedOption === op\n\t\t\t});\n\t\t\t\n\t\t\tvar mouseEnter = this.focusOption.bind(this, op),\n\t\t\t\tmouseLeave = this.unfocusOption.bind(this, op),\n\t\t\t\tmouseDown = this.selectOption.bind(this, op);\n\t\t\t\n\t\t\tops[op.value] = React.DOM.div({\n\t\t\t\tclassName: optionClass,\n\t\t\t\tonMouseEnter: mouseEnter,\n\t\t\t\tonMouseLeave: mouseLeave,\n\t\t\t\tonMouseDown: mouseDown\n\t\t\t}, op.label);\n\t\t\t\n\t\t}, this);\n\t\t\n\t\tif (_.isEmpty(ops)) {\n\t\t\tops._no_ops = React.DOM.div({className: \"Select-noresults\"}, \"No results found\");\n\t\t}\n\t\t\n\t\treturn ops;\n\t\t\n\t},\n\t\n\trender: function() {\n\t\t\n\t\tlogEvent('render');\n\t\t// console.log(this.state);\n\t\t\n\t\tvar menu = this.state.isOpen ? React.DOM.div({ className: \"Select-menu\" }, this.getOptions()) : null;\n\t\tvar clear = this.state.value ? React.DOM.span({ className: \"Select-clear\", onClick: this.clearValue, dangerouslySetInnerHTML: { __html: '&times;' } }) : null;\n\t\t\n\t\tvar selectClass = classes('Select', {\n\t\t\t'is-open': this.state.isOpen,\n\t\t\t'is-focused': this.state.isFocused\n\t\t});\n\t\t\n\t\treturn React.DOM.div({ className: selectClass }, \n\t\t\tReact.DOM.input({ type: \"hidden\", ref: \"value\", name: this.props.name, value: this.state.value }), \n\t\t\tReact.DOM.div({ className: \"Select-control\", tabIndex: \"-1\", ref: \"control\", onKeyDown: this.handleKeyDown, onMouseDown: this.handleMouseDown, onFocus: this.handleFocus, onBlur: this.handleBlur }, \n\t\t\t\tReact.DOM.input({ className: \"Select-input\", placeholder: this.state.placeholder, ref: \"input\", onMouseDown: this.handleInputMouseDown, value: this.state.inputValue, onFocus: this.handleInputFocus, onBlur: this.handleInputBlur, onChange: this.handleInputChange }), \n\t\t\t\tReact.DOM.span({ className: \"Select-indicator\" }),\n\t\t\t\tclear\n\t\t\t), \n\t\t\tmenu\n\t\t);\n\t}\n\t\n});\n\nmodule.exports = Select;\n"]} +//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["/Users/Jed/Development/Packages/react-select/node_modules/browserify/node_modules/browser-pack/_prelude.js","./lib/select.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","/** @jsx React.DOM */\n\nvar _ = require('underscore'),\n\tReact = require('react');\n\nvar noop = function() {};\n\nvar logEvent = function(msg) {\n\tconsole.log(msg);\n};\n\n// comment out this line to debug the control state\nlogEvent = noop;\n\nvar classes = function() {\n\tvar rtn = [];\n\tfor (var i = 0; i < arguments.length; i++) {\n\t\tif ('string' === typeof arguments[i]) {\n\t\t\trtn.push(arguments[i]);\n\t\t} else if (_.isObject(arguments[i])) {\n\t\t\t_.each(arguments[i], function(val, key) {\n\t\t\t\tif (val) {\n\t\t\t\t\trtn.push(key);\n\t\t\t\t}\n\t\t\t});\n\t\t}\n\t}\n\treturn rtn.join(' ') || undefined;\n}\n\nvar requestId = 0;\n\nvar Select = React.createClass({\n\t\n\tgetDefaultProps: function() {\n\t\treturn {\n\t\t\tautoload: true\n\t\t};\n\t},\n\t\n\tgetInitialState: function() {\n\t\treturn {\n\t\t\tvalue: this.props.value,\n\t\t\tinputValue: '',\n\t\t\tplaceholder: '',\n\t\t\toptions: this.props.options || [],\n\t\t\tfocusedOption: null,\n\t\t\tisFocused: false,\n\t\t\tisOpen: false,\n\t\t\tisLoading: false\n\t\t};\n\t},\n\t\n\tcomponentWillMount: function() {\n\t\t\n\t\tthis._optionsCache = {};\n\t\tthis.setState(this.getStateFromValue(this.state.value));\n\t\t\n\t\tif (this.props.asyncOptions && this.props.autoload) {\n\t\t\tthis.autoloadAsyncOptions();\n\t\t}\n\t\t\n\t},\n\t\n\tgetStateFromValue: function(value) {\n\t\tvar selectedOption = ('string' === typeof value) ? _.findWhere(this.props.options, { value: value }) : value;\n\t\treturn selectedOption ? {\n\t\t\tvalue: value,\n\t\t\tinputValue: selectedOption.label,\n\t\t\tplaceholder: selectedOption.label,\n\t\t\tfocusedOption: selectedOption\n\t\t} : {\n\t\t\tvalue: '',\n\t\t\tinputValue: '',\n\t\t\tplaceholder: this.props.placeholder || 'Select...',\n\t\t\tfocusedOption: null\n\t\t};\n\t},\n\t\n\tkeyboardActions: {\n\t\t13: 'selectFocusedOption',\n\t\t27: 'closeOnEscape',\n\t\t38: 'focusPreviousOption',\n\t\t40: 'focusNextOption'\n\t},\n\t\n\thandleKeyDown: function(event) {\n\t\tlogEvent('------');\n\t\tlogEvent(event);\n\t\tvar action = this.keyboardActions[event.keyCode];\n\t\tif (!action) {\n\t\t\treturn;\n\t\t}\n\t\tevent.preventDefault();\n\t\tthis[action].call(this);\n\t},\n\t\n\thandleMouseDown: function() {\n\t\tlogEvent('click: control');\n\t\tif (this.state.isOpen) {\n\t\t\tthis.setState({\n\t\t\t\tisOpen: false\n\t\t\t});\n\t\t\tthis._controlIsFocused = true;\n\t\t\tthis.refs.control.getDOMNode().focus();\n\t\t\tclearTimeout(this.blurTimer);\n\t\t} else {\n\t\t\tthis.setState({\n\t\t\t\tisOpen: true,\n\t\t\t\tinputValue: ''\n\t\t\t});\n\t\t\tif (!this._inputIsFocused) {\n\t\t\t\tthis.refs.input.getDOMNode().focus();\n\t\t\t}\n\t\t}\n\t},\n\t\n\thandleFocus: function() {\n\t\tif (this._controlIsFocused) return;\n\t\tlogEvent('focus: control');\n\t\tthis._controlIsFocused = true;\n\t\tclearTimeout(this.blurTimer);\n\t\tsetTimeout(function() {\n\t\t\tif (!this._inputIsFocused) {\n\t\t\t\tthis.refs.input.getDOMNode().focus();\n\t\t\t}\n\t\t}.bind(this), 0);\n\t\tthis.setState({\n\t\t\tisFocused: true\n\t\t});\n\t},\n\t\n\thandleBlur: function(event) {\n\t\tif (!this._controlIsFocused) return;\n\t\tthis._controlIsFocused = false;\n\t\tclearTimeout(this.blurTimer);\n\t\tthis.blurTimer = setTimeout(function() {\n\t\t\tlogEvent('blur: control');\n\t\t\tvar blurState = this.getStateFromValue(this.state.value);\n\t\t\tblurState.isFocused = false;\n\t\t\tblurState.isOpen = false;\n\t\t\tthis.setState(blurState);\n\t\t}.bind(this), 100);\n\t},\n\t\n\thandleInputMouseDown: function(event) {\n\t\tif (this._inputIsFocused) {\n\t\t\tlogEvent('click: input');\n\t\t\tevent.stopPropagation();\n\t\t}\n\t},\n\t\n\thandleInputFocus: function(event) {\n\t\tlogEvent('focus: input');\n\t\tclearTimeout(this.blurTimer);\n\t\tthis._inputIsFocused = true;\n\t},\n\t\n\thandleInputBlur: function(event) {\n\t\tlogEvent('blur: input');\n\t\tthis._inputIsFocused = false;\n\t},\n\t\n\thandleInputChange: function(event) {\n\t\tif (this.props.asyncOptions) {\n\t\t\tthis.setState({\n\t\t\t\tisLoading: true,\n\t\t\t\tinputValue: event.target.value\n\t\t\t});\n\t\t\tthis.loadAsyncOptions(event.target.value, {\n\t\t\t\tisLoading: false,\n\t\t\t\tisOpen: true\n\t\t\t});\n\t\t} else {\n\t\t\tthis.setState({\n\t\t\t\tisOpen: true,\n\t\t\t\tinputValue: event.target.value\n\t\t\t});\n\t\t}\n\t},\n\t\n\tautoloadAsyncOptions: function() {\n\t\tthis.loadAsyncOptions('', {}, function() {});\n\t},\n\t\n\tloadAsyncOptions: function(input, state) {\n\t\t\n\t\tfor (var i = 0; i <= input.length; i++) {\n\t\t\tvar cacheKey = input.slice(0, i);\n\t\t\tif (this._optionsCache[cacheKey] && (input === cacheKey || this._optionsCache[cacheKey].complete)) {\n\t\t\t\tthis.setState(_.extend({\n\t\t\t\t\toptions: this._optionsCache[cacheKey].options\n\t\t\t\t}, state));\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t\t\n\t\tvar thisRequestId = this._currentRequestId = requestId++;\n\t\t\n\t\tthis.props.asyncOptions(input, function(err, data) {\n\t\t\t\n\t\t\tthis._optionsCache[input] = data;\n\t\t\t\n\t\t\tif (thisRequestId !== this._currentRequestId) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t\n\t\t\tthis.setState(_.extend({\n\t\t\t\toptions: data.options\n\t\t\t}, state));\n\t\t\t\n\t\t}.bind(this));\n\t\t\n\t},\n\t\n\tfilterOptions: function() {\n\t\treturn _.filter(this.state.options, this.filterOption, this);\n\t},\n\t\n\tfilterOption: function(op) {\n\t\treturn (\n\t\t\t!this.state.inputValue\n\t\t\t|| op.value.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0\n\t\t\t|| op.label.toLowerCase().indexOf(this.state.inputValue.toLowerCase()) >= 0\n\t\t);\n\t},\n\t\n\tselectOption: function(option) {\n\t\tthis.setValue(option);\n\t\tthis.refs.control.getDOMNode().focus();\n\t},\n\t\n\tsetValue: function(option) {\n\t\tvar newState = this.getStateFromValue(option);\n\t\tnewState.isOpen = false;\n\t\tthis.setState(newState);\n\t},\n\t\n\tselectFocusedOption: function() {\n\t\treturn this.setValue(this.state.focusedOption);\n\t},\n\t\n\tclearValue: function(event) {\n\t\tlogEvent('clear value');\n\t\tthis.setValue(null);\n\t},\n\t\n\tcloseOnEscape: function() {\n\t\tthis.setValue(this.state.value);\n\t},\n\t\n\tfocusOption: function(op) {\n\t\tthis.setState({\n\t\t\tfocusedOption: op\n\t\t});\n\t},\n\t\n\tunfocusOption: function(op) {\n\t\tif (this.state.focusedOption === op) {\n\t\t\tthis.setState({\n\t\t\t\tfocusedOption: null\n\t\t\t});\n\t\t}\n\t},\n\t\n\tfocusNextOption: function() {\n\t\tthis.focusAdjacentOption('next');\n\t},\n\t\n\tfocusPreviousOption: function() {\n\t\tthis.focusAdjacentOption('previous');\n\t},\n\t\n\tfocusAdjacentOption: function(dir) {\n\t\t\n\t\tif (!this.state.isOpen) {\n\t\t\tthis.setState({\n\t\t\t\tisOpen: true,\n\t\t\t\tinputValue: ''\n\t\t\t});\n\t\t\treturn;\n\t\t}\n\t\t\n\t\tvar ops = this.filterOptions();\n\t\t\n\t\tif (!ops.length) {\n\t\t\treturn;\n\t\t}\n\t\t\n\t\tvar focusedIndex = -1;\n\t\t\n\t\tfor (var i = 0; i < ops.length; i++) {\n\t\t\tif (this.state.focusedOption === ops[i]) {\n\t\t\t\tfocusedIndex = i;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t\t\n\t\tvar focusedOption = ops[0];\n\t\t\n\t\tif (dir === 'next' && focusedIndex > -1 && focusedIndex < ops.length - 1) {\n\t\t\tfocusedOption = ops[focusedIndex + 1];\n\t\t} else if (dir === 'previous') {\n\t\t\tif (focusedIndex > 0) {\n\t\t\t\tfocusedOption = ops[focusedIndex - 1];\n\t\t\t} else {\n\t\t\t\tfocusedOption = ops[ops.length - 1];\n\t\t\t}\n\t\t}\n\t\t\n\t\tthis.setState({\n\t\t\tfocusedOption: focusedOption\n\t\t});\n\t\t\n\t},\n\t\n\tbuildMenu: function() {\n\t\t\n\t\tvar ops = {};\n\t\t\n\t\t_.each(this.filterOptions(), function(op) {\n\t\t\t\n\t\t\tvar optionClass = classes({\n\t\t\t\t'Select-option': true,\n\t\t\t\t'is-focused': this.state.focusedOption === op\n\t\t\t});\n\t\t\t\n\t\t\tvar mouseEnter = this.focusOption.bind(this, op),\n\t\t\t\tmouseLeave = this.unfocusOption.bind(this, op),\n\t\t\t\tmouseDown = this.selectOption.bind(this, op);\n\t\t\t\n\t\t\tops[op.value] = React.DOM.div({\n\t\t\t\tclassName: optionClass,\n\t\t\t\tonMouseEnter: mouseEnter,\n\t\t\t\tonMouseLeave: mouseLeave,\n\t\t\t\tonMouseDown: mouseDown\n\t\t\t}, op.label);\n\t\t\t\n\t\t}, this);\n\t\t\n\t\tif (_.isEmpty(ops)) {\n\t\t\tops._no_ops = React.DOM.div({className: \"Select-noresults\"}, \"No results found\");\n\t\t}\n\t\t\n\t\treturn ops;\n\t\t\n\t},\n\t\n\trender: function() {\n\t\t\n\t\tlogEvent('render');\n\t\t\n\t\tvar menu = this.state.isOpen ? React.DOM.div({ className: \"Select-menu\" }, this.buildMenu()) : null;\n\t\tvar loading = this.state.isLoading ? React.DOM.span({ className: \"Select-loading\" }) : null;\n\t\tvar clear = this.state.value ? React.DOM.span({ className: \"Select-clear\", onClick: this.clearValue, dangerouslySetInnerHTML: { __html: '&times;' } }) : null;\n\t\t\n\t\tvar selectClass = classes('Select', {\n\t\t\t'is-open': this.state.isOpen,\n\t\t\t'is-focused': this.state.isFocused\n\t\t});\n\t\t\n\t\treturn React.DOM.div({ className: selectClass }, \n\t\t\tReact.DOM.input({ type: \"hidden\", ref: \"value\", name: this.props.name, value: this.state.value }), \n\t\t\tReact.DOM.div({ className: \"Select-control\", tabIndex: \"-1\", ref: \"control\", onKeyDown: this.handleKeyDown, onMouseDown: this.handleMouseDown, onFocus: this.handleFocus, onBlur: this.handleBlur }, \n\t\t\t\tReact.DOM.input({ className: \"Select-input\", placeholder: this.state.placeholder, ref: \"input\", onMouseDown: this.handleInputMouseDown, value: this.state.inputValue, onFocus: this.handleInputFocus, onBlur: this.handleInputBlur, onChange: this.handleInputChange }), \n\t\t\t\tReact.DOM.span({ className: \"Select-arrow\" }),\n\t\t\t\tloading,\n\t\t\t\tclear\n\t\t\t), \n\t\t\tmenu\n\t\t);\n\t}\n\t\n});\n\nmodule.exports = Select;\n"]} diff --git a/index.html b/index.html index f570df5866..b36227caee 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,10 @@

View project on GitHub
+
+ Type anything in the remote example to asynchronously load options. + Alternate results are available starting with "a" +
From 4956b9e882ff738b509ecade6d8beb9f803cdd67 Mon Sep 17 00:00:00 2001 From: Jed Watson Date: Tue, 9 Sep 2014 15:32:10 +1000 Subject: [PATCH 03/31] Fixing .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..c33fa28330 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +## This file is here to ensure it is included in the gh-pages branch, +## when `gulp deploy` is used to push updates to the demo site. + +# Dependency directory +node_modules From 5f0d550490858e02fa8ceca4a42a11b61d384754 Mon Sep 17 00:00:00 2001 From: Jed Watson Date: Tue, 16 Sep 2014 23:07:23 +1000 Subject: [PATCH 04/31] Update 2014-09-16T13:07:23.664Z --- .gitignore | 5 ----- build/app-bundle.js | 21 ++++++++++++++++-- build/select-bundle.js | 50 ++++++++++++++++++++++++++++++------------ 3 files changed, 55 insertions(+), 21 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c33fa28330..0000000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -## This file is here to ensure it is included in the gh-pages branch, -## when `gulp deploy` is used to push updates to the demo site. - -# Dependency directory -node_modules diff --git a/build/app-bundle.js b/build/app-bundle.js index f751a898f1..42767f319f 100755 --- a/build/app-bundle.js +++ b/build/app-bundle.js @@ -72,13 +72,30 @@ var RemoteSelectField = React.createClass({displayName: 'RemoteSelectField', } }); +/* +var MultiSelectField = React.createClass({ + render: function() { + var ops = [ + { label: 'Chocolate', value: 'chocolate' }, + { label: 'Vanilla', value: 'vanilla' }, + { label: 'Strawberry', value: 'strawberry' } + ]; + return
+ + `ReactDOMComponent`. -var input = ReactDOM.input; +// Store a reference to the `ReactDOMComponent`. TODO: use string +var input = ReactElement.createFactory(ReactDOM.input.type); var instancesByReactID = {}; +function forceUpdateIfMounted() { + /*jshint validthis:true */ + if (this.isMounted()) { + this.forceUpdate(); + } +} + /** * Implements an native component that allows setting these optional * props: `checked`, `value`, `defaultChecked`, and `defaultValue`. @@ -8079,28 +8048,23 @@ var ReactDOMInput = ReactCompositeComponent.createClass({ getInitialState: function() { var defaultValue = this.props.defaultValue; return { - checked: this.props.defaultChecked || false, - value: defaultValue != null ? defaultValue : null + initialChecked: this.props.defaultChecked || false, + initialValue: defaultValue != null ? defaultValue : null }; }, - shouldComponentUpdate: function() { - // Defer any updates to this component during the `onChange` handler. - return !this._isChanging; - }, - render: function() { // Clone `this.props` so we don't mutate the input. - var props = merge(this.props); + var props = assign({}, this.props); props.defaultChecked = null; props.defaultValue = null; var value = LinkedValueUtils.getValue(this); - props.value = value != null ? value : this.state.value; + props.value = value != null ? value : this.state.initialValue; var checked = LinkedValueUtils.getChecked(this); - props.checked = checked != null ? checked : this.state.checked; + props.checked = checked != null ? checked : this.state.initialChecked; props.onChange = this._handleChange; @@ -8140,14 +8104,12 @@ var ReactDOMInput = ReactCompositeComponent.createClass({ var returnValue; var onChange = LinkedValueUtils.getOnChange(this); if (onChange) { - this._isChanging = true; returnValue = onChange.call(this, event); - this._isChanging = false; } - this.setState({ - checked: event.target.checked, - value: event.target.value - }); + // Here we use asap to wait until all updates have propagated, which + // is important when using controlled components within layers: + // https://github.com/facebook/react/issues/1698 + ReactUpdates.asap(forceUpdateIfMounted, this); var name = this.props.name; if (this.props.type === 'radio' && name != null) { @@ -8185,13 +8147,10 @@ var ReactDOMInput = ReactCompositeComponent.createClass({ 'ReactDOMInput: Unknown radio button ID %s.', otherID ) : invariant(otherInstance)); - // In some cases, this will actually change the `checked` state value. - // In other cases, there's no change but this forces a reconcile upon - // which componentDidUpdate will reset the DOM property to whatever it - // should be. - otherInstance.setState({ - checked: false - }); + // If this is a controlled radio button group, forcing the input that + // was previously checked to update will cause it to be come re-checked + // as appropriate. + ReactUpdates.asap(forceUpdateIfMounted, otherInstance); } } @@ -8203,22 +8162,15 @@ var ReactDOMInput = ReactCompositeComponent.createClass({ module.exports = ReactDOMInput; }).call(this,require('_process')) -},{"./AutoFocusMixin":2,"./DOMPropertyOperations":12,"./LinkedValueUtils":24,"./ReactBrowserComponentMixin":29,"./ReactCompositeComponent":34,"./ReactDOM":37,"./ReactMount":62,"./invariant":121,"./merge":131,"_process":1}],44:[function(require,module,exports){ +},{"./AutoFocusMixin":2,"./DOMPropertyOperations":12,"./LinkedValueUtils":24,"./Object.assign":27,"./ReactBrowserComponentMixin":30,"./ReactCompositeComponent":35,"./ReactDOM":38,"./ReactElement":53,"./ReactMount":64,"./ReactUpdates":80,"./invariant":127,"_process":1}],45:[function(require,module,exports){ (function (process){ /** - * Copyright 2013-2014 Facebook, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * Copyright 2013-2014, Facebook, Inc. + * All rights reserved. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. * * @providesModule ReactDOMOption */ @@ -8227,12 +8179,13 @@ module.exports = ReactDOMInput; var ReactBrowserComponentMixin = require("./ReactBrowserComponentMixin"); var ReactCompositeComponent = require("./ReactCompositeComponent"); +var ReactElement = require("./ReactElement"); var ReactDOM = require("./ReactDOM"); var warning = require("./warning"); -// Store a reference to the