Merge branch 'develop' into feature/#1272

XiaoMi · Nov 4, 2020 · b1475aa · b1475aa
2 parents 73d1c41 + 8e70513
commit b1475aa
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,12 @@
 - 修复 `Tag` 使用 ref 无效问题 [#1262](https://github.com/XiaoMi/hiui/issues/1262)
 - 修复 `Table` data 为 undefined 时的报错问题 [#1265](https://github.com/XiaoMi/hiui/issues/1265)
 - 修复 `Loading` 显示不正确的问题 [#1265](https://github.com/XiaoMi/hiui/issues/1268)
-- 优化 `SelectTree` 文档以及样式相关方面 [#1272](https://github.com/XiaoMi/hiui/issues/1272)
+- 优化 `SelectTree` 样式问题 [#1272](https://github.com/XiaoMi/hiui/issues/1272)
+- 修复 `Table` data 为 undefined 时的报错问题 [#1273](https://github.com/XiaoMi/hiui/issues/1265)
+- 修复 `Loading` 显示不正确的问题 [#1268](https://github.com/XiaoMi/hiui/issues/1268)
+- 修复 `Tag` 闪烁问题 [#1273](https://github.com/XiaoMi/hiui/issues/1273)
+- 修复 `Timeline` 折断样式问题 [#1276](https://github.com/XiaoMi/hiui/issues/1276)
+- 修复 `Timeline` 只有一条数据时的样式问题 [#1277](https://github.com/XiaoMi/hiui/issues/1277)
 
 ## 3.0.0
 

diff --git a/components/tag/TagGroup.js b/components/tag/TagGroup.js
@@ -14,6 +14,7 @@ const TagGroup = ({ editable, prefixCls = 'hi-tag-group', data, onAdd = noop, on
   const [editInputId, setEditInputId] = useState(-1)
   const [editInputValue, setEditInputValue] = useState('')
   const [hoverIndex, setHoverIndex] = useState(-1)
+  const [renderedItem] = useState(data.map((d) => d.tagId))
 
   useEffect(() => {
     if (inputVisible) {
@@ -107,15 +108,15 @@ const TagGroup = ({ editable, prefixCls = 'hi-tag-group', data, onAdd = noop, on
           onDoubleClick={onDoubleClick}
           isLongTag={item.isLongTag}
           hoverIndex={hoverIndex}
-          transition
+          transition={!renderedItem.includes(item.tagId)}
           onMouseEnter={(id) => setHoverIndex(id)}
           onMouseLeave={() => setHoverIndex(-1)}
         >
           {item.title}
         </Tag>
       )
     },
-    [hoverIndex, handleClose, onDoubleClick]
+    [hoverIndex, handleClose, onDoubleClick, renderedItem]
   )
 
   const renderItem = useCallback(

diff --git a/components/tag/TagItem.js b/components/tag/TagItem.js
@@ -22,12 +22,13 @@ const InternalTagItem = ({
   onMouseLeave = noop,
   hoverIndex = -1,
   shape = 'round',
-  innerRef
+  innerRef,
+  transition
 }) => {
   const [vi, setVi] = useState(false)
   useEffect(() => {
-    setVi(true)
-  }, [])
+    setVi(transition)
+  }, [transition])
   const tagStyle = color
     ? {
         background: appearance === 'default' ? color : '',
@@ -36,14 +37,7 @@ const InternalTagItem = ({
       }
     : {}
   return (
-    <CSSTransition
-      in={vi}
-      timeout={300}
-      classNames={'tag-transition'}
-      onExited={() => {
-        setTimeout(() => handleClose(id), 300)
-      }}
-    >
+    <CSSTransition in={vi} timeout={300} classNames={'tag-transition'}>
       <span
         className={classNames('hi-tag', {
           [`hi-tag--${type}`]: type,
@@ -69,7 +63,7 @@ const InternalTagItem = ({
             <Icon
               name="close"
               onClick={(e) => {
-                setVi(false)
+                handleClose(id)
               }}
             />
           </button>

diff --git a/components/tag/style/index.scss b/components/tag/style/index.scss
@@ -48,7 +48,7 @@ $primary: get-color($palette-primary, 'hiui-blue') !default;
   transition: opacity 0.3s;
 
   &:hover {
-    opacity: 0.65;
+    opacity: 0.85;
   }
 
   @each $key, $value in $color-map {

diff --git a/components/timeline/style/index.scss b/components/timeline/style/index.scss
@@ -21,6 +21,12 @@
         .item__line {
           height: 7px !important;
         }
+
+        &.timeline__item--first {
+          .item__line {
+            height: 0 !important;
+          }
+        }
       }
 
       &--first {
@@ -204,6 +210,12 @@
             height: 7px;
           }
         }
+
+        &.timeline__item--first {
+          .item__line {
+            height: 0 !important;
+          }
+        }
       }
 
       &--first {
@@ -304,7 +316,6 @@
     .timeline__item {
       display: flex;
       position: relative;
-      margin-bottom: 20px;
 
       .item--left {
         text-align: right;
@@ -360,6 +371,7 @@
       .item--right {
         width: calc(70% - 20px);
         margin-left: 20px;
+        margin-bottom: 20px;
 
         .item__title {
           color: use-color('black');
@@ -383,6 +395,12 @@
         .item__line {
           height: 7px;
         }
+
+        &.timeline__item--first {
+          .item__line {
+            height: 0 !important;
+          }
+        }
       }
 
       &--first {

diff --git a/docs/zh-CN/docs/changelog.mdx b/docs/zh-CN/docs/changelog.mdx
@@ -11,6 +11,8 @@
 - 修复 `Tag` 使用 ref 无效问题 [#1262](https://github.com/XiaoMi/hiui/issues/1262)
 - 修复 `Table` data 为 undefined 时的报错问题 [#1265](https://github.com/XiaoMi/hiui/issues/1265)
 - 修复 `Loading` 显示不正确的问题 [#1265](https://github.com/XiaoMi/hiui/issues/1268)
+- 修复 `Timeline` 折断样式问题 [#1276](https://github.com/XiaoMi/hiui/issues/1276)
+- 修复 `Timeline` 只有一条数据时的样式问题 [#1277](https://github.com/XiaoMi/hiui/issues/1277)
 
 ## 3.0.0