mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-29 13:47:02 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge pull request #22694 from ant-design/feature-merge-master

Browse Source 
chore: Feature merge master
This commit is contained in:
二货机器人 2020-03-28 16:43:00 +08:00 committed by GitHub
commit 2cfad04ccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 167 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/badge/style/rtl.less
View File

@ -15,6 +15,7 @@
.@{badge-prefix-cls}-rtl & {
right: auto;
left: 0;
direction: ltr;
transform: translate(-50%, -50%);
transform-origin: 0% 0%;
}

2
components/button/button-group.tsx
View File

@ -10,7 +10,7 @@ export interface ButtonGroupProps {
prefixCls?: string;
}
const ButtonGroup: React.SFC<ButtonGroupProps> = props => (
const ButtonGroup: React.FC<ButtonGroupProps> = props => (
<ConfigConsumer>
{({ getPrefixCls, direction }: ConfigConsumerProps) => {
const { prefixCls: customizePrefixCls, size, className, ...others } = props;

18
components/calendar/__tests__/__snapshots__/demo.test.js.snap
View File

@ -1888,20 +1888,20 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
class="ant-picker-calendar ant-picker-calendar-mini"
>
<div
style="padding:10px"
style="padding:8px"
>
<div
style="margin-bottom:10px"
<h4
class="ant-typography"
>
Custom header
</div>
Custom header
</h4>
<div
class="ant-row"
style="margin-left:-4px;margin-right:-4px;flex-wrap:nowrap"
style="margin-left:-4px;margin-right:-4px"
>
<div
class="ant-col"
style="padding-left:4px;padding-right:4px;flex:none"
style="padding-left:4px;padding-right:4px"
>
<div
class="ant-radio-group ant-radio-group-outline ant-radio-group-small"
@ -1949,7 +1949,7 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
</div>
<div
class="ant-col"
style="padding-left:4px;padding-right:4px;flex:auto"
style="padding-left:4px;padding-right:4px"
>
<div
class="ant-select my-year-select ant-select-sm ant-select-single ant-select-show-arrow"
@ -2011,7 +2011,7 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
</div>
<div
class="ant-col"
style="padding-left:4px;padding-right:4px;flex:auto"
style="padding-left:4px;padding-right:4px"
>
<div
class="ant-select ant-select-sm ant-select-single ant-select-show-arrow"

2
components/calendar/demo/card.md
View File

@ -32,7 +32,7 @@ ReactDOM.render(
.site-calendar-demo-card {
width: 300px;
border: 1px solid #f0f0f0;
border-radius: 4px;
border-radius: 2px;
}
```

30
components/calendar/demo/customize-header.md
View File

@ -14,9 +14,7 @@ title:
Customize Calendar header content.
```jsx
import { Calendar, Select, Radio, Col, Row } from 'antd';
const { Group, Button } = Radio;
import { Calendar, Select, Radio, Col, Row, Typography } from 'antd';
function onPanelChange(value, mode) {
console.log(value, mode);
@ -58,16 +56,18 @@ ReactDOM.render(
);
}
return (
<div style={{ padding: 10 }}>
<div style={{ marginBottom: '10px' }}>Custom header </div>
<Row style={{ flexWrap: 'nowrap' }} gutter={8}>
<Col style={{ flex: 'none' }}>
<Group size="small" onChange={e => onTypeChange(e.target.value)} value={type}>
<Button value="month">Month</Button>
<Button value="year">Year</Button>
</Group>
<div style={{ padding: 8 }}>
<Typography.Title level={4}>
Custom header
</Typography.Title>
<Row gutter={8}>
<Col>
<Radio.Group size="small" onChange={e => onTypeChange(e.target.value)} value={type}>
<Radio.Button value="month">Month</Radio.Button>
<Radio.Button value="year">Year</Radio.Button>
</Radio.Group>
</Col>
<Col style={{ flex: 'auto' }}>
<Col>
<Select
size="small"
dropdownMatchSelectWidth={false}
@ -81,7 +81,7 @@ ReactDOM.render(
{options}
</Select>
</Col>
<Col style={{ flex: 'auto' }}>
<Col>
<Select
size="small"
dropdownMatchSelectWidth={false}
@ -109,8 +109,8 @@ ReactDOM.render(
```css
.site-calendar-customize-header-wrapper {
width: 300px;
border: 1px solid #d9d9d9;
border-radius: 4px;
border: 1px solid #f0f0f0;
border-radius: 2px;
}
```

13
components/calendar/style/index.less
View File

@ -51,6 +51,17 @@
// ========================== Mini ==========================
&-mini {
border-radius: @border-radius-base;
.@{calendar-picker-prefix-cls}-calendar-header {
padding-right: @padding-xs;
padding-left: @padding-xs;
}
.@{calendar-picker-prefix-cls}-panel {
border-radius: 0 0 @border-radius-base @border-radius-base;
}
.@{calendar-picker-prefix-cls}-content {
height: 256px;
@ -160,7 +171,7 @@
.@{calendar-prefix-cls}-year-select {
width: 50%;
}
.@{calendar-prefix-cls}-month-select {
width: ~'calc(50% - @{padding-xs})';
}

2
components/card/Grid.tsx
View File

@ -9,7 +9,7 @@ export interface CardGridProps {
hoverable?: boolean;
}
const Grid: React.SFC<CardGridProps> = props => (
const Grid: React.FC<CardGridProps> = props => (
<ConfigConsumer>
{({ getPrefixCls }: ConfigConsumerProps) => {
const { prefixCls: customizePrefixCls, className, hoverable = true, ...others } = props;

2
components/card/Meta.tsx
View File

@ -11,7 +11,7 @@ export interface CardMetaProps {
description?: React.ReactNode;
}
const Meta: React.SFC<CardMetaProps> = props => (
const Meta: React.FC<CardMetaProps> = props => (
<ConfigConsumer>
{({ getPrefixCls }: ConfigConsumerProps) => {
const {

12
components/config-provider/__tests__/__snapshots__/components.test.js.snap
View File

@ -11608,9 +11608,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="config-table-thead"
>
@ -11880,9 +11878,7 @@ exports[`ConfigProvider components Table normal 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -12152,9 +12148,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="prefix-Table-thead"
>

4
components/config-provider/context.tsx
View File

@ -58,7 +58,7 @@ interface ConstructorProps {
export function withConfigConsumer<ExportProps extends BasicExportProps>(config: ConsumerConfig) {
return function withConfigConsumerFunc<ComponentDef>(
Component: IReactComponent,
): React.SFC<ExportProps> & ComponentDef {
): React.FC<ExportProps> & ComponentDef {
// Wrap with ConfigConsumer. Since we need compatible with react 15, be care when using ref methods
const SFC = ((props: ExportProps) => (
<ConfigConsumer>
@ -70,7 +70,7 @@ export function withConfigConsumer<ExportProps extends BasicExportProps>(config:
return <Component {...configProps} {...props} prefixCls={prefixCls} />;
}}
</ConfigConsumer>
)) as React.SFC<ExportProps> & ComponentDef;
)) as React.FC<ExportProps> & ComponentDef;
const cons: ConstructorProps = Component.constructor as ConstructorProps;
const name = (cons && cons.displayName) || Component.name || 'Component';

3
components/descriptions/Item.tsx
View File

@ -9,7 +9,6 @@ export interface DescriptionsItemProps {
span?: number;
}
const DescriptionsItem: React.SFC<DescriptionsItemProps> = ({ children }) =>
children as JSX.Element;
const DescriptionsItem: React.FC<DescriptionsItemProps> = ({ children }) => children as JSX.Element;
export default DescriptionsItem;

2
components/divider/index.tsx
View File

@ -12,7 +12,7 @@ export interface DividerProps {
style?: React.CSSProperties;
}
const Divider: React.SFC<DividerProps> = props => (
const Divider: React.FC<DividerProps> = props => (
<ConfigConsumer>
{({ getPrefixCls }: ConfigConsumerProps) => {
const {

5
components/empty/__tests__/__snapshots__/demo.test.js.snap
View File

@ -516,10 +516,7 @@ exports[`renders ./components/empty/demo/config-provider.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

2
components/form/FormItem.tsx
View File

@ -19,7 +19,7 @@ export type ValidateStatus = typeof ValidateStatuses[number];
type RenderChildren = (form: FormInstance) => React.ReactNode;
type RcFieldProps = Omit<FieldProps, 'children'>;
type ChildrenType = React.ReactElement | RenderChildren | React.ReactElement[] | null;
type ChildrenType = RenderChildren | React.ReactNode;
interface MemoInputProps {
value: any;

260
components/locale-provider/__tests__/__snapshots__/index.test.js.snap
View File

@ -6600,10 +6600,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -11564,10 +11561,7 @@ exports[`Locale Provider should display the text as az 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -16528,10 +16522,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -21492,10 +21483,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -26456,10 +26444,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -31420,10 +31405,7 @@ exports[`Locale Provider should display the text as da 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -36384,10 +36366,7 @@ exports[`Locale Provider should display the text as de 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -41348,10 +41327,7 @@ exports[`Locale Provider should display the text as el 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -46312,10 +46288,7 @@ exports[`Locale Provider should display the text as en 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -51276,10 +51249,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -56240,10 +56210,7 @@ exports[`Locale Provider should display the text as es 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -61204,10 +61171,7 @@ exports[`Locale Provider should display the text as et 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -66168,10 +66132,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -71132,10 +71093,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -76096,10 +76054,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -81060,10 +81015,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -86024,10 +85976,7 @@ exports[`Locale Provider should display the text as he 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -90988,10 +90937,7 @@ exports[`Locale Provider should display the text as hi 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -95952,10 +95898,7 @@ exports[`Locale Provider should display the text as hr 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -100916,10 +100859,7 @@ exports[`Locale Provider should display the text as hu 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -105880,10 +105820,7 @@ exports[`Locale Provider should display the text as hy-am 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -110844,10 +110781,7 @@ exports[`Locale Provider should display the text as id 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -115808,10 +115742,7 @@ exports[`Locale Provider should display the text as is 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -120772,10 +120703,7 @@ exports[`Locale Provider should display the text as it 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -125736,10 +125664,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -130700,10 +130625,7 @@ exports[`Locale Provider should display the text as kn 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -135664,10 +135586,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -140628,10 +140547,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -145592,10 +145508,7 @@ exports[`Locale Provider should display the text as lv 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -150556,10 +150469,7 @@ exports[`Locale Provider should display the text as mk 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -155520,10 +155430,7 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -160484,10 +160391,7 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -165448,10 +165352,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -170412,10 +170313,7 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -175376,10 +175274,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -180340,10 +180235,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -185304,10 +185196,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -190268,10 +190157,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -195232,10 +195118,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -200196,10 +200079,7 @@ exports[`Locale Provider should display the text as ro 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -205160,10 +205040,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -210124,10 +210001,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -215088,10 +214962,7 @@ exports[`Locale Provider should display the text as sl 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -220052,10 +219923,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -225016,10 +224884,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -229980,10 +229845,7 @@ exports[`Locale Provider should display the text as ta 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -234944,10 +234806,7 @@ exports[`Locale Provider should display the text as th 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -239908,10 +239767,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -244872,10 +244728,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -249836,10 +249689,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -254800,10 +254650,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -259764,10 +259611,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

2
components/page-header/index.tsx
View File

@ -97,7 +97,7 @@ const renderChildren = (prefixCls: string, children: React.ReactNode) => {
return <div className={`${prefixCls}-content`}>{children}</div>;
};
const PageHeader: React.SFC<PageHeaderProps> = props => (
const PageHeader: React.FC<PageHeaderProps> = props => (
<ConfigConsumer>
{({ getPrefixCls, pageHeader, direction }: ConfigConsumerProps) => {
const {

5
components/progress/Circle.tsx
View File

@ -28,7 +28,7 @@ function getStrokeColor({ successPercent, strokeColor }: CircleProps) {
return [null, color];
}
const Circle: React.SFC<CircleProps> = props => {
const Circle: React.FC<CircleProps> = props => {
const {
prefixCls,
width,
@ -52,8 +52,7 @@ const Circle: React.SFC<CircleProps> = props => {
let gapDeg;
if (gapDegree || gapDegree === 0) {
gapDeg = gapDegree;
}
else if (type === 'dashboard') {
} else if (type === 'dashboard') {
gapDeg = 75;
}

2
components/progress/Line.tsx
View File

@ -57,7 +57,7 @@ export const handleGradient = (strokeColor: ProgressGradient) => {
return { backgroundImage: `linear-gradient(${direction}, ${from}, ${to})` };
};
const Line: React.SFC<LineProps> = props => {
const Line: React.FC<LineProps> = props => {
const {
prefixCls,
percent,

2
components/progress/Steps.tsx
View File

@ -6,7 +6,7 @@ interface StepsProps extends ProgressProps {
size?: ProgressSize;
}
const Steps: React.SFC<StepsProps> = props => {
const Steps: React.FC<StepsProps> = props => {
const {
size = 'default',
steps,

2
components/result/index.tsx
View File

@ -77,7 +77,7 @@ const renderIcon = (prefixCls: string, { status, icon }: ResultProps) => {
const renderExtra = (prefixCls: string, { extra }: ResultProps) =>
extra && <div className={`${prefixCls}-extra`}>{extra}</div>;
export interface ResultType extends React.SFC<ResultProps> {
export interface ResultType extends React.FC<ResultProps> {
PRESENTED_IMAGE_404: React.ReactNode;
PRESENTED_IMAGE_403: React.ReactNode;
PRESENTED_IMAGE_500: React.ReactNode;

2
components/statistic/Number.tsx
View File

@ -6,7 +6,7 @@ interface NumberProps extends FormatConfig {
value: valueType;
}
const StatisticNumber: React.SFC<NumberProps> = props => {
const StatisticNumber: React.FC<NumberProps> = props => {
const { value, formatter, precision, decimalSeparator, groupSeparator = '', prefixCls } = props;
let valueNode: React.ReactNode;

2
components/statistic/Statistic.tsx
View File

@ -23,7 +23,7 @@ export interface StatisticProps extends FormatConfig {
suffix?: React.ReactNode;
}
const Statistic: React.SFC<StatisticProps & ConfigConsumerProps> = props => {
const Statistic: React.FC<StatisticProps & ConfigConsumerProps> = props => {
const {
prefixCls,
className,

4
components/table/__tests__/__snapshots__/Table.expand.test.js.snap
View File

@ -22,9 +22,7 @@ exports[`Table.expand click to expand 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

20
components/table/__tests__/__snapshots__/Table.filter.test.js.snap
View File

@ -72,9 +72,7 @@ exports[`Table.filter renders custom filter icon as string correctly 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -196,9 +194,7 @@ exports[`Table.filter renders custom filter icon with right Tooltip title 1`] =
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -328,9 +324,7 @@ exports[`Table.filter renders filter correctly 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -663,9 +657,7 @@ exports[`Table.filter should support getPopupContainer 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -898,9 +890,7 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

12
components/table/__tests__/__snapshots__/Table.pagination.test.js.snap
View File

@ -22,9 +22,7 @@ exports[`Table.pagination Accepts pagination as true 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -187,9 +185,7 @@ exports[`Table.pagination renders pagination correctly 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -341,9 +337,7 @@ exports[`Table.pagination renders pagination topLeft and bottomRight 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

4
components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
View File

@ -29,7 +29,6 @@ exports[`Table.rowSelection fix expand on th left when selection column fixed on
<col
style="width:60px;min-width:60px"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -345,7 +344,6 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
<col
style="width:60px;min-width:60px"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -617,7 +615,6 @@ exports[`Table.rowSelection fix selection column on the left when any other colu
<col
style="width:60px;min-width:60px"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -921,7 +918,6 @@ exports[`Table.rowSelection use column as selection column when key is \`selecti
<col
style="width:60px;min-width:60px"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"

4
components/table/__tests__/__snapshots__/Table.sorter.test.js.snap
View File

@ -90,9 +90,7 @@ exports[`Table.sorter should support defaultOrder in Column 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

10
components/table/__tests__/__snapshots__/Table.test.js.snap
View File

@ -22,11 +22,7 @@ exports[`Table renders JSX correctly 1`] = `
<table
style="table-layout: auto;"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -132,9 +128,7 @@ exports[`Table rtl render component should be rendered correctly in RTL directio
<table
style="table-layout:auto"
>
<colgroup>
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

162
components/table/__tests__/__snapshots__/demo.test.js.snap
View File

@ -29,7 +29,6 @@ exports[`renders ./components/table/demo/ajax.md correctly 1`] = `
<col
style="width:20%;min-width:20%"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -234,13 +233,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -539,11 +532,7 @@ exports[`renders ./components/table/demo/bordered.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -747,13 +736,7 @@ exports[`renders ./components/table/demo/colspan-rowspan.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -1036,7 +1019,6 @@ exports[`renders ./components/table/demo/custom-filter-panel.md correctly 1`] =
<col
style="width:20%;min-width:20%"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -1364,11 +1346,7 @@ exports[`renders ./components/table/demo/drag-sorting.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -2292,10 +2270,6 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
<col
style="width:60px;min-width:60px"
/>
<col />
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -3340,9 +3314,6 @@ exports[`renders ./components/table/demo/edit-cell.md correctly 1`] = `
<col
style="width:30%;min-width:30%"
/>
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -3556,7 +3527,6 @@ exports[`renders ./components/table/demo/edit-row.md correctly 1`] = `
<col
style="width:40%;min-width:40%"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -4056,10 +4026,6 @@ exports[`renders ./components/table/demo/ellipsis.md correctly 1`] = `
<col
style="width:80px;min-width:80px"
/>
<col />
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -4339,10 +4305,6 @@ exports[`renders ./components/table/demo/expand.md correctly 1`] = `
<col
class="ant-table-expand-icon-col"
/>
<col />
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -5256,22 +5218,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
<table
style="table-layout:fixed;visibility:hidden"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col
style="width:0;min-width:0"
/>
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -6263,14 +6210,7 @@ exports[`renders ./components/table/demo/fixed-header.md correctly 1`] = `
<table
style="table-layout:fixed;visibility:hidden"
>
<colgroup>
<col />
<col />
<col />
<col
style="width:0;min-width:0"
/>
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -6308,7 +6248,6 @@ exports[`renders ./components/table/demo/fixed-header.md correctly 1`] = `
<col
style="width:150px;min-width:150px"
/>
<col />
</colgroup>
<tbody
class="ant-table-tbody"
@ -7446,19 +7385,7 @@ exports[`renders ./components/table/demo/grouping-columns.md correctly 1`] = `
<table
style="table-layout:fixed;visibility:hidden"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col
style="width:0;min-width:0"
/>
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -8363,11 +8290,7 @@ exports[`renders ./components/table/demo/head.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -8798,14 +8721,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -9125,12 +9041,7 @@ exports[`renders ./components/table/demo/multiple-sorter.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -9534,13 +9445,6 @@ exports[`renders ./components/table/demo/nested-table.md correctly 1`] = `
<col
class="ant-table-expand-icon-col"
/>
<col />
<col />
<col />
<col />
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -10093,13 +9997,7 @@ exports[`renders ./components/table/demo/pagination.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -10423,11 +10321,7 @@ exports[`renders ./components/table/demo/reset-filter.md correctly 1`] = `
<table
style="table-layout:fixed"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -10900,7 +10794,6 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = `
<col
style="width:100px;min-width:100px"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -11262,9 +11155,6 @@ exports[`renders ./components/table/demo/row-selection.md correctly 1`] = `
<col
style="width:60px;min-width:60px"
/>
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -11612,9 +11502,6 @@ exports[`renders ./components/table/demo/row-selection-and-operation.md correctl
<col
style="width:60px;min-width:60px"
/>
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -12202,9 +12089,6 @@ exports[`renders ./components/table/demo/row-selection-custom.md correctly 1`] =
<col
style="width:60px;min-width:60px"
/>
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -12819,7 +12703,6 @@ exports[`renders ./components/table/demo/row-selection-custom-debug.md correctly
<col
style="width:60px;min-width:60px"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -13211,11 +13094,7 @@ exports[`renders ./components/table/demo/size.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -13408,11 +13287,7 @@ exports[`renders ./components/table/demo/size.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -13606,11 +13481,7 @@ exports[`renders ./components/table/demo/summary.md correctly 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -13802,9 +13673,6 @@ exports[`renders ./components/table/demo/virtual-list.md correctly 1`] = `
<col
style="width:100px;min-width:100px"
/>
<col
style="width:0;min-width:0"
/>
</colgroup>
<thead
class="ant-table-thead"

33
components/table/__tests__/__snapshots__/empty.test.js.snap
View File

@ -22,16 +22,7 @@ exports[`Table renders empty table 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -168,16 +159,7 @@ exports[`Table renders empty table with custom emptyText 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -464,16 +446,7 @@ exports[`Table renders empty table without emptyText when loading 1`] = `
<table
style="table-layout:auto"
>
<colgroup>
<col />
<col />
<col />
<col />
<col />
<col />
<col />
<col />
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>

4
components/table/style/index.less
View File

@ -499,7 +499,7 @@
top: 0;
right: 0;
bottom: -1px;
width: 20px;
width: 30px;
transform: translateX(100%);
transition: box-shadow 0.3s;
content: '';
@ -511,7 +511,7 @@
top: 0;
bottom: -1px;
left: 0;
width: 20px;
width: 30px;
transform: translateX(-100%);
transition: box-shadow 0.3s;
content: '';

2
components/timeline/Timeline.tsx
View File

@ -17,7 +17,7 @@ export interface TimelineProps {
}
export default class Timeline extends React.Component<TimelineProps, any> {
static Item: React.SFC<TimeLineItemProps> = TimelineItem;
static Item: React.FC<TimeLineItemProps> = TimelineItem;
static defaultProps = {
reverse: false,

2
components/timeline/TimelineItem.tsx
View File

@ -14,7 +14,7 @@ export interface TimeLineItemProps {
label?: React.ReactNode;
}
const TimelineItem: React.SFC<TimeLineItemProps> = props => (
const TimelineItem: React.FC<TimeLineItemProps> = props => (
<ConfigConsumer>
{({ getPrefixCls }: ConfigConsumerProps) => {
const {

4
components/transfer/__tests__/__snapshots__/demo.test.js.snap
View File

@ -2247,9 +2247,6 @@ exports[`renders ./components/transfer/demo/table-transfer.md correctly 1`] = `
<col
style="width:60px;min-width:60px"
/>
<col />
<col />
<col />
</colgroup>
<thead
class="ant-table-thead"
@ -2931,7 +2928,6 @@ exports[`renders ./components/transfer/demo/table-transfer.md correctly 1`] = `
<col
style="width:60px;min-width:60px"
/>
<col />
</colgroup>
<thead
class="ant-table-thead"

2
components/typography/Paragraph.tsx
View File

@ -3,6 +3,6 @@ import Base, { BlockProps } from './Base';
export interface ParagraphProps extends BlockProps {}
const Paragraph: React.SFC<ParagraphProps> = props => <Base {...props} component="div" />;
const Paragraph: React.FC<ParagraphProps> = props => <Base {...props} component="div" />;
export default Paragraph;

2
components/typography/Text.tsx
View File

@ -6,7 +6,7 @@ export interface TextProps extends BlockProps {
ellipsis?: boolean;
}
const Text: React.SFC<TextProps> = ({ ellipsis, ...restProps }) => {
const Text: React.FC<TextProps> = ({ ellipsis, ...restProps }) => {
warning(
typeof ellipsis !== 'object',
'Typography.Text',

2
components/typography/Title.tsx
View File

@ -7,7 +7,7 @@ const TITLE_ELE_LIST = tupleNum(1, 2, 3, 4);
export type TitleProps = Omit<BlockProps & { level?: typeof TITLE_ELE_LIST[number] }, 'strong'>;
const Title: React.SFC<TitleProps> = props => {
const Title: React.FC<TitleProps> = props => {
const { level = 1, ...restProps } = props;
let component: string;

2
package.json
View File

@ -189,7 +189,7 @@
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-markdown": "^1.0.0",
"eslint-plugin-react": "^7.14.2",
"eslint-plugin-react-hooks": "^2.5.0",
"eslint-plugin-react-hooks": "^3.0.0",
"eslint-tinker": "^0.5.0",
"fetch-jsonp": "^1.1.3",
"full-icu": "^1.3.0",

1
site/theme/static/demo.less
View File

@ -341,6 +341,7 @@
}
&-codesandbox {
display: inline-block;
width: 20px;
height: 20px;
overflow: hidden;

6
site/theme/static/template.html
View File

@ -22,7 +22,7 @@
<link rel="stylesheet/less" type="text/css" href="{{ root }}color.less" />
<script src="https://polyfill.alicdn.com/polyfill.min.js?features=default,es2015,Intl"></script>
<script>
(function() {
(function () {
function isLocalStorageNameSupported() {
var testKey = 'test';
var storage = window.localStorage;
@ -100,10 +100,10 @@
</script>
<!-- Hotjar Tracking Code for ant.design -->
<script>
(function(h, o, t, j, a, r) {
(function (h, o, t, j, a, r) {
h.hj =
h.hj ||
function() {
function () {
(h.hj.q = h.hj.q || []).push(arguments);
};
h._hjSettings = { hjid: 473408, hjsv: 5 };

24
site/theme/template/Content/Demo/index.jsx
View File

@ -332,22 +332,18 @@ ${parsedSourceCode.replace('mountNode', "document.getElementById('container')")}
/>
</Tooltip>
</form>
<form
action="https://codesandbox.io/api/v1/sandboxes/define"
method="POST"
target="_blank"
onClick={() => this.track({ type: 'codesandbox', demo: meta.id })}
>
<input
type="hidden"
name="parameters"
value={compress(JSON.stringify(codesanboxPrefillConfig))}
/>
<form>
<Tooltip title={<FormattedMessage id="app.demo.codesandbox" />}>
<input
type="submit"
value="Create New Sandbox with Prefilled Data"
{/* FIXME: This temporarily solution to fix issues/22636, we need revert it to use form after the codesandbox api issue fixed. */}
<a
aria-label="Create New Sandbox with Prefilled Data"
rel="noopener noreferrer"
target="_blank"
href={`https://codesandbox.io/api/v1/sandboxes/define?parameters=${compress(
JSON.stringify(codesanboxPrefillConfig),
)}`}
className="code-box-codesandbox"
onClick={() => this.track({ type: 'codesandbox', demo: meta.id })}
/>
</Tooltip>
</form>

2
site/theme/template/IconDisplay/CopyableIcon.tsx
View File

@ -17,7 +17,7 @@ export interface CopyableIconProps {
onCopied: (type: string, text: string) => any;
}
const CopyableIcon: React.SFC<CopyableIconProps> = ({
const CopyableIcon: React.FC<CopyableIconProps> = ({
name,
isNew,
justCopied,

6
site/theme/template/IconDisplay/themeIcons.tsx
View File

@ -12,7 +12,7 @@ interface CustomIconComponentProps {
['aria-hidden']?: React.AriaAttributes['aria-hidden'];
}
export const FilledIcon: React.SFC<CustomIconComponentProps> = props => {
export const FilledIcon: React.FC<CustomIconComponentProps> = props => {
const path =
'M864 64H160C107 64 64 107 64 160v' +
'704c0 53 43 96 96 96h704c53 0 96-43 96-96V16' +
@ -24,7 +24,7 @@ export const FilledIcon: React.SFC<CustomIconComponentProps> = props => {
);
};
export const OutlinedIcon: React.SFC<CustomIconComponentProps> = props => {
export const OutlinedIcon: React.FC<CustomIconComponentProps> = props => {
const path =
'M864 64H160C107 64 64 107 64 160v7' +
'04c0 53 43 96 96 96h704c53 0 96-43 96-96V160c' +
@ -38,7 +38,7 @@ export const OutlinedIcon: React.SFC<CustomIconComponentProps> = props => {
);
};
export const TwoToneIcon: React.SFC<CustomIconComponentProps> = props => {
export const TwoToneIcon: React.FC<CustomIconComponentProps> = props => {
const path =
'M16 512c0 273.932 222.066 496 496 49' +
'6s496-222.068 496-496S785.932 16 512 16 16 238.' +

2
typings/custom-typings.d.ts vendored
View File

@ -2,7 +2,7 @@
declare module '*.svg' {
import * as React from 'react';
export const ReactComponent: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
export const ReactComponent: React.FC<React.SVGProps<SVGSVGElement>>;
const src: string;
export default src;