github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf: remove cascader events warning

pull/2682/head
tanjinzhou 2020-07-28 15:23:56 +08:00
parent 7e15533f52
commit 42431d39a2
8 changed files with 142 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
antdv-demo

@ -1 +1 @@
Subproject commit 8b691ca22c5a535a911f9bde1d149f1e7a9da652 Subproject commit 156f6e903435aff90e130518d80dd676fae22c5d

101
components/cascader/__tests__/__snapshots__/index.test.js.snap
View File

@ -2,73 +2,82 @@
exports[`Cascader can be selected 1`] = ` exports[`Cascader can be selected 1`] = `
<div> <div>
<div class="ant-cascader-menus ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;">
<div class="ant-cascader-menus-content">
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active" title="Zhejiang" role="menuitem">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<li role="menuitem" title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <!---->
</li>
<li class="ant-cascader-menu-item ant-cascader-menu-item-expand" title="Jiangsu" role="menuitem">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand" title="Hangzhou" role="menuitem">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
</div> </div>
</div>
</div>
`; `;
exports[`Cascader can be selected 2`] = ` exports[`Cascader can be selected 2`] = `
<div> <div>
<div class="ant-cascader-menus ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;">
<div class="ant-cascader-menus-content">
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active" title="Zhejiang" role="menuitem">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<li role="menuitem" title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <!---->
</li>
<li class="ant-cascader-menu-item ant-cascader-menu-item-expand" title="Jiangsu" role="menuitem">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active" title="Hangzhou" role="menuitem">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="West Lake" class="ant-cascader-menu-item">West Lake</li> <li class="ant-cascader-menu-item" title="West Lake" role="menuitem">West Lake
<!---->
<!---->
</li>
</ul> </ul>
</div> </div>
</div>
</div>
`; `;
exports[`Cascader can be selected 3`] = ` exports[`Cascader can be selected 3`] = `
<div> <div>
<div class="ant-cascader-menus ant-cascader-menus-placement-bottomLeft" style="display: none;">
<div class="ant-cascader-menus-content">
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active" title="Zhejiang" role="menuitem">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<li role="menuitem" title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <!---->
</li>
<li class="ant-cascader-menu-item ant-cascader-menu-item-expand" title="Jiangsu" role="menuitem">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active" title="Hangzhou" role="menuitem">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="West Lake" class="ant-cascader-menu-item ant-cascader-menu-item-active">West Lake</li> <li class="ant-cascader-menu-item ant-cascader-menu-item-active" title="West Lake" role="menuitem">West Lake
<!---->
<!---->
</li>
</ul> </ul>
</div> </div>
</div>
</div>
`;
exports[`Cascader popup correctly when panel is hidden 1`] = `
<div>
<div class="ant-cascader-menus ant-cascader-menus-empty ant-cascader-menus-placement-bottomLeft" style="display: none;">
<div class="ant-cascader-menus-content"></div>
</div>
</div>
`; `;
exports[`Cascader popup correctly when panel is open 1`] = ` exports[`Cascader popup correctly when panel is open 1`] = `
<div> <div>
<!---->
<div class="ant-cascader-menus ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;"> <div class="ant-cascader-menus ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;">
<div class="ant-cascader-menus-content"> <div>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand" title="Zhejiang" role="menuitem">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<li role="menuitem" title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <!---->
</li>
<li class="ant-cascader-menu-item ant-cascader-menu-item-expand" title="Jiangsu" role="menuitem">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
</div> </div>
</div> </div>
@ -77,21 +86,31 @@ exports[`Cascader popup correctly when panel is open 1`] = `
exports[`Cascader popup correctly with defaultValue 1`] = ` exports[`Cascader popup correctly with defaultValue 1`] = `
<div> <div>
<div class="ant-cascader-menus ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;"> <!---->
<div class="ant-cascader-menus-content"> <div class="ant-cascader-menus ant-cascader-menus-placement-bottomLeft slide-up-enter" style="left: -999px; top: -995px;">
<div>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active" title="Zhejiang" role="menuitem">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<li role="menuitem" title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <!---->
</li>
<li class="ant-cascader-menu-item ant-cascader-menu-item-expand" title="Jiangsu" role="menuitem">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span></li> <li class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active" title="Hangzhou" role="menuitem">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><span class="anticon anticon-right" role="img" aria-label="right"><svg class="" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></span>
<!---->
</li>
</ul> </ul>
<ul class="ant-cascader-menu"> <ul class="ant-cascader-menu">
<li role="menuitem" title="West Lake" class="ant-cascader-menu-item">West Lake</li> <li class="ant-cascader-menu-item" title="West Lake" role="menuitem">West Lake
<!---->
<!---->
</li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
`; `;
exports[`Cascader support controlled mode 1`] = `<span tabindex="0" class="ant-cascader-picker"><input type="text" readonly="true" class="ant-input ant-cascader-input "><span class="ant-cascader-picker-label">Zhejiang / Hangzhou / West Lake</span><span role="img" aria-label="close-circle" tabindex="-1" class="anticon anticon-close-circle ant-cascader-picker-clear"><svg viewBox="64 64 896 896" focusable="false" data-icon="close-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 01-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"></path></svg></span><span role="img" aria-label="down" class="anticon anticon-down ant-cascader-picker-arrow"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>`; exports[`Cascader support controlled mode 1`] = `<!----><span class="ant-cascader-picker" tabindex="0"><span class="ant-cascader-picker-label">Zhejiang / Hangzhou / West Lake</span><input readonly="" type="text" autocomplete="off" class="ant-input ant-cascader-input "><span class="anticon anticon-close-circle ant-cascader-picker-clear" role="img" aria-label="close-circle" tabindex="-1"><svg class="" data-icon="close-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 01-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"></path></svg></span><span class="anticon anticon-down ant-cascader-picker-arrow" role="img" aria-label="down"><svg class="" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>`;

152
components/cascader/__tests__/index.test.js
View File

@ -48,41 +48,29 @@ function filter(inputValue, path) {
describe('Cascader', () => { describe('Cascader', () => {
focusTest(Cascader); focusTest(Cascader);
beforeEach(() => {
document.body.innerHTML = '';
});
it('popup correctly when panel is hidden', async () => { it('popup correctly when panel is hidden', async () => {
const wrapper = mount(Cascader, { props: { options }, sync: false }); mount(Cascader, {
const CascaderWrapper = mount( props: { options },
{ sync: false,
render() { attachTo: 'body',
return wrapper.find({ name: 'Trigger' }).vm.getComponent(); });
},
},
{ sync: false },
);
await asyncExpect(() => { await asyncExpect(() => {
expect(CascaderWrapper.html()).toMatchSnapshot(); expect($$('.ant-cascader-menus').length).toBe(0);
}); });
}); });
it('popup correctly when panel is open', async () => { it('popup correctly when panel is open', async () => {
const wrapper = mount(Cascader, { props: { options }, sync: false }); const wrapper = mount(Cascader, { props: { options }, sync: false, attachTo: 'body' });
await asyncExpect(() => { await asyncExpect(() => {
wrapper.find('input').trigger('click'); wrapper.find('input').trigger('click');
}); });
let CascaderWrapper = null; expect($$('.ant-cascader-menus').length).toBe(1);
await asyncExpect(() => { await asyncExpect(() => {
CascaderWrapper = mount( expect($$('.ant-cascader-menus')[0].parentNode.parentNode.innerHTML).toMatchSnapshot();
{ }, 1000);
render() {
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
});
await asyncExpect(() => {
expect(CascaderWrapper.html()).toMatchSnapshot();
});
}); });
it('support controlled mode', async () => { it('support controlled mode', async () => {
@ -109,20 +97,9 @@ describe('Cascader', () => {
await asyncExpect(() => { await asyncExpect(() => {
wrapper.find('input').trigger('click'); wrapper.find('input').trigger('click');
}); });
let CascaderWrapper = null; expect($$('.ant-cascader-menus').length).toBe(1);
await asyncExpect(() => { await asyncExpect(() => {
CascaderWrapper = mount( expect($$('.ant-cascader-menus')[0].parentNode.parentNode.innerHTML).toMatchSnapshot();
{
render() {
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
});
await asyncExpect(() => {
expect(CascaderWrapper.html()).toMatchSnapshot();
}); });
}); });
@ -131,100 +108,35 @@ describe('Cascader', () => {
await asyncExpect(() => { await asyncExpect(() => {
wrapper.find('input').trigger('click'); wrapper.find('input').trigger('click');
}); });
let popupWrapper = null;
await asyncExpect(() => { await asyncExpect(() => {
popupWrapper = mount( $$('.ant-cascader-menu')[0]
{ .querySelectorAll('.ant-cascader-menu-item')[0]
render() { .click();
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
});
await asyncExpect(() => {
popupWrapper
.findAll('.ant-cascader-menu')
.at(0)
.findAll('.ant-cascader-menu-item')
.at(0)
.trigger('click');
});
await asyncExpect(() => {
popupWrapper = mount(
{
render() {
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
}); });
await asyncExpect(() => { await asyncExpect(() => {
expect(popupWrapper.html()).toMatchSnapshot(); expect($$('.ant-cascader-menus')[0].innerHTML).toMatchSnapshot();
}); });
await asyncExpect(() => { await asyncExpect(() => {
popupWrapper = mount( $$('.ant-cascader-menu')[1]
{ .querySelectorAll('.ant-cascader-menu-item')[0]
render() { .click();
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
}); });
await asyncExpect(() => { await asyncExpect(() => {
popupWrapper expect($$('.ant-cascader-menus')[0].innerHTML).toMatchSnapshot();
.findAll('.ant-cascader-menu')
.at(1)
.findAll('.ant-cascader-menu-item')
.at(0)
.trigger('click');
}); });
await asyncExpect(() => { await asyncExpect(() => {
popupWrapper = mount( $$('.ant-cascader-menu')[2]
{ .querySelectorAll('.ant-cascader-menu-item')[0]
render() { .click();
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
}); });
await asyncExpect(() => { await asyncExpect(() => {
expect(popupWrapper.html()).toMatchSnapshot(); expect($$('.ant-cascader-menus')[0].innerHTML).toMatchSnapshot();
});
await asyncExpect(() => {
popupWrapper = mount(
{
render() {
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
});
await asyncExpect(() => {
popupWrapper
.findAll('.ant-cascader-menu')
.at(2)
.findAll('.ant-cascader-menu-item')
.at(0)
.trigger('click');
});
await asyncExpect(() => {
popupWrapper = mount(
{
render() {
return wrapper.find({ name: 'Trigger' }).vm.getComponent();
},
},
{ sync: false },
);
});
await asyncExpect(() => {
expect(popupWrapper.html()).toMatchSnapshot();
}); });
}); });

25
components/cascader/index.jsx
View File

@ -92,6 +92,13 @@ const CascaderProps = {
fieldNames: FieldNamesType, fieldNames: FieldNamesType,
autofocus: PropTypes.bool, autofocus: PropTypes.bool,
suffixIcon: PropTypes.any, suffixIcon: PropTypes.any,
showSearchRender: PropTypes.any,
onChange: PropTypes.func,
onPopupVisibleChange: PropTypes.func,
onFocus: PropTypes.func,
onBlur: PropTypes.func,
onSearch: PropTypes.func,
'onUpdate:value': PropTypes.func,
}; };
// We limit the filtered item count by default // We limit the filtered item count by default
@ -423,6 +430,7 @@ const Cascader = {
// Fix bug of https://github.com/facebook/react/pull/5004 // Fix bug of https://github.com/facebook/react/pull/5004
// and https://fb.me/react-unknown-prop // and https://fb.me/react-unknown-prop
const tempInputProps = omit(otherProps, [ const tempInputProps = omit(otherProps, [
'popupStyle',
'options', 'options',
'popupPlacement', 'popupPlacement',
'transitionName', 'transitionName',
@ -439,6 +447,12 @@ const Cascader = {
'notFoundContent', 'notFoundContent',
'defaultValue', 'defaultValue',
'fieldNames', 'fieldNames',
'onChange',
'onPopupVisibleChange',
'onFocus',
'onBlur',
'onSearch',
'onUpdate:value',
]); ]);
let options = props.options; let options = props.options;
@ -486,9 +500,9 @@ const Cascader = {
readonly: !showSearch, readonly: !showSearch,
autocomplete: 'off', autocomplete: 'off',
class: `${prefixCls}-input ${sizeCls}`, class: `${prefixCls}-input ${sizeCls}`,
onFocus: showSearch ? this.handleInputFocus : noop, onFocus: this.handleInputFocus,
onClick: showSearch ? this.handleInputClick : noop, onClick: showSearch ? this.handleInputClick : noop,
onBlur: showSearch ? this.handleInputBlur : noop, onBlur: showSearch ? this.handleInputBlur : props.onBlur,
onKeydown: this.handleKeyDown, onKeydown: this.handleKeyDown,
onChange: showSearch ? this.handleInputChange : noop, onChange: showSearch ? this.handleInputChange : noop,
}; };
@ -496,9 +510,7 @@ const Cascader = {
const inputIcon = (suffixIcon && const inputIcon = (suffixIcon &&
(isValidElement(suffixIcon) ? ( (isValidElement(suffixIcon) ? (
cloneElement(suffixIcon, { cloneElement(suffixIcon, {
class: { class: `${prefixCls}-picker-arrow`,
[`${prefixCls}-picker-arrow`]: true,
},
}) })
) : ( ) : (
<span class={`${prefixCls}-picker-arrow`}>{suffixIcon}</span> <span class={`${prefixCls}-picker-arrow`}>{suffixIcon}</span>
@ -508,9 +520,8 @@ const Cascader = {
children children
) : ( ) : (
<span class={pickerCls} style={style}> <span class={pickerCls} style={style}>
{showSearch ? <span class={`${prefixCls}-picker-label`}>{this.getLabel()}</span> : null} <span class={`${prefixCls}-picker-label`}>{this.getLabel()}</span>
<Input {...inputProps} ref={this.saveInput} /> <Input {...inputProps} ref={this.saveInput} />
{!showSearch ? <span class={`${prefixCls}-picker-label`}>{this.getLabel()}</span> : null}
{clearIcon} {clearIcon}
{inputIcon} {inputIcon}
</span> </span>

5
components/input/Input.jsx
View File

@ -75,6 +75,11 @@ export default {
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
if (process.env.NODE_ENV === 'test') {
if (this.autofocus) {
this.focus();
}
}
this.clearPasswordValueAttribute(); this.clearPasswordValueAttribute();
}); });
}, },

1
components/vc-cascader/Cascader.jsx
View File

@ -164,7 +164,6 @@ export default {
handleChange(options, setProps, e) { handleChange(options, setProps, e) {
if (e.type !== 'keydown' || e.keyCode === KeyCode.ENTER) { if (e.type !== 'keydown' || e.keyCode === KeyCode.ENTER) {
const value = options.map(o => o[this.getFieldName('value')]); const value = options.map(o => o[this.getFieldName('value')]);
this.__emit('update:value', value);
this.__emit('change', value, options); this.__emit('change', value, options);
this.setPopupVisible(setProps.visible); this.setPopupVisible(setProps.visible);
} }

2
examples/App.vue
View File

@ -4,7 +4,7 @@
</div> </div>
</template> </template>
<script> <script>
import demo from '../antdv-demo/docs/carousel/demo/position'; import demo from '../antdv-demo/docs/cascader/demo/index';
export default { export default {
components: { components: {

16
tests/shared/focusTest.js
View File

@ -11,15 +11,15 @@ export default function focusTest(Component) {
jest.useRealTimers(); jest.useRealTimers();
}); });
it('focus() and onFocus', () => { it('focus() and onFocus', async () => {
const handleFocus = jest.fn(); const handleFocus = jest.fn();
const wrapper = mount( const wrapper = mount(
{ {
render(h) { render() {
return <Component ref="component" onFocus={handleFocus} />; return <Component ref="component" onFocus={handleFocus} />;
}, },
}, },
{ attachToDocument: true, sync: false }, { attachTo: 'body', sync: false },
); );
wrapper.vm.$refs.component.focus(); wrapper.vm.$refs.component.focus();
jest.runAllTimers(); jest.runAllTimers();
@ -30,11 +30,11 @@ export default function focusTest(Component) {
const handleBlur = jest.fn(); const handleBlur = jest.fn();
const wrapper = mount( const wrapper = mount(
{ {
render(h) { render() {
return <Component ref="component" onBlur={handleBlur} />; return <Component ref="component" onBlur={handleBlur} />;
}, },
}, },
{ attachToDocument: true, sync: false }, { attachTo: 'body', sync: false },
); );
wrapper.vm.$refs.component.focus(); wrapper.vm.$refs.component.focus();
wrapper.vm.$refs.component.blur(); wrapper.vm.$refs.component.blur();
@ -49,11 +49,11 @@ export default function focusTest(Component) {
const handleFocus = jest.fn(); const handleFocus = jest.fn();
mount( mount(
{ {
render(h) { render() {
return <Component autofocus onFocus={handleFocus} />; return <Component autofocus={true} onFocus={handleFocus} />;
}, },
}, },
{ attachToDocument: true, sync: false }, { attachTo: 'body', sync: false },
); );
setTimeout(() => { setTimeout(() => {
expect(handleFocus).toBeCalled(); expect(handleFocus).toBeCalled();