@rc-component/trigger 1.18.1 → 1.18.3

package/es/hooks/useAlign.js

@@ -118,6 +118,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       var originTop = popupElement.style.top;
       var originRight = popupElement.style.right;
       var originBottom = popupElement.style.bottom;
+      var originOverflow = popupElement.style.overflow;
 
       // Placement
       var placementInfo = _objectSpread(_objectSpread({}, builtinPlacements[placement]), popupAlign);
@@ -136,6 +137,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       popupElement.style.top = '0';
       popupElement.style.right = 'auto';
       popupElement.style.bottom = 'auto';
+      popupElement.style.overflow = 'hidden';
 
       // Calculate align style, we should consider `transform` case
       var targetRect;
@@ -208,6 +210,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       popupElement.style.top = originTop;
       popupElement.style.right = originRight;
       popupElement.style.bottom = originBottom;
+      popupElement.style.overflow = originOverflow;
       (_popupElement$parentE2 = popupElement.parentElement) === null || _popupElement$parentE2 === void 0 || _popupElement$parentE2.removeChild(placeholderElement);
 
       // Calculate scale

package/es/index.js

@@ -24,7 +24,9 @@ import { getAlignPopupClassName, getMotion } from "./util";
 // Removed Props List
 // Seems this can be auto
 // getDocument?: (element?: HTMLElement) => Document;
+
 // New version will not wrap popup with `rc-trigger-popup-content` when multiple children
+
 export function generateTrigger() {
   var PortalComponent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : Portal;
   var Trigger = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -372,9 +374,9 @@ export function generateTrigger() {
       wrapperAction('onPointerEnter', true, mouseEnterDelay, function (event) {
         setMousePosByEvent(event);
       });
-      onPopupMouseEnter = function onPopupMouseEnter() {
+      onPopupMouseEnter = function onPopupMouseEnter(event) {
         // Only trigger re-open when popup is visible
-        if (mergedOpen || inMotion) {
+        if ((mergedOpen || inMotion) && popupEle !== null && popupEle !== void 0 && popupEle.contains(event.target)) {
           triggerOpen(true, mouseEnterDelay);
         }
       };

package/lib/hooks/useAlign.js

@@ -126,6 +126,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       var originTop = popupElement.style.top;
       var originRight = popupElement.style.right;
       var originBottom = popupElement.style.bottom;
+      var originOverflow = popupElement.style.overflow;
 
       // Placement
       var placementInfo = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, builtinPlacements[placement]), popupAlign);
@@ -144,6 +145,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       popupElement.style.top = '0';
       popupElement.style.right = 'auto';
       popupElement.style.bottom = 'auto';
+      popupElement.style.overflow = 'hidden';
 
       // Calculate align style, we should consider `transform` case
       var targetRect;
@@ -216,6 +218,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       popupElement.style.top = originTop;
       popupElement.style.right = originRight;
       popupElement.style.bottom = originBottom;
+      popupElement.style.overflow = originOverflow;
       (_popupElement$parentE2 = popupElement.parentElement) === null || _popupElement$parentE2 === void 0 || _popupElement$parentE2.removeChild(placeholderElement);
 
       // Calculate scale

package/lib/index.js

@@ -382,9 +382,9 @@ function generateTrigger() {
       wrapperAction('onPointerEnter', true, mouseEnterDelay, function (event) {
         setMousePosByEvent(event);
       });
-      onPopupMouseEnter = function onPopupMouseEnter() {
+      onPopupMouseEnter = function onPopupMouseEnter(event) {
         // Only trigger re-open when popup is visible
-        if (mergedOpen || inMotion) {
+        if ((mergedOpen || inMotion) && popupEle !== null && popupEle !== void 0 && popupEle.contains(event.target)) {
           triggerOpen(true, mouseEnterDelay);
         }
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "1.18.1",
+  "version": "1.18.3",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"
@@ -41,10 +41,11 @@
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^1.0.0",
-    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/jest-dom": "^6.1.4",
     "@testing-library/react": "^14.0.0",
     "@types/classnames": "^2.2.10",
     "@types/jest": "^29.5.2",
+    "@types/node": "^20.11.6",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.11",
     "@umijs/fabric": "^4.0.1",
@@ -52,12 +53,12 @@
     "dumi": "^2.1.0",
     "eslint": "^8.51.0",
     "father": "^4.0.0",
-    "less": "^3.10.3",
-    "np": "^8.0.4",
+    "less": "^4.2.0",
+    "np": "^9.0.0",
     "rc-test": "^7.0.13",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "regenerator-runtime": "^0.13.7",
+    "regenerator-runtime": "^0.14.0",
     "typescript": "^5.1.6"
   },
   "dependencies": {