From 6ae2a193f6306e773dda7f2f591def1aa02fdcce Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 2 Sep 2019 22:49:34 +0800
Subject: [PATCH] update vc-cascader to 0.17.4
---
.../__snapshots__/index.test.js.snap | 34 +++++++++----------
components/vc-cascader/Cascader.jsx | 9 +++--
components/vc-cascader/Menus.jsx | 7 ++--
components/vc-cascader/index.js | 2 +-
4 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/components/cascader/__tests__/__snapshots__/index.test.js.snap b/components/cascader/__tests__/__snapshots__/index.test.js.snap
index 4e9df1302..d54dbb0b1 100644
--- a/components/cascader/__tests__/__snapshots__/index.test.js.snap
+++ b/components/cascader/__tests__/__snapshots__/index.test.js.snap
@@ -5,11 +5,11 @@ exports[`Cascader can be selected 1`] = `
@@ -21,14 +21,14 @@ exports[`Cascader can be selected 2`] = `
@@ -40,14 +40,14 @@ exports[`Cascader can be selected 3`] = `
@@ -67,8 +67,8 @@ exports[`Cascader popup correctly when panel is open 1`] = `
@@ -80,14 +80,14 @@ exports[`Cascader popup correctly with defaultValue 1`] = `
diff --git a/components/vc-cascader/Cascader.jsx b/components/vc-cascader/Cascader.jsx
index a3510ebfa..b984a5c1d 100644
--- a/components/vc-cascader/Cascader.jsx
+++ b/components/vc-cascader/Cascader.jsx
@@ -243,8 +243,10 @@ export default {
e.keyCode !== KeyCode.LEFT &&
e.keyCode !== KeyCode.RIGHT &&
e.keyCode !== KeyCode.ENTER &&
+ e.keyCode !== KeyCode.SPACE &&
e.keyCode !== KeyCode.BACKSPACE &&
- e.keyCode !== KeyCode.ESC
+ e.keyCode !== KeyCode.ESC &&
+ e.keyCode !== KeyCode.TAB
) {
return;
}
@@ -254,7 +256,8 @@ export default {
e.keyCode !== KeyCode.BACKSPACE &&
e.keyCode !== KeyCode.LEFT &&
e.keyCode !== KeyCode.RIGHT &&
- e.keyCode !== KeyCode.ESC
+ e.keyCode !== KeyCode.ESC &&
+ e.keyCode !== KeyCode.TAB
) {
this.setPopupVisible(true);
return;
@@ -289,7 +292,7 @@ export default {
],
);
}
- } else if (e.keyCode === KeyCode.ESC) {
+ } else if (e.keyCode === KeyCode.ESC || e.keyCode === KeyCode.TAB) {
this.setPopupVisible(false);
return;
}
diff --git a/components/vc-cascader/Menus.jsx b/components/vc-cascader/Menus.jsx
index cb8e53101..0f5364b02 100644
--- a/components/vc-cascader/Menus.jsx
+++ b/components/vc-cascader/Menus.jsx
@@ -56,10 +56,13 @@ export default {
};
const key = option[this.getFieldName('value')];
const expandProps = {
- attrs: {},
+ attrs: {
+ role: "menuitem",
+ },
on: {
click: onSelect,
doubleclick: onItemDoubleClick,
+ mousedown: e => e.preventDefault(),
},
key: Array.isArray(key) ? key.join('__ant__') : key,
};
@@ -73,7 +76,7 @@ export default {
expandIconNode = {expandIcon};
}
}
- if (expandTrigger === 'hover' && hasChildren) {
+ if (expandTrigger === 'hover' && (hasChildren || option.isLeaf === false)) {
expandProps.on = {
mouseenter: this.delayOnSelect.bind(this, onSelect),
mouseleave: this.delayOnSelect.bind(this),
diff --git a/components/vc-cascader/index.js b/components/vc-cascader/index.js
index e3d0e9b3a..4bd1fc80a 100644
--- a/components/vc-cascader/index.js
+++ b/components/vc-cascader/index.js
@@ -1,3 +1,3 @@
-// based on rc-cascader 0.17.1
+// based on rc-cascader 0.17.4
import Cascader from './Cascader';
export default Cascader;