Merge pull request #26478 from ant-design/master

chore: merge master into feature
This commit is contained in:
偏右 2020-08-29 14:06:39 +08:00 committed by GitHub
commit 2d46fb72ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 385 additions and 364 deletions

View File

@ -30,7 +30,7 @@ exports[`AutoComplete legacy dataSource should accept react element option 1`] =
<div>
<div
class="ant-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div

View File

@ -4,7 +4,7 @@ exports[`Cascader can be selected 1`] = `
<div>
<div
class="ant-cascader-menus"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<ul
@ -117,7 +117,7 @@ exports[`Cascader can be selected 2`] = `
<div>
<div
class="ant-cascader-menus"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<ul
@ -364,7 +364,7 @@ exports[`Cascader can be selected in RTL direction 1`] = `
<div>
<div
class="ant-cascader-menus ant-cascader-menu-rtl"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<ul
@ -477,7 +477,7 @@ exports[`Cascader can be selected in RTL direction 2`] = `
<div>
<div
class="ant-cascader-menus ant-cascader-menu-rtl"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<ul
@ -601,7 +601,7 @@ exports[`Cascader have a notFoundContent that fit trigger input width 1`] = `
<div>
<div
class="ant-cascader-menus"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div>
<ul
@ -679,7 +679,7 @@ exports[`Cascader popup correctly when panel is open 1`] = `
<div>
<div
class="ant-cascader-menus"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<ul
@ -757,7 +757,7 @@ exports[`Cascader popup correctly with defaultValue 1`] = `
<div>
<div
class="ant-cascader-menus"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<ul
@ -881,7 +881,7 @@ exports[`Cascader popup correctly with defaultValue RTL 1`] = `
<div>
<div
class="ant-cascader-menus ant-cascader-menu-rtl"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<ul
@ -1133,6 +1133,7 @@ exports[`Cascader should highlight keyword and filter when search in Cascader 1`
style={
Object {
"opacity": 0,
"pointerEvents": "none",
"zIndex": undefined,
}
}
@ -1144,6 +1145,7 @@ exports[`Cascader should highlight keyword and filter when search in Cascader 1`
style={
Object {
"opacity": 0,
"pointerEvents": "none",
"zIndex": undefined,
}
}
@ -1442,7 +1444,7 @@ exports[`Cascader should highlight keyword and filter when search in Cascader wi
<div>
<div
class="ant-cascader-menus"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div>
<ul
@ -1573,6 +1575,7 @@ exports[`Cascader should render not found content 1`] = `
style={
Object {
"opacity": 0,
"pointerEvents": "none",
"zIndex": undefined,
}
}
@ -1584,6 +1587,7 @@ exports[`Cascader should render not found content 1`] = `
style={
Object {
"opacity": 0,
"pointerEvents": "none",
"zIndex": undefined,
}
}
@ -1894,6 +1898,7 @@ exports[`Cascader should show not found content when options.length is 0 1`] = `
style={
Object {
"opacity": 0,
"pointerEvents": "none",
"zIndex": undefined,
}
}
@ -1905,6 +1910,7 @@ exports[`Cascader should show not found content when options.length is 0 1`] = `
style={
Object {
"opacity": 0,
"pointerEvents": "none",
"zIndex": undefined,
}
}

View File

@ -34,7 +34,7 @@ Checkbox component.
| defaultValue | Default selected value | string\[] | \[] | |
| disabled | If disable all checkboxes | boolean | false | |
| name | The `name` property of all `input[type="checkbox"]` children | string | - | |
| options | Specifies options | string\[] | \[] | |
| options | Specifies options | Array<CheckboxOptionType \| string>[] | \[] | |
| value | Used for setting the currently selected value | string\[] | \[] | |
| onChange | The callback function that is triggered when the state changes | function(checkedValue) | - | |

View File

@ -18826,7 +18826,7 @@ exports[`ConfigProvider components Popconfirm configProvider 1`] = `
<div>
<div
class="config-popover config-popconfirm"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-popover-content"
@ -18910,7 +18910,7 @@ exports[`ConfigProvider components Popconfirm configProvider componentSize large
<div>
<div
class="config-popover config-popconfirm"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-popover-content"
@ -18994,7 +18994,7 @@ exports[`ConfigProvider components Popconfirm configProvider componentSize middl
<div>
<div
class="config-popover config-popconfirm"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-popover-content"
@ -19078,7 +19078,7 @@ exports[`ConfigProvider components Popconfirm configProvider virtual and dropdow
<div>
<div
class="ant-popover ant-popconfirm"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-popover-content"
@ -19162,7 +19162,7 @@ exports[`ConfigProvider components Popconfirm normal 1`] = `
<div>
<div
class="ant-popover ant-popconfirm"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-popover-content"
@ -19246,7 +19246,7 @@ exports[`ConfigProvider components Popconfirm prefixCls 1`] = `
<div>
<div
class="prefix-Popconfirm prefix-Popconfirm"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="prefix-Popconfirm-content"
@ -19330,7 +19330,7 @@ exports[`ConfigProvider components Popover configProvider 1`] = `
<div>
<div
class="config-popover"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-popover-content"
@ -19366,7 +19366,7 @@ exports[`ConfigProvider components Popover configProvider componentSize large 1`
<div>
<div
class="config-popover"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-popover-content"
@ -19402,7 +19402,7 @@ exports[`ConfigProvider components Popover configProvider componentSize middle 1
<div>
<div
class="config-popover"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-popover-content"
@ -19438,7 +19438,7 @@ exports[`ConfigProvider components Popover configProvider virtual and dropdownMa
<div>
<div
class="ant-popover"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-popover-content"
@ -19474,7 +19474,7 @@ exports[`ConfigProvider components Popover normal 1`] = `
<div>
<div
class="ant-popover"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-popover-content"
@ -19510,7 +19510,7 @@ exports[`ConfigProvider components Popover prefixCls 1`] = `
<div>
<div
class="prefix-Popover"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="prefix-Popover-content"
@ -21879,7 +21879,7 @@ exports[`ConfigProvider components Select configProvider 1`] = `
<div>
<div
class="config-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div
@ -22005,7 +22005,7 @@ exports[`ConfigProvider components Select configProvider componentSize large 1`]
<div>
<div
class="config-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div
@ -22131,7 +22131,7 @@ exports[`ConfigProvider components Select configProvider componentSize middle 1`
<div>
<div
class="config-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div
@ -22257,7 +22257,7 @@ exports[`ConfigProvider components Select configProvider virtual and dropdownMat
<div>
<div
class="ant-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div
@ -22383,7 +22383,7 @@ exports[`ConfigProvider components Select normal 1`] = `
<div>
<div
class="ant-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div
@ -22509,7 +22509,7 @@ exports[`ConfigProvider components Select prefixCls 1`] = `
<div>
<div
class="prefix-Select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div
@ -22797,7 +22797,7 @@ exports[`ConfigProvider components Slider configProvider 1`] = `
<div>
<div
class="config-tooltip config-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-tooltip-content"
@ -22851,7 +22851,7 @@ exports[`ConfigProvider components Slider configProvider componentSize large 1`]
<div>
<div
class="config-tooltip config-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-tooltip-content"
@ -22905,7 +22905,7 @@ exports[`ConfigProvider components Slider configProvider componentSize middle 1`
<div>
<div
class="config-tooltip config-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-tooltip-content"
@ -22959,7 +22959,7 @@ exports[`ConfigProvider components Slider configProvider virtual and dropdownMat
<div>
<div
class="ant-tooltip ant-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"
@ -23013,7 +23013,7 @@ exports[`ConfigProvider components Slider normal 1`] = `
<div>
<div
class="ant-tooltip ant-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"
@ -23067,7 +23067,7 @@ exports[`ConfigProvider components Slider prefixCls 1`] = `
<div>
<div
class="prefix-Slider-tooltip prefix-Slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="prefix-Slider-tooltip-content"
@ -23822,7 +23822,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
<div>
<div
class="config-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-table-filter-dropdown"
@ -24096,7 +24096,7 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`]
<div>
<div
class="config-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-table-filter-dropdown"
@ -24370,7 +24370,7 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`]
<div>
<div
class="config-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-table-filter-dropdown"
@ -24644,7 +24644,7 @@ exports[`ConfigProvider components Table configProvider virtual and dropdownMatc
<div>
<div
class="ant-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-table-filter-dropdown"
@ -24918,7 +24918,7 @@ exports[`ConfigProvider components Table normal 1`] = `
<div>
<div
class="ant-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-table-filter-dropdown"
@ -25192,7 +25192,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
<div>
<div
class="ant-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="prefix-Table-filter-dropdown"
@ -25992,7 +25992,7 @@ Array [
<div>
<div
class="config-picker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-picker-panel-container"
@ -27404,7 +27404,7 @@ Array [
<div>
<div
class="config-picker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-picker-panel-container"
@ -28816,7 +28816,7 @@ Array [
<div>
<div
class="config-picker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-picker-panel-container"
@ -30228,7 +30228,7 @@ Array [
<div>
<div
class="ant-picker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-picker-panel-container"
@ -31640,7 +31640,7 @@ Array [
<div>
<div
class="ant-picker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-picker-panel-container"
@ -33052,7 +33052,7 @@ Array [
<div>
<div
class="prefix-TimePicker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="prefix-TimePicker-panel-container"
@ -34558,7 +34558,7 @@ Array [
<div>
<div
class="config-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-tooltip-content"
@ -34592,7 +34592,7 @@ Array [
<div>
<div
class="config-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-tooltip-content"
@ -34626,7 +34626,7 @@ Array [
<div>
<div
class="config-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="config-tooltip-content"
@ -34660,7 +34660,7 @@ Array [
<div>
<div
class="ant-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"
@ -34694,7 +34694,7 @@ Array [
<div>
<div
class="ant-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"
@ -34728,7 +34728,7 @@ Array [
<div>
<div
class="prefix-Tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="prefix-Tooltip-content"
@ -37149,7 +37149,7 @@ exports[`ConfigProvider components TreeSelect configProvider 1`] = `
<div>
<div
class="config-select-dropdown config-tree-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div>
@ -37267,7 +37267,7 @@ exports[`ConfigProvider components TreeSelect configProvider componentSize large
<div>
<div
class="config-select-dropdown config-tree-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div>
@ -37385,7 +37385,7 @@ exports[`ConfigProvider components TreeSelect configProvider componentSize middl
<div>
<div
class="config-select-dropdown config-tree-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div>
@ -37503,7 +37503,7 @@ exports[`ConfigProvider components TreeSelect configProvider virtual and dropdow
<div>
<div
class="ant-select-dropdown ant-tree-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div>
@ -37621,7 +37621,7 @@ exports[`ConfigProvider components TreeSelect normal 1`] = `
<div>
<div
class="ant-select-dropdown ant-tree-select-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div>
@ -37739,7 +37739,7 @@ exports[`ConfigProvider components TreeSelect prefixCls 1`] = `
<div>
<div
class="prefix-TreeSelect-dropdown prefix-TreeSelect-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
<div>

View File

@ -45,7 +45,7 @@ Array [
<div>
<div
class="ant-picker-dropdown"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div
class="ant-picker-panel-container"
@ -669,7 +669,7 @@ Array [
<div>
<div
class="ant-picker-dropdown"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div
class="ant-picker-panel-container"

View File

@ -150,7 +150,7 @@ Array [
<div>
<div
class="ant-picker-dropdown ant-picker-dropdown-range"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-picker-range-wrapper ant-picker-date-range-wrapper"

View File

@ -4,7 +4,7 @@ exports[`MonthPicker and WeekPicker render MonthPicker 1`] = `
<div>
<div
class="ant-picker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-picker-panel-container"
@ -197,7 +197,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
<div>
<div
class="ant-picker-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-picker-panel-container"

View File

@ -156,7 +156,7 @@ Added in `4.1.0`.
| defaultValue | To set default date | \[[moment](http://momentjs.com/), [moment](http://momentjs.com/)] | - | |
| defaultPickerValue | To set default picker date | \[[moment](http://momentjs.com/), [moment](http://momentjs.com/)\] | - | |
| disabled | If disable start or end | \[boolean, boolean] | - | |
| disabledTime | To specify the time that cannot be selected | function(dates: \[moment, moment], partial: `start` \| `end`) | - | |
| disabledTime | To specify the time that cannot be selected | function(date: moment, partial: `start` \| `end`) | - | |
| format | To set the date format, refer to [moment.js](http://momentjs.com/). When an array is provided, all values are used for parsing and first value is used for formatting | string \| string[] | `YYYY-MM-DD HH:mm:ss` | |
| ranges | The preseted ranges for quick selection | { \[range: string]: [moment](http://momentjs.com/)\[] } \| { \[range: string]: () => [moment](http://momentjs.com/)\[] } | - | |
| renderExtraFooter | Render extra footer in panel | () => React.ReactNode | - | |

View File

@ -157,7 +157,7 @@ import locale from 'antd/es/locale/zh_CN';
| defaultValue | 默认日期 | [moment](http://momentjs.com/)\[] | - | |
| defaultPickerValue | 默认面板日期 | [moment](http://momentjs.com/)\[] | - | |
| disabled | 禁用起始项 | \[boolean, boolean] | - | |
| disabledTime | 不可选择的时间 | function(dates: \[moment, moment\], partial: `start` \| `end`) | - | |
| disabledTime | 不可选择的时间 | function(date: moment, partial: `start` \| `end`) | - | |
| format | 展示的日期格式 | string | `YYYY-MM-DD HH:mm:ss` | |
| ranges | 预设时间范围快捷选择 | { \[range: string]: [moment](http://momentjs.com/)\[] } \| { \[range: string]: () => [moment](http://momentjs.com/)\[] } | - | |
| renderExtraFooter | 在面板中添加额外的页脚 | () => React.ReactNode | - | |

View File

@ -11,7 +11,7 @@ Array [
<div>
<div
class="ant-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div>
menu
@ -32,7 +32,7 @@ Array [
<div>
<div
class="ant-dropdown"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<span>
string

View File

@ -3,7 +3,7 @@ category: Components
type: Data Display
title: Image
cols: 2
cover: https://gw.alipayobjects.com/zos/bmw-prod/a77ae075-27de-49c9-9f44-a505f2be07fa.svg
cover: https://gw.alipayobjects.com/zos/antfincdn/D1dXz9PZqa/image.svg
---
Previewable image.

View File

@ -4,7 +4,7 @@ subtitle: 图片
type: 数据展示
title: Image
cols: 2
cover: https://gw.alipayobjects.com/zos/bmw-prod/a77ae075-27de-49c9-9f44-a505f2be07fa.svg
cover: https://gw.alipayobjects.com/zos/antfincdn/D1dXz9PZqa/image.svg
---
可预览的图片。

View File

@ -396,7 +396,7 @@ exports[`List.pagination should change page size work 2`] = `
<div>
<div
class="ant-select-dropdown"
style="min-width: 0; opacity: 0;"
style="min-width: 0; opacity: 0; pointer-events: none;"
>
<div>
<div

View File

@ -12,7 +12,7 @@ Array [
<div>
<div
class="ant-popover ant-popover-rtl"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-popover-content"

View File

@ -7,7 +7,7 @@ import { ConfigContext } from '../config-provider';
import SizeContext from '../config-provider/SizeContext';
import { RadioGroupContextProvider } from './context';
const RadioGroup = React.forwardRef<unknown, RadioGroupProps>((props, ref) => {
const RadioGroup: React.FC<RadioGroupProps> = props => {
const { getPrefixCls, direction } = React.useContext(ConfigContext);
const size = React.useContext(SizeContext);
@ -53,7 +53,6 @@ const RadioGroup = React.forwardRef<unknown, RadioGroupProps>((props, ref) => {
// 此处类型自动推导为 string
return (
<Radio
ref={ref}
key={option}
prefixCls={optionsPrefixCls}
disabled={disabled}
@ -67,7 +66,6 @@ const RadioGroup = React.forwardRef<unknown, RadioGroupProps>((props, ref) => {
// 此处类型自动推导为 { label: string value: string }
return (
<Radio
ref={ref}
key={`radio-group-value-options-${option.value}`}
prefixCls={optionsPrefixCls}
disabled={option.disabled || disabled}
@ -116,7 +114,7 @@ const RadioGroup = React.forwardRef<unknown, RadioGroupProps>((props, ref) => {
{renderGroup()}
</RadioGroupContextProvider>
);
});
};
RadioGroup.defaultProps = {
buttonStyle: 'outline' as RadioGroupButtonStyle,

View File

@ -28,7 +28,7 @@
}
}
.@{select-prefix-cls}-focused&:not(.@{select-prefix-cls}-disabled&) {
.@{select-prefix-cls}-focused:not(.@{select-prefix-cls}-disabled)& {
.active();
}

View File

@ -957,7 +957,7 @@ exports[`renders ./components/slider/demo/show-tooltip.md correctly 1`] = `
<div>
<div
class="ant-tooltip ant-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"

View File

@ -57,7 +57,7 @@ exports[`Slider should render in RTL direction 1`] = `
<div>
<div
class="ant-tooltip ant-slider-tooltip ant-tooltip-rtl"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"
@ -88,7 +88,7 @@ exports[`Slider should show correct placement tooltip when set tooltipPlacement
<div>
<div
class="ant-tooltip ant-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"
@ -141,7 +141,7 @@ exports[`Slider should show tooltip when hovering slider handler 1`] = `
<div>
<div
class="ant-tooltip ant-slider-tooltip"
style="opacity:0"
style="opacity:0;pointer-events:none"
>
<div
class="ant-tooltip-content"

View File

@ -19,8 +19,10 @@ import { Space, Button, Popconfirm } from 'antd';
ReactDOM.render(
<Space>
Button
<Button>Button</Button>
<>
Button
<Button>Button</Button>
</>
Button
<Popconfirm title="Are you sure delete this task?" okText="Yes" cancelText="No">
<Button>Delete</Button>

View File

@ -1,5 +1,6 @@
import * as React from 'react';
import classNames from 'classnames';
import toArray from 'rc-util/lib/Children/toArray';
import { ConfigConsumerProps, ConfigContext } from '../config-provider';
import { SizeType } from '../config-provider/SizeContext';
import Item from './Item';
@ -31,9 +32,9 @@ const Space: React.FC<SpaceProps> = props => {
...otherProps
} = props;
const len = React.Children.count(children);
const childNodes = toArray(children, { keepEmpty: true });
if (len === 0) {
if (childNodes.length === 0) {
return null;
}
@ -55,7 +56,7 @@ const Space: React.FC<SpaceProps> = props => {
// Calculate latest one
let latestIndex = 0;
const nodes = React.Children.map(children, (child, i) => {
const nodes = childNodes.map((child, i) => {
if (child !== null && child !== undefined) {
latestIndex = i;
}

View File

@ -420,7 +420,7 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
let topPaginationNode: React.ReactNode;
let bottomPaginationNode: React.ReactNode;
if (pagination !== false) {
if (pagination !== false && mergedPagination?.total) {
let paginationSize: TablePaginationConfig['size'];
if (mergedPagination.size) {
paginationSize = mergedPagination.size;
@ -495,7 +495,7 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
internalRefs={internalRefs as any}
transformColumns={transformColumns}
/>
{mergedData && mergedData.length > 0 && bottomPaginationNode}
{bottomPaginationNode}
</Spin>
</div>
);

View File

@ -378,39 +378,24 @@ describe('Table.pagination', () => {
);
});
it('should render pagination after last item on last page being removed with async mode', () => {
const lastPageNum = data.length;
it('should render pagination after last item on last page being removed', () => {
const total = data.length;
const paginationProp = {
pageSize: 1,
total,
current: total,
position: ['topLeft', 'bottomLeft'],
};
const wrapper = mount(
createTable({ pagination: { pageSize: 1, total: data.length, current: lastPageNum } }),
createTable({
pagination: paginationProp,
}),
);
const newCol = [
{
title: 'Name',
dataIndex: 'name',
},
{
title: 'Action',
dataIndex: 'name',
render(_, record) {
const deleteRow = () => {
const newData = data.filter(d => d.key !== record.key);
wrapper.setProps({
dataSource: newData,
pagination: { pageSize: 1, total: newData.length, current: lastPageNum },
});
};
return (
<span className="btn-delete" onClick={deleteRow}>
Delete
</span>
);
},
},
];
wrapper.setProps({ columns: newCol });
wrapper.find('.btn-delete').simulate('click');
expect(wrapper.find('.ant-pagination')).toHaveLength(1);
wrapper.setProps({
dataSource: data.slice(total - 1),
pagination: { ...paginationProp, total: total - 1 },
});
expect(wrapper.find('.ant-pagination')).toHaveLength(2);
});
});

View File

@ -226,7 +226,7 @@ exports[`Table.filter renders custom filter icon with right Tooltip title 1`] =
<div>
<div
class="ant-tooltip"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div
class="ant-tooltip-content"
@ -709,7 +709,7 @@ exports[`Table.filter should support getPopupContainer 1`] = `
<div>
<div
class="ant-dropdown"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div
class="ant-table-filter-dropdown"
@ -942,7 +942,7 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
<div>
<div
class="ant-dropdown"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div
class="ant-table-filter-dropdown"

View File

@ -1038,7 +1038,7 @@ exports[`Table.rowSelection should support getPopupContainer 1`] = `
<div>
<div
class="ant-dropdown"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-light ant-dropdown-menu-root ant-dropdown-menu-vertical"
@ -1368,7 +1368,7 @@ exports[`Table.rowSelection should support getPopupContainer from ConfigProvider
<div>
<div
class="ant-dropdown"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-light ant-dropdown-menu-root ant-dropdown-menu-vertical"

View File

@ -16978,9 +16978,28 @@ exports[`renders ./components/table/demo/virtual-list.md correctly 1`] = `
style="overflow:hidden"
>
<table
style="table-layout:fixed;visibility:hidden"
style="table-layout:fixed"
>
<colgroup />
<colgroup>
<col
style="width:150px;min-width:150px"
/>
<col
style="width:0;min-width:0"
/>
<col
style="width:0;min-width:0"
/>
<col
style="width:0;min-width:0"
/>
<col
style="width:200px;min-width:200px"
/>
<col
style="width:100px;min-width:100px"
/>
</colgroup>
<thead
class="ant-table-thead"
>

View File

@ -118,7 +118,7 @@ Array [
<div>
<div
class="ant-picker-dropdown"
style="opacity: 0;"
style="opacity: 0; pointer-events: none;"
>
<div
class="ant-picker-panel-container"

View File

@ -0,0 +1,10 @@
import * as React from 'react';
import TimePicker from '..';
describe('TimePicker.typescript', () => {
it('No need picker props', () => {
const rangePicker = <TimePicker.RangePicker />;
expect(rangePicker).toBeTruthy();
});
});

View File

@ -12,7 +12,7 @@ export interface TimePickerLocale {
rangePlaceholder?: [string, string];
}
export interface TimeRangePickerProps extends RangePickerTimeProps<Moment> {}
export interface TimeRangePickerProps extends Omit<RangePickerTimeProps<Moment>, 'picker'> {}
const RangePicker = React.forwardRef<any, TimeRangePickerProps>((props, ref) => {
return <InternalRangePicker {...props} picker="time" mode={undefined} ref={ref} />;

View File

@ -34,7 +34,7 @@ exports[`TreeSelect TreeSelect Custom Icons should \`treeIcon\` work 1`] = `
<div>
<div
class="ant-select-dropdown ant-tree-select-dropdown"
style="opacity: 0; min-width: 0; width: 0px;"
style="opacity: 0; pointer-events: none; min-width: 0; width: 0px;"
>
<div>
<div>

View File

@ -17,7 +17,7 @@ Almost anything can be represented in a tree structure. Examples include directo
| Property | Description | Type | Default | Version |
| --- | --- | --- | --- | --- |
| autoExpandParent | Whether to automatically expand a parent treeNode | boolean | true | |
| autoExpandParent | Whether to automatically expand a parent treeNode | boolean | false | |
| blockNode | Whether treeNode fill remaining horizontal space | boolean | false | |
| checkable | Add a Checkbox before the treeNodes | boolean | false | |
| checkedKeys | (Controlled) Specifies the keys of the checked treeNodes (PS: When this specifies the key of a treeNode which is also a parent treeNode, all the children treeNodes of will be checked; and vice versa, when it specifies the key of a treeNode which is a child treeNode, its parent treeNode will also be checked. When `checkable` and `checkStrictly` is true, its object has `checked` and `halfChecked` property. Regardless of whether the child or parent treeNode is checked, they won't impact each other | string\[] \| {checked: string\[], halfChecked: string\[]} | \[] | |

View File

@ -18,7 +18,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/Xh-oWqg9k/Tree.svg
| 参数 | 说明 | 类型 | 默认值 | 版本 |
| --- | --- | --- | --- | --- |
| autoExpandParent | 是否自动展开父节点 | boolean | true | |
| autoExpandParent | 是否自动展开父节点 | boolean | false | |
| blockNode | 是否节点占据一行 | boolean | false | |
| checkable | 节点前添加 Checkbox 复选框 | boolean | false | |
| checkedKeys | (受控)选中复选框的树节点(注意:父子节点有关联,如果传入父节点 key则子节点自动选中相应当子节点 key 都传入,父节点也自动选中。当设置`checkable`和`checkStrictly`,它是一个有`checked`和`halfChecked`属性的对象,并且父子节点的选中与否不再关联 | string\[] \| {checked: string\[], halfChecked: string\[]} | \[] | |

View File

@ -148,7 +148,7 @@
"rc-tree-select": "~4.1.1",
"rc-trigger": "~4.4.0",
"rc-upload": "~3.2.0",
"rc-util": "^5.0.1",
"rc-util": "^5.1.0",
"scroll-into-view-if-needed": "^2.2.25",
"warning": "^4.0.3"
},

View File

@ -135,7 +135,7 @@ class MainContent extends Component {
return (
<Menu.ItemGroup title={menuItem.title} key={menuItem.title}>
{menuItem.children
.sort((a, b) => a.title.charCodeAt(0) - b.title.charCodeAt(0))
.sort((a, b) => a.title.localeCompare(b.title))
.map(leaf => this.generateMenuItem(false, leaf, footerNavIcons))}
</Menu.ItemGroup>
);