@rc-component/trigger 1.14.1 → 1.14.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/hooks/useWinClick.js +12 -12
  2. package/es/index.js +4 -1
  3. package/lib/hooks/useWinClick.js +12 -12
  4. package/lib/index.js +4 -1
  5. package/package.json +1 -1
package/es/hooks/useWinClick.js CHANGED
@@ -53,16 +53,16 @@ export default function useWinClick(open, clickToHide, targetEle, popupEle, mask
53
53
  onShadowMouseDown = _genClickEvents4[0],
54
54
  onShadowClick = _genClickEvents4[1];
55
55
  var win = getWin(popupEle);
56
- win.addEventListener('mousedown', onWinMouseDown);
57
- win.addEventListener('click', onWinClick);
58
- win.addEventListener('contextmenu', onWinClick);
56
+ win.addEventListener('mousedown', onWinMouseDown, true);
57
+ win.addEventListener('click', onWinClick, true);
58
+ win.addEventListener('contextmenu', onWinClick, true);
59
59
 
60
60
  // shadow root
61
61
  var targetShadowRoot = getShadowRoot(targetEle);
62
62
  if (targetShadowRoot) {
63
- targetShadowRoot.addEventListener('mousedown', onShadowMouseDown);
64
- targetShadowRoot.addEventListener('click', onShadowClick);
65
- targetShadowRoot.addEventListener('contextmenu', onShadowClick);
63
+ targetShadowRoot.addEventListener('mousedown', onShadowMouseDown, true);
64
+ targetShadowRoot.addEventListener('click', onShadowClick, true);
65
+ targetShadowRoot.addEventListener('contextmenu', onShadowClick, true);
66
66
  }
67
67
 
68
68
  // Warning if target and popup not in same root
@@ -73,13 +73,13 @@ export default function useWinClick(open, clickToHide, targetEle, popupEle, mask
73
73
  warning(targetRoot === popupRoot, "trigger element and popup element should in same shadow root.");
74
74
  }
75
75
  return function () {
76
- win.removeEventListener('mousedown', onWinMouseDown);
77
- win.removeEventListener('click', onWinClick);
78
- win.removeEventListener('contextmenu', onWinClick);
76
+ win.removeEventListener('mousedown', onWinMouseDown, true);
77
+ win.removeEventListener('click', onWinClick, true);
78
+ win.removeEventListener('contextmenu', onWinClick, true);
79
79
  if (targetShadowRoot) {
80
- targetShadowRoot.removeEventListener('mousedown', onShadowMouseDown);
81
- targetShadowRoot.removeEventListener('click', onShadowClick);
82
- targetShadowRoot.removeEventListener('contextmenu', onShadowClick);
80
+ targetShadowRoot.removeEventListener('mousedown', onShadowMouseDown, true);
81
+ targetShadowRoot.removeEventListener('click', onShadowClick, true);
82
+ targetShadowRoot.removeEventListener('contextmenu', onShadowClick, true);
83
83
  }
84
84
  };
85
85
  }
package/es/index.js CHANGED
@@ -343,7 +343,10 @@ export function generateTrigger() {
343
343
  setMousePosByEvent(event);
344
344
  });
345
345
  onPopupMouseEnter = function onPopupMouseEnter() {
346
- triggerOpen(true, mouseEnterDelay);
346
+ // Only trigger re-open when popup is visible
347
+ if (mergedOpen || inMotion) {
348
+ triggerOpen(true, mouseEnterDelay);
349
+ }
347
350
  };
348
351
 
349
352
  // Align Point
package/lib/hooks/useWinClick.js CHANGED
@@ -61,16 +61,16 @@ function useWinClick(open, clickToHide, targetEle, popupEle, mask, maskClosable,
61
61
  onShadowMouseDown = _genClickEvents4[0],
62
62
  onShadowClick = _genClickEvents4[1];
63
63
  var win = (0, _util.getWin)(popupEle);
64
- win.addEventListener('mousedown', onWinMouseDown);
65
- win.addEventListener('click', onWinClick);
66
- win.addEventListener('contextmenu', onWinClick);
64
+ win.addEventListener('mousedown', onWinMouseDown, true);
65
+ win.addEventListener('click', onWinClick, true);
66
+ win.addEventListener('contextmenu', onWinClick, true);
67
67
 
68
68
  // shadow root
69
69
  var targetShadowRoot = (0, _shadow.getShadowRoot)(targetEle);
70
70
  if (targetShadowRoot) {
71
- targetShadowRoot.addEventListener('mousedown', onShadowMouseDown);
72
- targetShadowRoot.addEventListener('click', onShadowClick);
73
- targetShadowRoot.addEventListener('contextmenu', onShadowClick);
71
+ targetShadowRoot.addEventListener('mousedown', onShadowMouseDown, true);
72
+ targetShadowRoot.addEventListener('click', onShadowClick, true);
73
+ targetShadowRoot.addEventListener('contextmenu', onShadowClick, true);
74
74
  }
75
75
 
76
76
  // Warning if target and popup not in same root
@@ -81,13 +81,13 @@ function useWinClick(open, clickToHide, targetEle, popupEle, mask, maskClosable,
81
81
  (0, _rcUtil.warning)(targetRoot === popupRoot, "trigger element and popup element should in same shadow root.");
82
82
  }
83
83
  return function () {
84
- win.removeEventListener('mousedown', onWinMouseDown);
85
- win.removeEventListener('click', onWinClick);
86
- win.removeEventListener('contextmenu', onWinClick);
84
+ win.removeEventListener('mousedown', onWinMouseDown, true);
85
+ win.removeEventListener('click', onWinClick, true);
86
+ win.removeEventListener('contextmenu', onWinClick, true);
87
87
  if (targetShadowRoot) {
88
- targetShadowRoot.removeEventListener('mousedown', onShadowMouseDown);
89
- targetShadowRoot.removeEventListener('click', onShadowClick);
90
- targetShadowRoot.removeEventListener('contextmenu', onShadowClick);
88
+ targetShadowRoot.removeEventListener('mousedown', onShadowMouseDown, true);
89
+ targetShadowRoot.removeEventListener('click', onShadowClick, true);
90
+ targetShadowRoot.removeEventListener('contextmenu', onShadowClick, true);
91
91
  }
92
92
  };
93
93
  }
package/lib/index.js CHANGED
@@ -353,7 +353,10 @@ function generateTrigger() {
353
353
  setMousePosByEvent(event);
354
354
  });
355
355
  onPopupMouseEnter = function onPopupMouseEnter() {
356
- triggerOpen(true, mouseEnterDelay);
356
+ // Only trigger re-open when popup is visible
357
+ if (mergedOpen || inMotion) {
358
+ triggerOpen(true, mouseEnterDelay);
359
+ }
357
360
  };
358
361
 
359
362
  // Align Point
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rc-component/trigger",
3
- "version": "1.14.1",
3
+ "version": "1.14.3",
4
4
  "description": "base abstract trigger component for react",
5
5
  "engines": {
6
6
  "node": ">=8.x"