From f956b55c92c7537d88c66fbb7198adc37d52bcbc Mon Sep 17 00:00:00 2001 From: TTC <345866517@qq.com> Date: Tue, 17 Sep 2019 18:18:56 +0800 Subject: [PATCH 1/9] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0tooltip=20destroy?= =?UTF-8?q?TooltipOnHide=20Api=E8=AF=B4=E6=98=8E=20(#18859)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 添加tooltip destroyTooltipOnHide Api说明 * 添加tooltip destroyTooltipOnHide Api说明 * 修复destroyTooltipOnHide说明 --- components/tooltip/index.en-US.md | 1 + components/tooltip/index.zh-CN.md | 1 + 2 files changed, 2 insertions(+) diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md index 588afd70d7..70be7ed2a2 100644 --- a/components/tooltip/index.en-US.md +++ b/components/tooltip/index.en-US.md @@ -35,6 +35,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover. | trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` \| `contextMenu` | `hover` | | | visible | Whether the floating tooltip card is visible or not | boolean | `false` | | | onVisibleChange | Callback executed when visibility of the tooltip card is changed | (visible) => void | - | | +| destroyTooltipOnHide | whether destroy tooltip when tooltip is hidden | boolean | false | | | align | this value will be merged into placement's config, please refer to the settings [rc-tooltip](https://github.com/react-component/tooltip) | Object | - | 3.10.0 | ## Note diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md index f5c4d6605d..5e8f322401 100644 --- a/components/tooltip/index.zh-CN.md +++ b/components/tooltip/index.zh-CN.md @@ -37,6 +37,7 @@ title: Tooltip | trigger | 触发行为，可选 `hover/focus/click/contextMenu` | string | hover | | | visible | 用于手动控制浮层显隐 | boolean | false | | | onVisibleChange | 显示隐藏的回调 | (visible) => void | 无 | | +| destroyTooltipOnHide | 是否在隐藏时销毁 Tooltip | boolean | false | | | align | 该值将合并到 placement 的配置中，设置参考 [rc-tooltip](https://github.com/react-component/tooltip) | Object | 无 | 3.10.0 | ## 注意 From 1ae54f5432bc2b8ee3275a5dfded180412d4ec31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Wed, 18 Sep 2019 12:17:34 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=93=8D=20Add=20GitHub=20actions=20bad?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 72f52e04c4..1c3815772c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ An enterprise-class UI design language and React UI library. -[![CircleCI branch](https://img.shields.io/circleci/project/github/ant-design/ant-design/master.svg?style=flat-square)](https://circleci.com/gh/ant-design/ant-design) [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master) [![](https://flat.badgen.net/npm/v/antd?icon=npm)](https://www.npmjs.com/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd) +[![CircleCI branch](https://img.shields.io/circleci/project/github/ant-design/ant-design/master.svg?style=flat-square)](https://circleci.com/gh/ant-design/ant-design) ![CI Status](https://github.com/ant-design/ant-design/workflows/Node CI/badge.svg)] [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master) [![](https://flat.badgen.net/npm/v/antd?icon=npm)](https://www.npmjs.com/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd) [![Dependencies](https://img.shields.io/david/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design) [![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design?type=dev) [![Total alerts](https://flat.badgen.net/lgtm/alerts/g/ant-design/ant-design)](https://lgtm.com/projects/g/ant-design/ant-design/alerts/) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fant-design%2Fant-design.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fant-design%2Fant-design?ref=badge_shield) [![Issues need help](https://flat.badgen.net/github/label-issues/ant-design/ant-design/help%20wanted/open)](https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) From 1f7d5066c2d21207f5db1458b9d9bea44dffd31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Wed, 18 Sep 2019 12:19:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=93=8D=20fix=20GitHub=20actions=20bad?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c3815772c..929e69087f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ An enterprise-class UI design language and React UI library. -[![CircleCI branch](https://img.shields.io/circleci/project/github/ant-design/ant-design/master.svg?style=flat-square)](https://circleci.com/gh/ant-design/ant-design) ![CI Status](https://github.com/ant-design/ant-design/workflows/Node CI/badge.svg)] [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master) [![](https://flat.badgen.net/npm/v/antd?icon=npm)](https://www.npmjs.com/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd) +[![CircleCI branch](https://img.shields.io/circleci/project/github/ant-design/ant-design/master.svg?style=flat-square)](https://circleci.com/gh/ant-design/ant-design) ![CI Status](https://github.com/ant-design/ant-design/workflows/Node%20CI/badge.svg) + [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master) [![](https://flat.badgen.net/npm/v/antd?icon=npm)](https://www.npmjs.com/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd) [![Dependencies](https://img.shields.io/david/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design) [![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design?type=dev) [![Total alerts](https://flat.badgen.net/lgtm/alerts/g/ant-design/ant-design)](https://lgtm.com/projects/g/ant-design/ant-design/alerts/) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fant-design%2Fant-design.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fant-design%2Fant-design?ref=badge_shield) [![Issues need help](https://flat.badgen.net/github/label-issues/ant-design/ant-design/help%20wanted/open)](https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) From 2faeca695d1965236e6341bd910c7435000b259b Mon Sep 17 00:00:00 2001 From: ycjcl868 <45808948@qq.com> Date: Wed, 18 Sep 2019 14:11:06 +0800 Subject: [PATCH 4/9] upd: antd 4.0.0-alpha.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f684e4434..4fc6122a42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd", - "version": "4.0.0-alpha.3", + "version": "4.0.0-alpha.4", "description": "An enterprise-class UI design language and React components implementation", "keywords": [ "ant", From eedb71c146bc26bdfc8a15ff60f4d0769b3b30a5 Mon Sep 17 00:00:00 2001 From: ycjcl868 <45808948@qq.com> Date: Wed, 18 Sep 2019 18:09:24 +0800 Subject: [PATCH 5/9] test: snapshot --- .../__snapshots__/components.test.js.snap | 18 ++++++---- .../__tests__/__snapshots__/demo.test.js.snap | 3 +- .../__tests__/__snapshots__/demo.test.js.snap | 24 ++++++++----- .../__snapshots__/directory.test.js.snap | 36 ++++++++++++------- 4 files changed, 54 insertions(+), 27 deletions(-) diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap index 8420a4a629..4f347dd8cd 100644 --- a/components/config-provider/__tests__/__snapshots__/components.test.js.snap +++ b/components/config-provider/__tests__/__snapshots__/components.test.js.snap @@ -16830,8 +16830,9 @@ exports[`ConfigProvider components Tree configProvider 1`] = ` role="tree" >
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
Date: Wed, 18 Sep 2019 19:07:17 +0800 Subject: [PATCH 6/9] fix: site ssr react-intl --- site/theme/template/Layout/index.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/theme/template/Layout/index.jsx b/site/theme/template/Layout/index.jsx index 5f4cd3cdb3..7dd8311cd1 100644 --- a/site/theme/template/Layout/index.jsx +++ b/site/theme/template/Layout/index.jsx @@ -2,6 +2,9 @@ import React from 'react'; import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; import { enquireScreen } from 'enquire-js'; +import '@formatjs/intl-relativetimeformat/polyfill'; +import '@formatjs/intl-relativetimeformat/dist/locale-data/zh'; +import '@formatjs/intl-relativetimeformat/dist/locale-data/en'; import { IntlProvider } from 'react-intl'; import { Helmet } from 'react-helmet'; import 'moment/locale/zh-cn'; From 33afa7462cec3b3b98596b1dc6e1ac90ee392674 Mon Sep 17 00:00:00 2001 From: ycjcl868 <45808948@qq.com> Date: Wed, 18 Sep 2019 19:09:21 +0800 Subject: [PATCH 7/9] :memo: comment --- site/theme/template/Layout/index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/site/theme/template/Layout/index.jsx b/site/theme/template/Layout/index.jsx index 7dd8311cd1..41589f4294 100644 --- a/site/theme/template/Layout/index.jsx +++ b/site/theme/template/Layout/index.jsx @@ -2,6 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; import { enquireScreen } from 'enquire-js'; +// https://github.com/formatjs/react-intl/issues/1487 import '@formatjs/intl-relativetimeformat/polyfill'; import '@formatjs/intl-relativetimeformat/dist/locale-data/zh'; import '@formatjs/intl-relativetimeformat/dist/locale-data/en'; From da760b461f9d007dc406e1b628c9f108a3c61cba Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 09:11:28 +0000 Subject: [PATCH 8/9] chore(deps-dev): update cross-env requirement from ^5.2.0 to ^6.0.0 Updates the requirements on [cross-env](https://github.com/kentcdodds/cross-env) to permit the latest version. - [Release notes](https://github.com/kentcdodds/cross-env/releases) - [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md) - [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v6.0.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd64a0a59c..13b3294026 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,7 @@ "bisheng-plugin-toc": "^0.4.4", "bundlesize": "^0.18.0", "chalk": "^2.4.2", - "cross-env": "^5.2.0", + "cross-env": "^6.0.0", "css-split-webpack-plugin": "^0.2.6", "dekko": "^0.2.1", "docsearch.js": "^2.6.3", From 6d9d04db29a03ed33059cd6b49e82b8ab07a6877 Mon Sep 17 00:00:00 2001 From: ycjcl868 <45808948@qq.com> Date: Wed, 18 Sep 2019 19:21:16 +0800 Subject: [PATCH 9/9] upd: devDeps --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index fd64a0a59c..dfca8c652c 100644 --- a/package.json +++ b/package.json @@ -143,6 +143,7 @@ "devDependencies": { "@ant-design/colors": "^3.1.0", "@ant-design/tools": "^8.0.4", + "@formatjs/intl-relativetimeformat": "^4.0.1", "@packtracker/webpack-plugin": "^2.0.1", "@sentry/browser": "^5.4.0", "@types/classnames": "^2.2.8",