diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 91dcce5b33..9365cfba3a 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -15,6 +15,13 @@ timeline: true --- +## 3.8.4 + +`2018-08-27` + +- 🐞 Fixed an issue where the Tag component would cause a line break after deleting the tag. +- 🐞 Fixed `Failed to execute 'removeChild' on 'Node'` error when click Switch. + ## 3.8.3 `2018-08-26` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 4f0da85441..4cbb13833d 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -15,6 +15,13 @@ timeline: true --- +## 3.8.4 + +`2018-08-27` + +- 🐞 修复 Tag 组件删除 tag 后会造成换行的问题。 +- 🐞 修复 Switch 单击时会产生 `Failed to execute 'removeChild' on 'Node'` 错误的问题。 + ## 3.8.3 `2018-08-26` diff --git a/components/_util/wave.tsx b/components/_util/wave.tsx index 7a00f4598f..bef79c9c84 100644 --- a/components/_util/wave.tsx +++ b/components/_util/wave.tsx @@ -83,11 +83,14 @@ export default class Wave extends React.Component<{insertExtraNode?: boolean}> { } resetEffect(node: HTMLElement) { + if (!node || node === this.extraNode) { + return; + } const { insertExtraNode } = this.props; const attributeName = this.getAttributeName(); node.removeAttribute(attributeName); this.removeExtraStyleNode(); - if (insertExtraNode) { + if (insertExtraNode && this.extraNode && node.contains(this.extraNode)) { node.removeChild(this.extraNode); } TransitionEvents.removeEndEventListener(node, this.onTransitionEnd); diff --git a/components/icon/index.zh-CN.md b/components/icon/index.zh-CN.md index e338b1fcc2..8e1b8deebd 100644 --- a/components/icon/index.zh-CN.md +++ b/components/icon/index.zh-CN.md @@ -8,6 +8,10 @@ toc: false 语义化的矢量图形。 +## 设计师专属 🌟 + +安装 [Kitchen Sketch](https://kitchen.alipay.com) 插件,就可以一键拖拽使用 Ant Design 和 Iconfont 官方的海量图标,还可以关联自己的项目哦! + ## 图标的命名规范 我们为每个图标赋予了语义化的命名,命名规则如下: diff --git a/components/style/core/motion/other.less b/components/style/core/motion/other.less index 5d7d8c890b..e823753d8d 100644 --- a/components/style/core/motion/other.less +++ b/components/style/core/motion/other.less @@ -23,6 +23,7 @@ animation: fadeEffect 2s @ease-out-circ, waveEffect .4s @ease-out-circ; animation-fill-mode: forwards; display: block; + pointer-events: none; } @keyframes waveEffect { diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md index 18fcc69da5..bf734f1136 100644 --- a/components/table/index.zh-CN.md +++ b/components/table/index.zh-CN.md @@ -8,6 +8,10 @@ subtitle: 表格 展示行列数据。 +## 设计师专属 🌟 + +还在用 Sketch 手动画表格吗?现在安装 [Kitchen Sketch](https://kitchen.alipay.com/) 插件,两步就可以自动生成 Ant Design 表格组件啦! + ## 何时使用 - 当有大量结构化的数据需要展现时; diff --git a/components/tag/__tests__/__snapshots__/index.test.js.snap b/components/tag/__tests__/__snapshots__/index.test.js.snap index 84c169db4b..3e065797c7 100644 --- a/components/tag/__tests__/__snapshots__/index.test.js.snap +++ b/components/tag/__tests__/__snapshots__/index.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Tag visibility can be controlled by visible with hidden as initial value 1`] = `
`; +exports[`Tag visibility can be controlled by visible with hidden as initial value 1`] = ``; exports[`Tag visibility can be controlled by visible with hidden as initial value 2`] = ` `; -exports[`Tag visibility can be controlled by visible with hidden as initial value 3`] = ` - -`; +exports[`Tag visibility can be controlled by visible with hidden as initial value 3`] = ``; exports[`Tag visibility can be controlled by visible with visible as initial value 1`] = ` `; -exports[`Tag visibility can be controlled by visible with visible as initial value 2`] = ` - -`; +exports[`Tag visibility can be controlled by visible with visible as initial value 2`] = ``; exports[`Tag visibility can be controlled by visible with visible as initial value 3`] = ` `; diff --git a/components/tag/index.tsx b/components/tag/index.tsx index 2f90940253..c37c8ede20 100644 --- a/components/tag/index.tsx +++ b/components/tag/index.tsx @@ -147,7 +147,7 @@ class Tag extends React.Component