{({ getPrefixCls }: ConfigConsumerProps) => {
- const { prefixCls: customizePrefixCls, style, footer, children } = props;
+ const {
+ prefixCls: customizePrefixCls,
+ style,
+ footer,
+ children,
+ className: customizeClassName,
+ } = props;
+
const prefixCls = getPrefixCls('page-header', customizePrefixCls);
- const className = classnames(prefixCls, {
- [`${prefixCls}-has-footer`]: footer,
- });
+ const className = classnames(
+ prefixCls,
+ {
+ [`${prefixCls}-has-footer`]: footer,
+ },
+ customizeClassName,
+ );
+
return (
{renderHeader(prefixCls, props)}
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 91d95a0d0f..e8bc4efde5 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -532,7 +532,7 @@
// Collapse
// ---
-@collapse-header-padding: 12px 0 12px 40px;
+@collapse-header-padding: 12px 16px 12px 40px;
@collapse-header-bg: @background-color-light;
@collapse-content-padding: @padding-md;
@collapse-content-bg: @component-background;
diff --git a/components/transfer/__tests__/list.test.js b/components/transfer/__tests__/list.test.js
index 2ae5a57a20..ca427c115a 100644
--- a/components/transfer/__tests__/list.test.js
+++ b/components/transfer/__tests__/list.test.js
@@ -40,4 +40,18 @@ describe('List', () => {
.prop('checked'),
).toBeTruthy();
});
+
+ it('when component has been unmounted, componentWillUnmount should be called', () => {
+ const wrapper = mount(
);
+ const willUnmount = jest.spyOn(wrapper.instance(), 'componentWillUnmount');
+ wrapper.unmount();
+ expect(willUnmount).toHaveBeenCalled();
+ });
+
+ it('when value is not exists, handleFilter should return', () => {
+ const handleFilter = jest.fn();
+ const wrapper = mount(
);
+ expect(wrapper.instance().handleFilter({ target: 'test' })).toBe(undefined);
+ expect(handleFilter).toBeCalled();
+ });
});
diff --git a/components/typography/Typography.tsx b/components/typography/Typography.tsx
index 0d39710ba4..342cbdab6f 100644
--- a/components/typography/Typography.tsx
+++ b/components/typography/Typography.tsx
@@ -13,7 +13,7 @@ export interface TypographyProps {
interface InternalTypographyProps extends TypographyProps {
component?: string;
- setContentRef: (node: HTMLElement) => void;
+ setContentRef?: (node: HTMLElement) => void;
}
const Typography: React.SFC = ({
diff --git a/components/typography/index.en-US.md b/components/typography/index.en-US.md
index 42fe2f7045..c3f7b76297 100644
--- a/components/typography/index.en-US.md
+++ b/components/typography/index.en-US.md
@@ -21,7 +21,7 @@ When need to display title or text content. Like:
| Property | Description | Type | Default |
| -------- | ----------- | ---- | ------- |
-| copyable | Config copy. Can set copy text and callback when is an object | boolean \| { text: string, onCopy: Function } | false |boolean \| string | false |
+| copyable | Config copy. Can set copy text and callback when is an object | boolean \| { text: string, onCopy: Function } | false |
| delete | delete line style | boolean | false |
| disabled | Disable content | boolean | false |
| editable | Editable. Can control edit state when is object | boolean \| { editing: boolean, onStart: Function, onChange: Function(string) } | false |
@@ -36,7 +36,7 @@ When need to display title or text content. Like:
| Property | Description | Type | Default |
| -------- | ----------- | ---- | ------- |
-| copyable | Config copy. Can set copy text and callback when is an object | boolean \| { text: string, onCopy: Function } | false |boolean \| string | false |
+| copyable | Config copy. Can set copy text and callback when is an object | boolean \| { text: string, onCopy: Function } | false |
| delete | delete line style | boolean | false |
| disabled | Disable content | boolean | false |
| editable | Editable. Can control edit state when is object | boolean \| { editing: boolean, onStart: Function, onChange: Function(string) } | false |
@@ -51,7 +51,7 @@ When need to display title or text content. Like:
| Property | Description | Type | Default |
| -------- | ----------- | ---- | ------- |
-| copyable | Config copy. Can set copy text and callback when is an object | boolean \| { text: string, onCopy: Function } | false |boolean \| string | false |
+| copyable | Config copy. Can set copy text and callback when is an object | boolean \| { text: string, onCopy: Function } | false |
| delete | delete line style | boolean | false |
| disabled | Disable content | boolean | false |
| editable | Editable. Can control edit state when is object | boolean \| { editing: boolean, onStart: Function, onChange: Function(string) } | false |
diff --git a/components/typography/index.zh-CN.md b/components/typography/index.zh-CN.md
index ee9fd941d0..ef0fc79d3b 100644
--- a/components/typography/index.zh-CN.md
+++ b/components/typography/index.zh-CN.md
@@ -51,7 +51,7 @@ cols: 1
| 参数 | 说明 | 类型 | 默认值 |
| --- | --- | --- | --- |
-
+| copyable | 是否可拷贝，为对象时可设置复制文本以回调函数 | boolean \| { text: string, onCopy: Function } | false |
| delete | 添加删除线样式 | boolean | false |
| disabled | 禁用文本 | boolean | false |
| editable | 是否可编辑，为对象时可对编辑进行控制 | boolean \| { editing: boolean, onStart: Function, onChange: Function(string) } | false |
diff --git a/package.json b/package.json
index 0f79a2341c..18f832e834 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "antd",
- "version": "3.14.0",
+ "version": "3.14.1",
"title": "Ant Design",
"description": "An enterprise-class UI design language and React-based implementation",
"homepage": "http://ant.design/",
diff --git a/site/theme/static/icons.less b/site/theme/static/icons.less
index 4a25fa9f0d..1e2baab382 100644
--- a/site/theme/static/icons.less
+++ b/site/theme/static/icons.less
@@ -46,6 +46,10 @@ ul.anticons-list {
}
}
+ &.outlined:hover {
+ background-color: #8ecafe;
+ }
+
&.copied:hover {
color: rgba(255, 255, 255, 0.2);
}
diff --git a/site/theme/template/IconDisplay/CopyableIcon.tsx b/site/theme/template/IconDisplay/CopyableIcon.tsx
index 4ddb622aa9..e7b536f030 100644
--- a/site/theme/template/IconDisplay/CopyableIcon.tsx
+++ b/site/theme/template/IconDisplay/CopyableIcon.tsx
@@ -1,6 +1,7 @@
import * as React from 'react';
import CopyToClipboard from 'react-copy-to-clipboard';
import { Icon as AntdIcon, Badge } from 'antd';
+import classNames from 'classnames';
import { ThemeType, IconProps } from '../../../../components/icon';
const Icon: React.SFC = AntdIcon;
@@ -20,6 +21,10 @@ const CopyableIcon: React.SFC = ({
justCopied,
onCopied,
}) => {
+ const className = classNames({
+ copied: justCopied === type,
+ outlined: theme === 'twoTone',
+ });
return (
= ({
}
onCopy={(text: string) => onCopied(type, text)}
>
-
+
{type}