@rc-component/trigger 1.5.6 → 1.5.8

package/es/hooks/useAlign.js

@@ -142,6 +142,9 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
         bottom: clientHeight
       };
       (scrollerList || []).forEach(function (ele) {
+        if (ele instanceof HTMLBodyElement) {
+          return;
+        }
         var eleRect = ele.getBoundingClientRect();
         var eleOutHeight = ele.offsetHeight,
           eleInnerHeight = ele.clientHeight,

package/es/index.js

@@ -5,10 +5,10 @@ var _excluded = ["prefixCls", "children", "action", "showAction", "hideAction",
 import Portal from '@rc-component/portal';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
+import { isDOM } from "rc-util/es/Dom/findDOMNode";
 import useEvent from "rc-util/es/hooks/useEvent";
 import useId from "rc-util/es/hooks/useId";
 import useLayoutEffect from "rc-util/es/hooks/useLayoutEffect";
-import { isDOM } from "rc-util/es/Dom/findDOMNode";
 import * as React from 'react';
 import TriggerContext from "./context";
 import useAction from "./hooks/useAction";
@@ -86,12 +86,12 @@ export function generateTrigger() {
       _React$useState2 = _slicedToArray(_React$useState, 2),
       popupEle = _React$useState2[0],
       setPopupEle = _React$useState2[1];
-    var setPopupRef = React.useCallback(function (node) {
-      if (isDOM(node)) {
+    var setPopupRef = useEvent(function (node) {
+      if (isDOM(node) && popupEle !== node) {
         setPopupEle(node);
       }
       parentContext === null || parentContext === void 0 ? void 0 : parentContext.registerSubPopup(id, node);
-    }, []);
+    });
 
     // =========================== Target ===========================
     // Use state to control here since `useRef` update not trigger render
@@ -99,11 +99,11 @@ export function generateTrigger() {
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       targetEle = _React$useState4[0],
       setTargetEle = _React$useState4[1];
-    var setTargetRef = React.useCallback(function (node) {
-      if (isDOM(node)) {
+    var setTargetRef = useEvent(function (node) {
+      if (isDOM(node) && targetEle !== node) {
         setTargetEle(node);
       }
-    }, []);
+    });
 
     // ========================== Children ==========================
     var child = React.Children.only(children);

package/lib/hooks/useAlign.js

@@ -150,6 +150,9 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
         bottom: clientHeight
       };
       (scrollerList || []).forEach(function (ele) {
+        if (ele instanceof HTMLBodyElement) {
+          return;
+        }
         var eleRect = ele.getBoundingClientRect();
         var eleOutHeight = ele.offsetHeight,
           eleInnerHeight = ele.clientHeight,

package/lib/index.js

@@ -13,10 +13,10 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _portal = _interopRequireDefault(require("@rc-component/portal"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
+var _findDOMNode = require("rc-util/lib/Dom/findDOMNode");
 var _useEvent = _interopRequireDefault(require("rc-util/lib/hooks/useEvent"));
 var _useId = _interopRequireDefault(require("rc-util/lib/hooks/useId"));
 var _useLayoutEffect = _interopRequireDefault(require("rc-util/lib/hooks/useLayoutEffect"));
-var _findDOMNode = require("rc-util/lib/Dom/findDOMNode");
 var React = _interopRequireWildcard(require("react"));
 var _context = _interopRequireDefault(require("./context"));
 var _useAction3 = _interopRequireDefault(require("./hooks/useAction"));
@@ -95,12 +95,12 @@ function generateTrigger() {
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       popupEle = _React$useState2[0],
       setPopupEle = _React$useState2[1];
-    var setPopupRef = React.useCallback(function (node) {
-      if ((0, _findDOMNode.isDOM)(node)) {
+    var setPopupRef = (0, _useEvent.default)(function (node) {
+      if ((0, _findDOMNode.isDOM)(node) && popupEle !== node) {
         setPopupEle(node);
       }
       parentContext === null || parentContext === void 0 ? void 0 : parentContext.registerSubPopup(id, node);
-    }, []);
+    });
 
     // =========================== Target ===========================
     // Use state to control here since `useRef` update not trigger render
@@ -108,11 +108,11 @@ function generateTrigger() {
       _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
       targetEle = _React$useState4[0],
       setTargetEle = _React$useState4[1];
-    var setTargetRef = React.useCallback(function (node) {
-      if ((0, _findDOMNode.isDOM)(node)) {
+    var setTargetRef = (0, _useEvent.default)(function (node) {
+      if ((0, _findDOMNode.isDOM)(node) && targetEle !== node) {
         setTargetEle(node);
       }
-    }, []);
+    });
 
     // ========================== Children ==========================
     var child = React.Children.only(children);

package/package.json

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