@rc-component/trigger 1.18.0 → 1.18.2

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

@@ -12,7 +12,6 @@ import useId from "rc-util/es/hooks/useId";
 import useLayoutEffect from "rc-util/es/hooks/useLayoutEffect";
 import isMobile from "rc-util/es/isMobile";
 import * as React from 'react';
-import { flushSync } from 'react-dom';
 import Popup from "./Popup";
 import TriggerWrapper from "./TriggerWrapper";
 import TriggerContext from "./context";
@@ -164,15 +163,19 @@ export function generateTrigger() {
     }, [popupVisible]);
     var openRef = React.useRef(mergedOpen);
     openRef.current = mergedOpen;
+    var lastTriggerRef = React.useRef([]);
+    lastTriggerRef.current = [];
     var internalTriggerOpen = useEvent(function (nextOpen) {
+      var _lastTriggerRef$curre;
+      setMergedOpen(nextOpen);
+
       // Enter or Pointer will both trigger open state change
       // We only need take one to avoid duplicated change event trigger
-      flushSync(function () {
-        if (mergedOpen !== nextOpen) {
-          setMergedOpen(nextOpen);
-          onPopupVisibleChange === null || onPopupVisibleChange === void 0 || onPopupVisibleChange(nextOpen);
-        }
-      });
+      // Use `lastTriggerRef` to record last open type
+      if (((_lastTriggerRef$curre = lastTriggerRef.current[lastTriggerRef.current.length - 1]) !== null && _lastTriggerRef$curre !== void 0 ? _lastTriggerRef$curre : mergedOpen) !== nextOpen) {
+        lastTriggerRef.current.push(nextOpen);
+        onPopupVisibleChange === null || onPopupVisibleChange === void 0 || onPopupVisibleChange(nextOpen);
+      }
     });
 
     // Trigger for delay

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

@@ -20,7 +20,6 @@ var _useId = _interopRequireDefault(require("rc-util/lib/hooks/useId"));
 var _useLayoutEffect = _interopRequireDefault(require("rc-util/lib/hooks/useLayoutEffect"));
 var _isMobile = _interopRequireDefault(require("rc-util/lib/isMobile"));
 var React = _interopRequireWildcard(require("react"));
-var _reactDom = require("react-dom");
 var _Popup = _interopRequireDefault(require("./Popup"));
 var _TriggerWrapper = _interopRequireDefault(require("./TriggerWrapper"));
 var _context = _interopRequireDefault(require("./context"));
@@ -174,15 +173,19 @@ function generateTrigger() {
     }, [popupVisible]);
     var openRef = React.useRef(mergedOpen);
     openRef.current = mergedOpen;
+    var lastTriggerRef = React.useRef([]);
+    lastTriggerRef.current = [];
     var internalTriggerOpen = (0, _useEvent.default)(function (nextOpen) {
+      var _lastTriggerRef$curre;
+      setMergedOpen(nextOpen);
+
       // Enter or Pointer will both trigger open state change
       // We only need take one to avoid duplicated change event trigger
-      (0, _reactDom.flushSync)(function () {
-        if (mergedOpen !== nextOpen) {
-          setMergedOpen(nextOpen);
-          onPopupVisibleChange === null || onPopupVisibleChange === void 0 || onPopupVisibleChange(nextOpen);
-        }
-      });
+      // Use `lastTriggerRef` to record last open type
+      if (((_lastTriggerRef$curre = lastTriggerRef.current[lastTriggerRef.current.length - 1]) !== null && _lastTriggerRef$curre !== void 0 ? _lastTriggerRef$curre : mergedOpen) !== nextOpen) {
+        lastTriggerRef.current.push(nextOpen);
+        onPopupVisibleChange === null || onPopupVisibleChange === void 0 || onPopupVisibleChange(nextOpen);
+      }
     });
 
     // Trigger for delay

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"