Merge pull request #557 from XiaoMi/hotfix/#335

2.0.5
XiaoMi · Aug 15, 2019 · 550f838 · 550f838
2 parents e5a2d0b + d4f02cb
commit 550f838
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # 更新日志
 
+## 2.0.5
+
+- 修复 `<Tooltip />` hover 的闪烁问题 [#522](https://github.com/XiaoMi/hiui/issues/522)
+- 修复 `<Upload />` maxCount 结合 onChange return false的计算错误问题 [#549](https://github.com/XiaoMi/hiui/issues/549)
+- 修复 `<Dropdown />` 部分区域点击无效的问题 [#555](https://github.com/XiaoMi/hiui/issues/555)
+- 修复 `<Menu />` 高亮项计算错误的问题 [#556](https://github.com/XiaoMi/hiui/issues/556)
+
 ## 2.0.4
 
 - 修复：`DatePicker.format` 方法丢失的问题  [#540](https://github.com/XiaoMi/hiui/issues/540)

diff --git a/components/dropdown/Dropdown.js b/components/dropdown/Dropdown.js
@@ -5,6 +5,10 @@ import classNames from 'classnames'
 import Button from '../button/index'
 import Popper from '../popper'
 import Provider from '../context'
+
+const ItemWrapper = ({href, children}) => {
+  return href ? <a href={href}>{children}</a> : <React.Fragment>{children}</React.Fragment>
+}
 class Dropdown extends Component {
   constructor (props) {
     super(props)
@@ -131,10 +135,6 @@ class Dropdown extends Component {
                   String(item.title) === String(title) && 'hi-dropdown__item--active'
                 )
 
-                const ItemWrapper = ({href, children}) => {
-                  return href ? <a href={href}>{children}</a> : <React.Fragment>{children}</React.Fragment>
-                }
-
                 return <li className={liCls} key={index} onClick={this.handlerClick.bind(this, item)}>
                   <ItemWrapper href={item.url}>
                     {(prefix || item.prefix) && <div className='hi-dropdown__item-prefix'>{prefix || item.prefix}</div>}

diff --git a/components/menu/Item.js b/components/menu/Item.js
@@ -16,7 +16,7 @@ class Item extends Component {
       index,
       data
     } = this.props
-    const isActive = activeIndex.indexOf(index) === 0
+    const isActive = activeIndex === index
     const cls = classNames('hi-menu-item', 'hi-menu-item__title', 'hi-menu__title', `hi-menu--${level}`, {
       'hi-menu-item--disabled': disabled,
       'hi-menu-item--active': isActive

diff --git a/components/popper/index.js b/components/popper/index.js
@@ -9,9 +9,6 @@ export default class Popper extends Component {
   popperHeight = undefined
 
   static propTypes = {
-    // attachEle: PropTypes.oneOfType([
-    //   PropTypes.node
-    // ]).isRequired,
     width: PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.number]), // 为false时不设置
     height: PropTypes.number,
     className: PropTypes.string,
@@ -25,7 +22,7 @@ export default class Popper extends Component {
   static defaultProps = {
     show: false,
     topGap: 2,
-    leftGap: 0,
+    leftGap: 2,
     zIndex: 1060,
     placement: 'bottom-start'
   }
@@ -81,12 +78,12 @@ export default class Popper extends Component {
         break
 
       case 'left':
-        top = top + topGap + rect.height / 2
-        left = left + leftGap
+        top = top + rect.height / 2
+        left = left - leftGap
         break
 
       case 'right':
-        top = top + topGap + rect.height / 2
+        top = top + rect.height / 2
         left = left + rect.width + leftGap
         break
       case 'right-start':
@@ -178,7 +175,6 @@ export default class Popper extends Component {
     container.style.top = '0'
     container.style.left = '0'
     container.style.width = '100%'
-    // const child = React.Children.only(this.props.children)
 
     document.body.appendChild(container)
 

diff --git a/components/tooltip/style/index.scss b/components/tooltip/style/index.scss
@@ -16,6 +16,9 @@
   &::after {
     content: '';
     position: absolute;
+    width: 5px;
+    height: 5px;
+    background: #4a4a4a;
   }
 }
 
@@ -24,11 +27,9 @@
   margin-bottom: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-top-color: #4a4a4a;
-    bottom: -10px;
+    bottom: -2px;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translateX(-50%) rotate(45deg);
   }
 }
 
@@ -37,11 +38,9 @@
   margin-left: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-right-color: #4a4a4a;
-    left: -10px;
+    left: -2px;
     top: 50%;
-    transform: translateY(-50%);
+    transform: translateY(-50%) rotate(45deg);
   }
 }
 
@@ -50,11 +49,9 @@
   margin-top: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-bottom-color: #4a4a4a;
-    top: -10px;
+    top: -2px;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translateX(-50%) rotate(45deg);
   }
 }
 
@@ -63,11 +60,9 @@
   margin-right: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-left-color: #4a4a4a;
-    right: -10px;
+    right: -2px;
     top: 50%;
-    transform: translateY(-50%);
+    transform: translateY(-50%) rotate(45deg);
   }
 }
 
@@ -76,11 +71,9 @@
   margin-bottom: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-top-color: #4a4a4a;
-    bottom: -10px;
+    bottom: -2px;
     left: 20%;
-    transform: translateX(-50%);
+    transform: translateX(-50%) rotate(45deg);
   }
 }
 
@@ -89,11 +82,9 @@
   margin-bottom: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-top-color: #4a4a4a;
-    bottom: -10px;
+    bottom: -2px;
     right: 10%;
-    transform: translateX(-50%);
+    transform: translateX(-50%) rotate(45deg);
   }
 }
 
@@ -102,11 +93,9 @@
   margin-top: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-bottom-color: #4a4a4a;
-    top: -10px;
+    top: -2px;
     right: 10%;
-    transform: translateX(-50%);
+    transform: translateX(-50%) rotate(45deg);
   }
 }
 
@@ -115,11 +104,9 @@
   margin-top: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-bottom-color: #4a4a4a;
-    top: -10px;
+    top: -2px;
     left: 20%;
-    transform: translateX(-50%);
+    transform: translateX(-50%) rotate(45deg);
   }
 }
 
@@ -128,9 +115,7 @@
   margin-right: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-left-color: #4a4a4a;
-    right: -10px;
+    right: -2px;
     top: 15%;
   }
 }
@@ -140,9 +125,7 @@
   margin-right: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-left-color: #4a4a4a;
-    right: -10px;
+    right: -2px;
     bottom: 15%;
   }
 }
@@ -152,9 +135,7 @@
   margin-left: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-right-color: #4a4a4a;
-    left: -10px;
+    left: -2px;
     top: 15%;
   }
 }
@@ -164,9 +145,7 @@
   margin-left: 5px;
 
   &::after {
-    border: 5px solid transparent;
-    border-right-color: #4a4a4a;
-    left: -10px;
+    left: -2px;
     bottom: 15%;
   }
 }