[fixed] SelectList was too forceful refocusing

YeJIoOb · Mar 29, 2016 · 3bd3da4 · 3bd3da4
1 parent 9f954b9
commit 3bd3da4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/dev/dev.jsx b/dev/dev.jsx
@@ -15,7 +15,7 @@ var Calendar = require('../src/Calendar.jsx')
 var DateTimePicker = require('../lib/DateTimePicker')
 var NumberPicker = require('../src/NumberPicker.jsx')
 // var ComboBox = require('../src/Combobox.jsx')
-// var SelectList = require('../src/SelectList.jsx')
+var SelectList = require('../src/SelectList.jsx')
 // var List = require('../src/List.jsx')
 
 require('../src/less/react-widgets.less')
@@ -95,13 +95,19 @@ var App = React.createClass({
             >
               add
             </button>
-            <DropdownList textField='name'
-              open={this.state.open}
-              dropUp={this.state.dropUp}
-              data={this.state.data}
-              duration={3000}
-              filter='startsWith'
-            />
+            <div style={{ height: 300, padding: 20,  overflow: 'auto' }}>
+              <div style={{ height: 150 }}>
+                <button>add</button>
+                <input />
+              </div>
+              <SelectList
+                multiple
+                textField='name'
+                style={{ height: 'auto', overflow: 'visible'}}
+                data={this.state.data}
+              />
+              <input />
+            </div>
           </section>
         </div>
       </div>

diff --git a/src/SelectList.jsx b/src/SelectList.jsx
@@ -71,10 +71,6 @@ var SelectList = React.createClass({
     require('./mixins/RtlParentContextMixin'),
     require('./mixins/AriaDescendantMixin')(),
     require('./mixins/FocusMixin')({
-      willHandle(focused) {
-        if (focused)
-          this.focus()
-      },
       didHandle(focused) {
         // the rigamarole here is to avoid flicker went clicking an item and
         // gaining focus at the same time.
@@ -381,7 +377,8 @@ function getListItem(parent){
           </label>
         </ListOption>
       );
-      function onMouseDown(e) {
+
+      function onMouseDown() {
         parent._clicking = true
       }
 

diff --git a/src/less/selectlist.less b/src/less/selectlist.less
@@ -16,6 +16,7 @@
         position: relative;
         min-height: 27px;
         cursor: auto;
+        outline: none;
         padding-left: 5px;
 
         > label > input {