Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: empty in cascader/select/table/treeSelect #24279

Merged
merged 2 commits into from
May 19, 2020
Merged

fix: empty in cascader/select/table/treeSelect #24279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53ab7f8
fix: empty in cascader\select\table\treeSelect
xrkffgg May 19, 2020
268d752
fix: snap
xrkffgg May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions components/cascader/__tests__/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ exports[`Cascader have a notFoundContent that fit trigger input width 1`] = `
class="ant-cascader-menu"
>
<li
class="ant-cascader-menu-item ant-cascader-menu-item-disabled"
class="ant-cascader-menu-item"
role="menuitem"
title=""
>
Expand Down Expand Up @@ -1493,7 +1493,7 @@ exports[`Cascader should render not found content 1`] = `
],
}
}
className=""
className="ant-cascader-menu-empty"
destroyPopupOnHide={false}
getClassNameFromAlign={[Function]}
getRootDomNode={[Function]}
Expand Down Expand Up @@ -1552,7 +1552,7 @@ exports[`Cascader should render not found content 1`] = `
target={[Function]}
>
<PopupInner
className="ant-cascader-menus"
className="ant-cascader-menus ant-cascader-menu-empty"
hiddenClassName="ant-cascader-menus-hidden"
onMouseDown={[Function]}
onTouchStart={[Function]}
Expand All @@ -1566,7 +1566,7 @@ exports[`Cascader should render not found content 1`] = `
visible={true}
>
<div
className="ant-cascader-menus"
className="ant-cascader-menus ant-cascader-menu-empty"
onMouseDown={[Function]}
onTouchStart={[Function]}
style={
Expand Down Expand Up @@ -1687,7 +1687,7 @@ exports[`Cascader should render not found content 1`] = `
},
]
}
popupClassName=""
popupClassName="ant-cascader-menu-empty"
popupPlacement="bottomLeft"
popupVisible={true}
prefixCls="ant-cascader"
Expand Down Expand Up @@ -1808,7 +1808,7 @@ exports[`Cascader should show not found content when options.length is 0 1`] = `
],
}
}
className=""
className="ant-cascader-menu-empty"
destroyPopupOnHide={false}
getClassNameFromAlign={[Function]}
getRootDomNode={[Function]}
Expand Down Expand Up @@ -1867,7 +1867,7 @@ exports[`Cascader should show not found content when options.length is 0 1`] = `
target={[Function]}
>
<PopupInner
className="ant-cascader-menus"
className="ant-cascader-menus ant-cascader-menu-empty"
hiddenClassName="ant-cascader-menus-hidden"
onMouseDown={[Function]}
onTouchStart={[Function]}
Expand All @@ -1881,7 +1881,7 @@ exports[`Cascader should show not found content when options.length is 0 1`] = `
visible={true}
>
<div
className="ant-cascader-menus"
className="ant-cascader-menus ant-cascader-menu-empty"
onMouseDown={[Function]}
onTouchStart={[Function]}
style={
Expand Down Expand Up @@ -1988,15 +1988,14 @@ exports[`Cascader should show not found content when options.length is 0 1`] = `
options={
Array [
Object {
"disabled": true,
"label": <Context.Consumer>
[Function]
</Context.Consumer>,
"value": "ANT_CASCADER_NOT_FOUND",
},
]
}
popupClassName=""
popupClassName="ant-cascader-menu-empty"
popupPlacement="bottomLeft"
popupVisible={true}
prefixCls="ant-cascader"
Expand All @@ -2011,7 +2010,7 @@ exports[`Cascader should show not found content when options.length is 0 1`] = `
style={Object {}}
>
<li
className="ant-cascader-menu-item ant-cascader-menu-item-disabled"
className="ant-cascader-menu-item"
key="ANT_CASCADER_NOT_FOUND"
onClick={[Function]}
onDoubleClick={[Function]}
Expand Down
7 changes: 4 additions & 3 deletions components/cascader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,6 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {
{
[names.label]: notFoundContent || renderEmpty('Cascader'),
[names.value]: 'ANT_CASCADER_NOT_FOUND',
disabled: true,
},
];
}
Expand Down Expand Up @@ -610,8 +609,10 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {

const getPopupContainer = props.getPopupContainer || getContextPopupContainer;
const rest = omit(props, ['inputIcon', 'expandIcon', 'loadingIcon', 'bordered']);
const rcCascaderRtlPopupClassName = classNames(popupClassName, {
const rcCascaderPopupClassName = classNames(popupClassName, {
[`${prefixCls}-menu-${direction}`]: direction === 'rtl',
[`${prefixCls}-menu-empty`]:
options.length === 1 && options[0].value === 'ANT_CASCADER_NOT_FOUND',
});
return (
<RcCascader
Expand All @@ -626,7 +627,7 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {
dropdownMenuColumnStyle={dropdownMenuColumnStyle}
expandIcon={expandIcon}
loadingIcon={loadingIcon}
popupClassName={rcCascaderRtlPopupClassName}
popupClassName={rcCascaderPopupClassName}
popupPlacement={this.getPopupPlacement(direction)}
>
{input}
Expand Down
5 changes: 5 additions & 0 deletions components/cascader/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@
background: transparent;
}
}
.@{cascader-prefix-cls}-menu-empty & {
color: @disabled-color;
cursor: default;
pointer-events: none;
}
&-active:not(&-disabled) {
&,
&:hover {
Expand Down
10 changes: 5 additions & 5 deletions components/config-provider/__tests__/__snapshots__/components.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19481,7 +19481,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
class="config-spin-container"
>
<div
class="config-table"
class="config-table config-table-empty"
>
<div
class="config-table-container"
Expand Down Expand Up @@ -19755,7 +19755,7 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`]
class="config-spin-container"
>
<div
class="config-table"
class="config-table config-table-empty"
>
<div
class="config-table-container"
Expand Down Expand Up @@ -20029,7 +20029,7 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`]
class="config-spin-container"
>
<div
class="config-table config-table-middle"
class="config-table config-table-middle config-table-empty"
>
<div
class="config-table-container"
Expand Down Expand Up @@ -20303,7 +20303,7 @@ exports[`ConfigProvider components Table normal 1`] = `
class="ant-spin-container"
>
<div
class="ant-table"
class="ant-table ant-table-empty"
>
<div
class="ant-table-container"
Expand Down Expand Up @@ -20577,7 +20577,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
class="ant-spin-container"
>
<div
class="prefix-Table"
class="prefix-Table prefix-Table-empty"
>
<div
class="prefix-Table-container"
Expand Down
2 changes: 1 addition & 1 deletion components/empty/__tests__/__snapshots__/demo.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ exports[`renders ./components/empty/demo/config-provider.md correctly 1`] = `
class="ant-spin-container"
>
<div
class="ant-table"
class="ant-table ant-table-empty"
>
<div
class="ant-table-container"
Expand Down
Loading