](http://godban.github.io/browsers-support-badges/)IE / Edge | [
](http://godban.github.io/browsers-support-badges/)Firefox | [
](http://godban.github.io/browsers-support-badges/)Chrome | [
](http://godban.github.io/browsers-support-badges/)Safari | [
](http://godban.github.io/browsers-support-badges/)Opera | [
](http://godban.github.io/browsers-support-badges/)Electron |
+| --------- | --------- | --------- | --------- | --------- | --------- |
+| IE9, IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+
## 参与共建 [](http://makeapullrequest.com)
请参考[贡献指南](https://ant.design/docs/react/contributing-cn).
@@ -94,7 +98,7 @@ $ npm install
$ npm start
```
-打开浏览器访问 http://127.0.0.1:8001 ，更多本地开发文档参见: https://github.com/ant-design/ant-design/wiki/Development 。
+打开浏览器访问 http://127.0.0.1:8001 ，更多[本地开发文档](https://github.com/ant-design/ant-design/wiki/Development)。
## 如何贡献
diff --git a/README.md b/README.md
index a848bb518b..702338a73e 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,10 @@ An enterprise-class UI design language and React-based implementation.
* Server-side Rendering
* [Electron](http://electron.atom.io/)
+| [
+
@@ -33,9 +31,7 @@ exports[`Drawer closable is false 1`] = `
`;
exports[`Drawer destroyOnClose is true 1`] = `
-
`;
exports[`Drawer have a title 1`] = `
-
+
@@ -48,16 +44,18 @@ exports[`Drawer destroyOnClose is true 1`] = `
>
+ >
+
+
+
@@ -104,9 +102,7 @@ exports[`Drawer have a title 1`] = `
`;
exports[`Drawer render correctly 1`] = `
-
+
@@ -6935,27 +6875,9 @@ exports[`Locale Provider should display the text as ar 1`] = `
Name
-
-
+ class="anticon anticon-filter ant-dropdown-trigger"
+ title="الفلاتر"
+ />
- }>
Option 1
Option 2
diff --git a/components/menu/style/dark.less b/components/menu/style/dark.less
index 51084c2232..127e6843d8 100644
--- a/components/menu/style/dark.less
+++ b/components/menu/style/dark.less
@@ -24,13 +24,14 @@
}
&-dark&-horizontal {
- border-bottom-color: @menu-dark-bg;
+ border-bottom: 0;
}
&-dark&-horizontal > &-item,
&-dark&-horizontal > &-submenu {
border-color: @menu-dark-bg;
border-bottom: 0;
+ top: 0;
}
&-dark&-horizontal > &-item > a:before {
diff --git a/components/menu/style/index.less b/components/menu/style/index.less
index 6d3c4b2129..1b3c004300 100644
--- a/components/menu/style/index.less
+++ b/components/menu/style/index.less
@@ -179,10 +179,6 @@
position: absolute;
border-radius: @border-radius-base;
z-index: @zindex-dropdown;
-
- .submenu-title-wrapper {
- padding-right: 20px;
- }
}
> .@{menu-prefix-cls} {
@@ -266,13 +262,12 @@
border-bottom: @border-width-base @border-style-base @border-color-split;
box-shadow: none;
line-height: 46px;
- white-space: nowrap;
> .@{menu-prefix-cls}-item,
> .@{menu-prefix-cls}-submenu {
position: relative;
top: 1px;
- display: inline-block;
+ float: left;
border-bottom: 2px solid transparent;
&:hover,
diff --git a/components/message/style/index.less b/components/message/style/index.less
index a5209d262e..bef367345f 100644
--- a/components/message/style/index.less
+++ b/components/message/style/index.less
@@ -21,7 +21,7 @@
}
&-notice-content {
- padding: 10px 16px;
+ padding: @message-notice-content-padding;
border-radius: @border-radius-base;
box-shadow: @shadow-2;
background: @component-background;
diff --git a/components/notification/index.en-US.md b/components/notification/index.en-US.md
index 3b9af9239e..149b8f0d6e 100644
--- a/components/notification/index.en-US.md
+++ b/components/notification/index.en-US.md
@@ -24,6 +24,7 @@ used in the following cases:
- `notification.info(config)`
- `notification.warning(config)`
- `notification.warn(config)`
+- `notification.open(config)`
- `notification.close(key: String)`
- `notification.destroy()`
diff --git a/components/notification/index.zh-CN.md b/components/notification/index.zh-CN.md
index 1b79dd3c42..f377eb16f8 100644
--- a/components/notification/index.zh-CN.md
+++ b/components/notification/index.zh-CN.md
@@ -23,6 +23,7 @@ subtitle: 通知提醒框
- `notification.info(config)`
- `notification.warning(config)`
- `notification.warn(config)`
+- `notification.open(config)`
- `notification.close(key: String)`
- `notification.destroy()`
diff --git a/components/select/__tests__/__snapshots__/demo.test.js.snap b/components/select/__tests__/__snapshots__/demo.test.js.snap
index 707d590f23..e2c5fce7bd 100644
--- a/components/select/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/select/__tests__/__snapshots__/demo.test.js.snap
@@ -407,16 +407,11 @@ exports[`renders ./components/select/demo/search-box.md correctly 1`] = `
>
-
@@ -108,23 +91,10 @@ exports[`renders ./components/transfer/demo/advanced.md correctly 1`] = `
type="button"
>
-
-
+ class="anticon anticon-right"
+ />
- to left
+ to right
@@ -203,25 +160,8 @@ exports[`renders ./components/transfer/demo/advanced.md correctly 1`] = `
class="ant-transfer-list-search-action"
>
-
-
+ class="anticon anticon-search"
+ />
@@ -368,21 +308,8 @@ exports[`renders ./components/transfer/demo/basic.md correctly 1`] = `
type="button"
>
-
-
+ class="anticon anticon-right"
+ />
, node: AntTreeNode) => {
const { expandedKeys = [] } = this.state;
+ const { onExpand } = this.props;
const { eventKey = '', expanded, isLeaf } = node.props;
if (isLeaf || event.shiftKey || event.metaKey || event.ctrlKey) {
@@ -176,6 +177,14 @@ export default class DirectoryTree extends React.Component {
diff --git a/components/tree/__tests__/__snapshots__/directory.test.js.snap b/components/tree/__tests__/__snapshots__/directory.test.js.snap
index 8e0c43372f..6883968189 100644
--- a/components/tree/__tests__/__snapshots__/directory.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/directory.test.js.snap
@@ -1104,6 +1104,132 @@ exports[`Directory Tree expand double click 2`] = `
`;
+exports[`Directory Tree expand with state control click 1`] = `
+
diff --git a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
index 245a1573bb..28619cbcb7 100644
--- a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
+++ b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
@@ -10,9 +10,7 @@ exports[`Drawer render correctly 1`] = `
open
-
+
@@ -1570,27 +1510,9 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
Name
-
-
+ class="anticon anticon-filter ant-dropdown-trigger"
+ title="Filter menu"
+ />
@@ -5778,21 +5761,8 @@ exports[`Locale Provider should display the text as ar 1`] = `
type="button"
>
-
-
+ class="anticon anticon-right"
+ />
diff --git a/components/drawer/index.tsx b/components/drawer/index.tsx
index 85599a834b..798cf9f65c 100644
--- a/components/drawer/index.tsx
+++ b/components/drawer/index.tsx
@@ -108,8 +108,16 @@ export default class Drawer extends React.Component {
}
renderBody = () => {
const { destroyOnClose, visible, width, placement } = this.props;
+ let containerStyle: React.CSSProperties = { width };
+ if (placement === 'left' || placement === 'right') {
+ containerStyle = {
+ overflow: 'auto',
+ height: '100%',
+ width,
+ };
+ }
if (destroyOnClose && !visible) {
- return null;
+ return
;
}
const { prefixCls, title, closable } = this.props;
let header;
@@ -132,14 +140,7 @@ export default class Drawer extends React.Component {
);
}
- let containerStyle: React.CSSProperties = { width };
- if (placement === 'left' || placement === 'right') {
- containerStyle = {
- overflow: 'auto',
- height: '100%',
- width,
- };
- }
+
return (
@@ -403,21 +386,8 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
type="button"
>
-
-
+ class="anticon anticon-right"
+ />
{header}
@@ -172,6 +173,7 @@ export default class Drawer extends React.Component {
showMask={this.props.mask}
placement={placement}
style={RcDrawerStyle}
+ class={this.props.wrapClassName}
>
{this.renderBody()}
diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less
index d21b5489e7..d6b6794dcc 100644
--- a/components/drawer/style/drawer.less
+++ b/components/drawer/style/drawer.less
@@ -8,7 +8,7 @@
width: 100%;
height: 100%;
pointer-events: none;
- z-index: 99999;
+ z-index: @zindex-modal;
transition: transform .3s @ease-in-out-circ;
>* {
transition: transform .3s @ease-in-out-circ;
diff --git a/components/layout/index.zh-CN.md b/components/layout/index.zh-CN.md
index ac2890f08b..dc5f7adf43 100644
--- a/components/layout/index.zh-CN.md
+++ b/components/layout/index.zh-CN.md
@@ -100,7 +100,6 @@ title: Layout
| trigger | 自定义 trigger，设置为 null 时隐藏 trigger | string\|ReactNode | - |
| width | 宽度 | number\|string | 200 |
| onCollapse | 展开-收起时的回调函数，有点击 trigger 以及响应式反馈两种方式可以触发 | (collapsed, type) => {} | - |
-| theme | 主题颜色 | string: `light` `dark` | `dark` |
| onBreakpoint | 触发响应式布局[断点](/components/grid#api)时的回调 | (broken) => {} | - |
#### breakpoint width
diff --git a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
index 4727466b3c..467981f100 100644
--- a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
@@ -362,25 +362,8 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
class="ant-transfer-list-search-action"
>
-
-
+ class="anticon anticon-search"
+ />
-
-
+ class="anticon anticon-search"
+ />
-
-
+ class="anticon anticon-search"
+ />
-
-
+ class="anticon anticon-right"
+ />
-
-
+ class="anticon anticon-right"
+ />
-
-
+ class="anticon anticon-search"
+ />
@@ -868,21 +713,8 @@ exports[`renders ./components/transfer/demo/search.md correctly 1`] = `
type="button"
>
-
-
+ class="anticon anticon-right"
+ />
-
-
+ class="anticon anticon-search"
+ />
diff --git a/components/transfer/__tests__/__snapshots__/index.test.js.snap b/components/transfer/__tests__/__snapshots__/index.test.js.snap
index 0b9237f5df..fbaa3e8bb1 100644
--- a/components/transfer/__tests__/__snapshots__/index.test.js.snap
+++ b/components/transfer/__tests__/__snapshots__/index.test.js.snap
@@ -96,48 +96,22 @@ exports[`Transfer should render correctly 1`] = `
+
-
-
-
+ class="anticon anticon-right"
+ />
{
it('should move selected keys to corresponding list', () => {
const handleChange = jest.fn();
const wrapper = mount(
-
+
);
}
diff --git a/components/tree/DirectoryTree.tsx b/components/tree/DirectoryTree.tsx
index 63883094ab..80210e4b3c 100644
--- a/components/tree/DirectoryTree.tsx
+++ b/components/tree/DirectoryTree.tsx
@@ -158,6 +158,7 @@ export default class DirectoryTree extends React.Component-
+
-
+
+
+
+
+ parent
+
+
+
-
+
- + + + + + children + + + +
+
-
+
-
+
+
+
+
+ parent
+
+
+
-
+
- + + + + + children + + + +
+
- {
wrapper.find(TreeNode).find('.ant-tree-node-content-wrapper').at(0).simulate('doubleClick');
expect(wrapper.render()).toMatchSnapshot();
});
+
+ describe('with state control', () => {
+ class StateDirTree extends React.Component {
+ state = {
+ expandedKeys: [],
+ };
+
+ onExpand = (expandedKeys) => {
+ this.setState({ expandedKeys });
+ };
+
+ render() {
+ const { expandedKeys } = this.state;
+
+ return (
+
diff --git a/docs/spec/visual.md b/docs/spec/visual.md
index 68924cb26f..903bc26e95 100644
--- a/docs/spec/visual.md
+++ b/docs/spec/visual.md
@@ -7,7 +7,7 @@ title:
可视化语言是基于中台设计语言 Ant Design 衍生的一套具有数据可视化特性的设计指导原则，让数据表达更符合用户心理，帮助『设计者』孵化出更具业务特性的可视化解决方案以满足个性化设计需求，屏蔽不必要的设计差异和实现成本，从而解放『设计者』和前端的研发资源，实现全面提高数据图表的研发效率。
-同时，这是一份动态更新的设计文档，你的阅读和反馈正是我们不断前进的动力，[Github 反馈地址](https://github.com/antvis/site/issues)。
+同时，这是一份动态更新的设计文档，你的阅读和反馈正是我们不断前进的动力，[GitHub 反馈地址](https://github.com/antvis/site/issues)。
## 设计资源
diff --git a/package.json b/package.json
index 00ead64487..f6da000c3d 100644
--- a/package.json
+++ b/package.json
@@ -61,12 +61,12 @@
"rc-checkbox": "~2.1.5",
"rc-collapse": "~1.9.0",
"rc-dialog": "~7.1.0",
- "rc-drawer": "~1.5.3",
+ "rc-drawer": "~1.5.9",
"rc-dropdown": "~2.2.0",
"rc-editor-mention": "^1.0.2",
"rc-form": "^2.1.0",
"rc-input-number": "~4.0.0",
- "rc-menu": "~7.2.2",
+ "rc-menu": "~7.0.2",
"rc-notification": "~3.1.1",
"rc-pagination": "~1.16.1",
"rc-progress": "~2.2.2",
@@ -85,7 +85,7 @@
"rc-upload": "~2.5.0",
"rc-util": "^4.0.4",
"react-lazy-load": "^3.0.12",
- "react-lifecycles-compat": "^3.0.4",
+ "react-lifecycles-compat": "^3.0.2",
"react-slick": "~0.23.1",
"shallowequal": "^1.0.1",
"warning": "~4.0.1"
@@ -94,6 +94,7 @@
"@babel/types": "7.0.0-beta.44",
"@types/react": "^16.0.0",
"@types/react-dom": "^16.0.0",
+ "@yesmeck/offline-plugin": "^5.0.5",
"ansi-styles": "^3.2.0",
"ant-design-palettes": "^1.0.0",
"antd-theme-generator": "1.0.7",
@@ -142,7 +143,6 @@
"majo": "^0.6.2",
"mockdate": "^2.0.1",
"moment-timezone": "^0.5.5",
- "offline-plugin": "yesmeck/offline-plugin#fix-cache-key",
"pre-commit": "^1.2.2",
"preact": "^8.2.5",
"preact-compat": "^3.17.0",
diff --git a/site/bisheng.config.js b/site/bisheng.config.js
index 4d7bcaf3cd..673294c572 100644
--- a/site/bisheng.config.js
+++ b/site/bisheng.config.js
@@ -1,6 +1,6 @@
const path = require('path');
const CSSSplitWebpackPlugin = require('css-split-webpack-plugin').default;
-const OfflinePlugin = require('offline-plugin');
+const OfflinePlugin = require('@yesmeck/offline-plugin');
const replaceLib = require('antd-tools/lib/replaceLib');
const getExternalResources = require('./getExternalResources');
diff --git a/site/theme/template/Layout/index.jsx b/site/theme/template/Layout/index.jsx
index b34d91d40b..e3e19ec7b1 100644
--- a/site/theme/template/Layout/index.jsx
+++ b/site/theme/template/Layout/index.jsx
@@ -6,7 +6,7 @@ import { addLocaleData, IntlProvider } from 'react-intl';
import 'moment/locale/zh-cn';
import { LocaleProvider } from 'antd';
import zhCN from 'antd/lib/locale-provider/zh_CN';
-import OfflineRuntime from 'offline-plugin/runtime';
+import OfflineRuntime from '@yesmeck/offline-plugin/runtime';
import Header from './Header';
import Footer from './Footer';
import enLocale from '../../en-US';