Skip to content

E
Element
Commit 41678094 authored by Jikkai Xiao's avatar Jikkai Xiao Committed by GitHub
Browse files
Options

Tree: fix keydown event in Tree (#12008)

parent 55c97e58
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
packages/tree/src/tree.vue
View file @ 41678094
...@@ -289,15 +289,15 @@ ...@@ -289,15 +289,15 @@
this.treeItems[0] && this.treeItems[0].setAttribute('tabindex', 0); this.treeItems[0] && this.treeItems[0].setAttribute('tabindex', 0);
}, },
handelKeydown(ev) { handleKeydown(ev) {
const currentItem = ev.target; const currentItem = ev.target;
if (currentItem.className.indexOf('el-tree-node') === -1) return; if (currentItem.className.indexOf('el-tree-node') === -1) return;
ev.preventDefault();
const keyCode = ev.keyCode; const keyCode = ev.keyCode;
this.treeItems = this.$el.querySelectorAll('.is-focusable[role=treeitem]'); this.treeItems = this.$el.querySelectorAll('.is-focusable[role=treeitem]');
const currentIndex = this.treeItemArray.indexOf(currentItem); const currentIndex = this.treeItemArray.indexOf(currentItem);
let nextIndex; let nextIndex;
if ([38, 40].indexOf(keyCode) > -1) { // up、down if ([38, 40].indexOf(keyCode) > -1) { // up、down
ev.preventDefault();
if (keyCode === 38) { // up if (keyCode === 38) { // up
nextIndex = currentIndex !== 0 ? currentIndex - 1 : 0; nextIndex = currentIndex !== 0 ? currentIndex - 1 : 0;
} else { } else {
...@@ -306,10 +306,12 @@ ...@@ -306,10 +306,12 @@
this.treeItemArray[nextIndex].focus(); // 选中 this.treeItemArray[nextIndex].focus(); // 选中
} }
if ([37, 39].indexOf(keyCode) > -1) { // left、right 展开 if ([37, 39].indexOf(keyCode) > -1) { // left、right 展开
ev.preventDefault();
currentItem.click(); // 选中 currentItem.click(); // 选中
} }
const hasInput = currentItem.querySelector('[type="checkbox"]'); const hasInput = currentItem.querySelector('[type="checkbox"]');
if ([13, 32].indexOf(keyCode) > -1 && hasInput) { // space enter选中checkbox if ([13, 32].indexOf(keyCode) > -1 && hasInput) { // space enter选中checkbox
ev.preventDefault();
hasInput.click(); hasInput.click();
} }
} }
...@@ -476,7 +478,7 @@ ...@@ -476,7 +478,7 @@
mounted() { mounted() {
this.initTabIndex(); this.initTabIndex();
this.$el.addEventListener('keydown', this.handelKeydown); this.$el.addEventListener('keydown', this.handleKeydown);
}, },
updated() { updated() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment