From 0bb79c27a6b2a73c38ba36e93cd4ab47c7bd1010 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 10 Dec 2018 21:44:14 +0800
Subject: [PATCH] feat: update popconfirm and tooltip

---
 components/_util/props-util.js                |  2 +-
 .../__snapshots__/index.test.js.snap          |  3 +-
 components/popconfirm/__tests__/index.test.js |  8 +++-
 components/popconfirm/index.jsx               | 46 ++++++++++++++-----
 components/tooltip/Tooltip.jsx                | 14 +-----
 components/tooltip/__tests__/tooltip.test.js  | 15 ------
 components/tooltip/abstractTooltipProps.js    |  1 +
 components/tooltip/placements.js              |  1 +
 8 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/components/_util/props-util.js b/components/_util/props-util.js
index 6dba0f19f..9da6e289f 100644
--- a/components/_util/props-util.js
+++ b/components/_util/props-util.js
@@ -234,7 +234,7 @@ const initDefaultProps = (propTypes, defaultProps) => {
 export function mergeProps () {
   const args = [].slice.call(arguments, 0)
   const props = {}
-  args.forEach((p, i) => {
+  args.forEach((p = {}, i) => {
     for (const [k, v] of Object.entries(p)) {
       props[k] = props[k] || {}
       if (isPlainObject(v)) {
diff --git a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap
index 7462f8f05..6bdb64797 100644
--- a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap
+++ b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap
@@ -6,8 +6,7 @@ exports[`Popconfirm should show overlay when trigger is clicked 1`] = `
   <div role="tooltip" class="ant-popover-inner">
     <div class="ant-popover-inner-content">
       <div class="ant-popover-message"><i class="anticon anticon-exclamation-circle"><svg viewBox="64 64 896 896" data-icon="exclamation-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="">
-            <path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path>
-            <path d="M464 688a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"></path>
+            <path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z"></path>
           </svg></i>
         <div class="ant-popover-message-title">code</div>
       </div>
diff --git a/components/popconfirm/__tests__/index.test.js b/components/popconfirm/__tests__/index.test.js
index 210679d0b..96ada5b63 100644
--- a/components/popconfirm/__tests__/index.test.js
+++ b/components/popconfirm/__tests__/index.test.js
@@ -5,6 +5,10 @@ function $$ (className) {
   return document.body.querySelectorAll(className)
 }
 describe('Popconfirm', () => {
+  const eventObject = expect.objectContaining({
+    target: expect.anything(),
+    preventDefault: expect.any(Function),
+  })
   it('should popup Popconfirm dialog', async () => {
     const onVisibleChange = jest.fn()
 
@@ -29,12 +33,12 @@ describe('Popconfirm', () => {
       triggerNode.trigger('click')
     })
     await asyncExpect(() => {
-      expect(onVisibleChange).toBeCalledWith(true)
+      expect(onVisibleChange).toHaveBeenLastCalledWith(true, undefined)
       expect($$('.popconfirm-test').length).toBe(1)
       triggerNode.trigger('click')
     }, 1000)
     await asyncExpect(() => {
-      expect(onVisibleChange).toBeCalledWith(false)
+      expect(onVisibleChange).toHaveBeenLastCalledWith(false, undefined)
     })
   })
 
diff --git a/components/popconfirm/index.jsx b/components/popconfirm/index.jsx
index 53cc2ca0d..cf44cde36 100644
--- a/components/popconfirm/index.jsx
+++ b/components/popconfirm/index.jsx
@@ -3,7 +3,7 @@ import omit from 'omit.js'
 import Tooltip from '../tooltip'
 import abstractTooltipProps from '../tooltip/abstractTooltipProps'
 import PropTypes from '../_util/vue-types'
-import { getOptionProps, hasProp, getComponentFromProp } from '../_util/props-util'
+import { getOptionProps, hasProp, getComponentFromProp, mergeProps } from '../_util/props-util'
 import BaseMixin from '../_util/BaseMixin'
 import buttonTypes from '../button/buttonTypes'
 import Icon from '../icon'
@@ -26,6 +26,8 @@ const Popconfirm = {
     okText: PropTypes.any,
     cancelText: PropTypes.any,
     icon: PropTypes.any,
+    okButtonProps: PropTypes.object,
+    cancelButtonProps: PropTypes.object,
   },
   mixins: [BaseMixin],
   model: {
@@ -38,18 +40,23 @@ const Popconfirm = {
     },
   },
   data () {
-    return {
-      sVisible: this.$props.visible,
+    const props = getOptionProps(this)
+    const state = { sVisible: false }
+    if ('visible' in props) {
+      state.sVisible = props.visible
+    } else if ('defaultVisible' in props) {
+      state.sVisible = props.defaultVisible
     }
+    return state
   },
   methods: {
     onConfirm (e) {
-      this.setVisible(false)
+      this.setVisible(false, e)
       this.$emit('confirm', e)
     },
 
     onCancel (e) {
-      this.setVisible(false)
+      this.setVisible(false, e)
       this.$emit('cancel', e)
     },
 
@@ -57,18 +64,35 @@ const Popconfirm = {
       this.setVisible(sVisible)
     },
 
-    setVisible (sVisible) {
+    setVisible (sVisible, e) {
       if (!hasProp(this, 'visible')) {
         this.setState({ sVisible })
       }
-      this.$emit('visibleChange', sVisible)
+      this.$emit('visibleChange', sVisible, e)
     },
     getPopupDomNode () {
       return this.$refs.tooltip.getPopupDomNode()
     },
     renderOverlay (popconfirmLocale) {
-      const { prefixCls, okType } = this
-      const icon = getComponentFromProp(this, 'icon') || <Icon type='exclamation-circle' />
+      const { prefixCls, okType, okButtonProps, cancelButtonProps } = this
+      const icon = getComponentFromProp(this, 'icon') || <Icon type='exclamation-circle' theme='filled'/>
+      const cancelBtnProps = mergeProps({
+        props: {
+          size: 'small',
+        },
+        on: {
+          click: this.onCancel,
+        },
+      }, cancelButtonProps)
+      const okBtnProps = mergeProps({
+        props: {
+          type: okType,
+          size: 'small',
+        },
+        on: {
+          click: this.onConfirm,
+        },
+      }, okButtonProps)
       return (
         <div class={`${prefixCls}-inner-content`}>
           <div class={`${prefixCls}-message`}>
@@ -78,10 +102,10 @@ const Popconfirm = {
             </div>
           </div>
           <div class={`${prefixCls}-buttons`}>
-            <Button onClick={this.onCancel} size='small'>
+            <Button {...cancelBtnProps}>
               {getComponentFromProp(this, 'cancelText') || popconfirmLocale.cancelText}
             </Button>
-            <Button onClick={this.onConfirm} type={okType} size='small'>
+            <Button {...okBtnProps}>
               {getComponentFromProp(this, 'okText') || popconfirmLocale.okText}
             </Button>
           </div>
diff --git a/components/tooltip/Tooltip.jsx b/components/tooltip/Tooltip.jsx
index 246e114d5..7f1560fc0 100644
--- a/components/tooltip/Tooltip.jsx
+++ b/components/tooltip/Tooltip.jsx
@@ -61,25 +61,13 @@ export default {
       })
     },
 
-    isHoverTrigger () {
-      const { trigger } = this.$props
-      if (!trigger || trigger === 'hover') {
-        return true
-      }
-      if (Array.isArray(trigger)) {
-        return trigger.indexOf('hover') >= 0
-      }
-      return false
-    },
-
     // Fix Tooltip won't hide at disabled button
     // mouse events don't trigger at disabled button in Chrome
     // https://github.com/react-component/tooltip/issues/18
     getDisabledCompatibleChildren (ele) {
       const isAntBtn = ele.componentOptions && ele.componentOptions.Ctor.options.__ANT_BUTTON
       if (((isAntBtn && (ele.componentOptions.propsData.disabled || ele.componentOptions.propsData.disabled === '')) ||
-      (ele.tag === 'button' && ele.data && ele.data.attrs.disabled !== false)) &&
-      this.isHoverTrigger()) {
+      (ele.tag === 'button' && ele.data && ele.data.attrs.disabled !== false))) {
       // Pick some layout related style properties up to span
       // Prevent layout bugs like https://github.com/ant-design/ant-design/issues/5254
         const { picked, omitted } = splitObject(
diff --git a/components/tooltip/__tests__/tooltip.test.js b/components/tooltip/__tests__/tooltip.test.js
index f104c0e9f..792846bbc 100644
--- a/components/tooltip/__tests__/tooltip.test.js
+++ b/components/tooltip/__tests__/tooltip.test.js
@@ -155,21 +155,6 @@ describe('Tooltip', () => {
   //   expect(wrapper2.find('span').at(0).element.style.display).toBe('block')
   // })
 
-  // it('should not wrap span when trigger is not hover', () => {
-  //   const wrapper = mount(
-  //     <Tooltip
-  //       title='xxxxx'
-  //       trigger='click'
-  //       mouseEnterDelay={0}
-  //       mouseLeaveDelay={0}
-  //     >
-  //       <button disabled>Hello world!</button>
-  //     </Tooltip>
-  //   )
-
-  //   expect(wrapper.find('span')).toHaveLength(0)
-  // })
-
   // it('should works for arrowPointAtCenter', () => {
   //   const arrowWidth = 5
   //   const horizontalArrowShift = 16
diff --git a/components/tooltip/abstractTooltipProps.js b/components/tooltip/abstractTooltipProps.js
index a963cf614..1d74dd960 100644
--- a/components/tooltip/abstractTooltipProps.js
+++ b/components/tooltip/abstractTooltipProps.js
@@ -3,6 +3,7 @@ const triggerType = PropTypes.oneOf(['hover', 'focus', 'click', 'contextmenu'])
 export default () => ({
   trigger: PropTypes.oneOfType([triggerType, PropTypes.arrayOf(triggerType)]).def('hover'),
   visible: PropTypes.bool,
+  defaultVisible: PropTypes.bool,
   placement: PropTypes.oneOf(['top', 'left', 'right', 'bottom',
     'topLeft', 'topRight', 'bottomLeft', 'bottomRight',
     'leftTop', 'leftBottom', 'rightTop', 'rightBottom']).def('top'),
diff --git a/components/tooltip/placements.js b/components/tooltip/placements.js
index 6322c4a24..a3dcff89c 100644
--- a/components/tooltip/placements.js
+++ b/components/tooltip/placements.js
@@ -83,6 +83,7 @@ export default function getPlacements (config) {
       ...rcPlacements[key],
       overflow: getOverflowOptions(autoAdjustOverflow),
     }
+    placementMap[key].ignoreShake = true
   })
   return placementMap
 }