Skip to content

Commit

Permalink
fix: dropdown scroll bug
Browse files Browse the repository at this point in the history 
#41
  • Loading branch information
@plantain-00
plantain-00 committed Sep 11, 2020
1 parent 09a6ac8 commit 2909e09
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"autoprefixer": "9.8.6",
"clean-css-cli": "4.3.0",
"clean-release": "2.14.0",
"clean-scripts": "1.17.1",
"clean-scripts": "1.18.0",
"cross-env": "7.0.2",
"eslint": "7.8.1",
"eslint-config-prettier": "6.11.0",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/select2.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export class Select2 extends React.PureComponent<{
onKeyDown={e => this.keyDown(e)}
onKeyUp={e => this.keyUp(e)}
onKeyPress={e => this.keyPress(e)}
onFocus={() => this.cancelFocusoutTimer()}
onBlur={() => this.focusout()}
className='select2-search__field'
type='search'
Expand Down
1 change: 1 addition & 0 deletions packages/vue/src/select2.template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
@keydown="keyDown($event)"
@keyup="keyUp($event)"
@keypress="keyPress($event)"
@focus="cancelFocusoutTimer()"
@focusout="focusout()"
class="select2-search__field"
type="search"
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/variables.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function autoCompleteTemplateHtml(this: AutoComplete) {var _vm=this;var _
// @ts-ignore
export var autoCompleteTemplateHtmlStatic = [ ]
// @ts-ignore
export function select2TemplateHtml(this: Select2) {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.containerStyle},[_c('div',{staticClass:"selection",on:{"click":function($event){return _vm.toggleOpenAndClose()}}},[_c('div',{class:_vm.selectionStyle,attrs:{"role":"combobox"}},[(!_vm.multiple)?_c('span',{staticClass:"select2-selection__rendered",attrs:{"title":_vm.option ? _vm.option.label : ''}},[(_vm.option)?[(_vm.option.component)?_c(_vm.option.component,{tag:"component",attrs:{"option":_vm.option}}):[_vm._v(_vm._s(_vm.option.label))]]:_c('span',{staticClass:"select2-selection__placeholder"},[_vm._v(_vm._s(_vm.placeholder))])],2):_vm._e(),_vm._v(" "),(!_vm.multiple)?_c('span',{staticClass:"select2-selection__arrow",attrs:{"role":"presentation"}},[_c('b',{attrs:{"role":"presentation"}})]):_vm._e(),_vm._v(" "),(_vm.multiple)?_c('ul',{staticClass:"select2-selection__rendered"},_vm._l((_vm.option),function(op,i){return _c('li',{key:i,staticClass:"select2-selection__choice",attrs:{"title":op.label}},[_c('span',{staticClass:"select2-selection__choice__remove",attrs:{"role":"presentation"},on:{"click":function($event){return _vm.removeSelection($event, op)}}},[_vm._v("×")]),_vm._v("\n "+_vm._s(op.label)+"\n ")])}),0):_vm._e()])]),_vm._v(" "),_c('div',{class:_vm.dropdownStyle},[_c('div',{staticClass:"select2-dropdown select2-dropdown--below"},[_c('div',{class:_vm.searchStyle},[_c('input',{directives:[{name:"model",rawName:"v-model",value:(_vm.searchText),expression:"searchText"}],ref:"searchInput",staticClass:"select2-search__field",attrs:{"type":"search","role":"textbox","autocomplete":"off","autocorrect":"off","autocapitalize":"off","maxlength":_vm.maximumInputLength,"spellcheck":"false"},domProps:{"value":(_vm.searchText)},on:{"keydown":function($event){return _vm.keyDown($event)},"keyup":function($event){return _vm.keyUp($event)},"keypress":function($event){return _vm.keyPress($event)},"focusout":function($event){return _vm.focusout()},"input":function($event){if($event.target.composing){ return; }_vm.searchText=$event.target.value}}})]),_vm._v(" "),_c('div',{staticClass:"select2-results"},[_c('ul',{ref:"results",staticClass:"select2-results__options",attrs:{"role":"tree","tabindex":"-1"},on:{"keydown":function($event){return _vm.keyDown($event)},"focus":function($event){return _vm.cancelFocusoutTimer()},"focusout":function($event){return _vm.focusout()}}},[_vm._l((_vm.filteredData),function(groupOrOption,i){return [(groupOrOption.options)?_c('li',{staticClass:"select2-results__option",attrs:{"role":"group"}},[_c('strong',{staticClass:"select2-results__group"},[_vm._v(_vm._s(groupOrOption.label))]),_vm._v(" "),_c('ul',{staticClass:"select2-results__options select2-results__options--nested"},_vm._l((groupOrOption.options),function(option,j){return _c('li',{key:j,class:_vm.getOptionStyle(option),attrs:{"role":"treeitem","aria-selected":_vm.isSelected(option),"aria-disabled":_vm.isDisabled(option)},on:{"mouseenter":function($event){return _vm.mouseenter(option)},"click":function($event){return _vm.click(option)}}},[(option.component)?_c(option.component,{tag:"component",attrs:{"option":option}}):[_vm._v(_vm._s(option.label))]],2)}),0)]):_c('li',{class:_vm.getOptionStyle(groupOrOption),attrs:{"role":"treeitem","aria-selected":_vm.isSelected(groupOrOption),"aria-disabled":_vm.isDisabled(groupOrOption)},on:{"mouseenter":function($event){return _vm.mouseenter(groupOrOption)},"click":function($event){return _vm.click(groupOrOption)}}},[(groupOrOption.component)?_c(groupOrOption.component,{tag:"component",attrs:{"option":groupOrOption}}):[_vm._v(_vm._s(groupOrOption.label))]],2)]})],2)])])])])}
export function select2TemplateHtml(this: Select2) {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.containerStyle},[_c('div',{staticClass:"selection",on:{"click":function($event){return _vm.toggleOpenAndClose()}}},[_c('div',{class:_vm.selectionStyle,attrs:{"role":"combobox"}},[(!_vm.multiple)?_c('span',{staticClass:"select2-selection__rendered",attrs:{"title":_vm.option ? _vm.option.label : ''}},[(_vm.option)?[(_vm.option.component)?_c(_vm.option.component,{tag:"component",attrs:{"option":_vm.option}}):[_vm._v(_vm._s(_vm.option.label))]]:_c('span',{staticClass:"select2-selection__placeholder"},[_vm._v(_vm._s(_vm.placeholder))])],2):_vm._e(),_vm._v(" "),(!_vm.multiple)?_c('span',{staticClass:"select2-selection__arrow",attrs:{"role":"presentation"}},[_c('b',{attrs:{"role":"presentation"}})]):_vm._e(),_vm._v(" "),(_vm.multiple)?_c('ul',{staticClass:"select2-selection__rendered"},_vm._l((_vm.option),function(op,i){return _c('li',{key:i,staticClass:"select2-selection__choice",attrs:{"title":op.label}},[_c('span',{staticClass:"select2-selection__choice__remove",attrs:{"role":"presentation"},on:{"click":function($event){return _vm.removeSelection($event, op)}}},[_vm._v("×")]),_vm._v("\n "+_vm._s(op.label)+"\n ")])}),0):_vm._e()])]),_vm._v(" "),_c('div',{class:_vm.dropdownStyle},[_c('div',{staticClass:"select2-dropdown select2-dropdown--below"},[_c('div',{class:_vm.searchStyle},[_c('input',{directives:[{name:"model",rawName:"v-model",value:(_vm.searchText),expression:"searchText"}],ref:"searchInput",staticClass:"select2-search__field",attrs:{"type":"search","role":"textbox","autocomplete":"off","autocorrect":"off","autocapitalize":"off","maxlength":_vm.maximumInputLength,"spellcheck":"false"},domProps:{"value":(_vm.searchText)},on:{"keydown":function($event){return _vm.keyDown($event)},"keyup":function($event){return _vm.keyUp($event)},"keypress":function($event){return _vm.keyPress($event)},"focus":function($event){return _vm.cancelFocusoutTimer()},"focusout":function($event){return _vm.focusout()},"input":function($event){if($event.target.composing){ return; }_vm.searchText=$event.target.value}}})]),_vm._v(" "),_c('div',{staticClass:"select2-results"},[_c('ul',{ref:"results",staticClass:"select2-results__options",attrs:{"role":"tree","tabindex":"-1"},on:{"keydown":function($event){return _vm.keyDown($event)},"focus":function($event){return _vm.cancelFocusoutTimer()},"focusout":function($event){return _vm.focusout()}}},[_vm._l((_vm.filteredData),function(groupOrOption,i){return [(groupOrOption.options)?_c('li',{staticClass:"select2-results__option",attrs:{"role":"group"}},[_c('strong',{staticClass:"select2-results__group"},[_vm._v(_vm._s(groupOrOption.label))]),_vm._v(" "),_c('ul',{staticClass:"select2-results__options select2-results__options--nested"},_vm._l((groupOrOption.options),function(option,j){return _c('li',{key:j,class:_vm.getOptionStyle(option),attrs:{"role":"treeitem","aria-selected":_vm.isSelected(option),"aria-disabled":_vm.isDisabled(option)},on:{"mouseenter":function($event){return _vm.mouseenter(option)},"click":function($event){return _vm.click(option)}}},[(option.component)?_c(option.component,{tag:"component",attrs:{"option":option}}):[_vm._v(_vm._s(option.label))]],2)}),0)]):_c('li',{class:_vm.getOptionStyle(groupOrOption),attrs:{"role":"treeitem","aria-selected":_vm.isSelected(groupOrOption),"aria-disabled":_vm.isDisabled(groupOrOption)},on:{"mouseenter":function($event){return _vm.mouseenter(groupOrOption)},"click":function($event){return _vm.click(groupOrOption)}}},[(groupOrOption.component)?_c(groupOrOption.component,{tag:"component",attrs:{"option":groupOrOption}}):[_vm._v(_vm._s(groupOrOption.label))]],2)]})],2)])])])])}
// @ts-ignore
export var select2TemplateHtmlStatic = [ ]
/* eslint-enable */
Expand Down
29 changes: 15 additions & 14 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1339,15 +1339,16 @@ clean-release@2.14.0:
rimraf "3"
tmp "0.2"

clean-scripts@1, clean-scripts@1.17.1:
version "1.17.1"
resolved "https://registry.yarnpkg.com/clean-scripts/-/clean-scripts-1.17.1.tgz#bbe439f3ada2424ee446c7e1e8753b014539e916"
integrity sha512-hnH7Zc4FrERo3cwF+ojJ2hCbqgiMJUfGSSkszA2GjZLW4ImJumRqHkE8wvbOa5iGsAC9xcS+yYUGt63duxjK4A==
clean-scripts@1, clean-scripts@1.18.0:
version "1.18.0"
resolved "https://registry.npm.taobao.org/clean-scripts/download/clean-scripts-1.18.0.tgz#6a92c1a6ece6a8303cb140d1f7bc5e57ce31c42e"
integrity sha1-apLBpuzmqDA8sUDR97xeV84xxC4=
dependencies:
glob "7"
minimist "1"
pidusage "2"
pretty-ms "7"
table "6"
tslib "1 || 2"

cli-cursor@^3.1.0:
Expand Down Expand Up @@ -5208,6 +5209,16 @@ svg-tags@^1.0.0:
resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=

table@6, table@^6.0.1:
version "6.0.3"
resolved "https://registry.npm.taobao.org/table/download/table-6.0.3.tgz#e5b8a834e37e27ad06de2e0fda42b55cfd8a0123"
integrity sha1-5bioNON+J60G3i4P2kK1XP2KASM=
dependencies:
ajv "^6.12.4"
lodash "^4.17.20"
slice-ansi "^4.0.0"
string-width "^4.2.0"

table@^5.2.3:
version "5.4.6"
resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
Expand All @@ -5218,16 +5229,6 @@ table@^5.2.3:
slice-ansi "^2.1.0"
string-width "^3.0.0"

table@^6.0.1:
version "6.0.3"
resolved "https://registry.yarnpkg.com/table/-/table-6.0.3.tgz#e5b8a834e37e27ad06de2e0fda42b55cfd8a0123"
integrity sha512-8321ZMcf1B9HvVX/btKv8mMZahCjn2aYrDlpqHaBFCfnox64edeH9kEid0vTLTRR8gWR2A20aDgeuTTea4sVtw==
dependencies:
ajv "^6.12.4"
lodash "^4.17.20"
slice-ansi "^4.0.0"
string-width "^4.2.0"

tapable@^1.0.0, tapable@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
Expand Down

0 comments on commit 2909e09

Please sign in to comment.