From 4f0d910a56a478d128f74ba5b538a43bb09345ef Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 26 Oct 2017 21:59:58 +0800 Subject: [PATCH 1/2] remove blank --- src/InkTabBarMixin.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/InkTabBarMixin.js b/src/InkTabBarMixin.js index 3cccd556..1cd10c1b 100755 --- a/src/InkTabBarMixin.js +++ b/src/InkTabBarMixin.js @@ -98,7 +98,6 @@ function componentDidUpdate(component, init) { } export default { - getDefaultProps() { return { inkBarAnimated: true, From fdf7858b36b649dea8baa59eefb6c509ce274ed8 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 26 Oct 2017 22:36:15 +0800 Subject: [PATCH 2/2] Fix tab active ink bar is rendered too long when initialize, usually happend with css-loader close ant-design/ant-design#7564 close ant-design/ant-design#8000 close ant-design/ant-design#8001 close ant-tool/atool-doc#40 close dvajs/dva#1300 --- src/InkTabBarMixin.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/InkTabBarMixin.js b/src/InkTabBarMixin.js index 1cd10c1b..e2cbf51e 100755 --- a/src/InkTabBarMixin.js +++ b/src/InkTabBarMixin.js @@ -38,6 +38,12 @@ function offset(elem) { } function componentDidUpdate(component, init) { + // If there is no css rendered, don't generate the ink bar + // fix https://github.com/ant-design/ant-design/issues/8001 + if (document.styleSheets.length === 0 || + (document.styleSheets.length === 1 && document.styleSheets[0].rules.length === 0)) { + return; + } const { styles } = component.props; const wrapNode = component.nav || component.root; const containerOffset = offset(wrapNode);