@rc-component/trigger 1.5.5 → 1.5.7

package/es/hooks/useAlign.js

@@ -1,5 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { isDOM } from "rc-util/es/Dom/findDOMNode";
 import isVisible from "rc-util/es/Dom/isVisible";
 import useEvent from "rc-util/es/hooks/useEvent";
 import useLayoutEffect from "rc-util/es/hooks/useLayoutEffect";
@@ -86,7 +87,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       var win = getWin(popupElement);
 
       // Placement
-      var placementInfo = builtinPlacements[placement] || popupAlign || {};
+      var placementInfo = _objectSpread(_objectSpread({}, builtinPlacements[placement]), popupAlign);
 
       // Reset first
       popupElement.style.left = '0';
@@ -141,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,
@@ -167,7 +171,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       var _scaleY = toNum(Math.round(popupHeight / parseFloat(height) * 1000) / 1000);
 
       // No need to align since it's not visible in view
-      if (_scaleX === 0 || _scaleY === 0 || target instanceof HTMLElement && !isVisible(target)) {
+      if (_scaleX === 0 || _scaleY === 0 || isDOM(target) && !isVisible(target)) {
         return;
       }
 

package/es/index.js

@@ -8,6 +8,7 @@ import ResizeObserver from 'rc-resize-observer';
 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,7 +87,7 @@ export function generateTrigger() {
       popupEle = _React$useState2[0],
       setPopupEle = _React$useState2[1];
     var setPopupRef = React.useCallback(function (node) {
-      if (node instanceof HTMLElement) {
+      if (isDOM(node)) {
         setPopupEle(node);
       }
       parentContext === null || parentContext === void 0 ? void 0 : parentContext.registerSubPopup(id, node);
@@ -99,7 +100,7 @@ export function generateTrigger() {
       targetEle = _React$useState4[0],
       setTargetEle = _React$useState4[1];
     var setTargetRef = React.useCallback(function (node) {
-      if (node instanceof HTMLElement) {
+      if (isDOM(node)) {
         setTargetEle(node);
       }
     }, []);

package/lib/hooks/useAlign.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = useAlign;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _findDOMNode = require("rc-util/lib/Dom/findDOMNode");
 var _isVisible = _interopRequireDefault(require("rc-util/lib/Dom/isVisible"));
 var _useEvent = _interopRequireDefault(require("rc-util/lib/hooks/useEvent"));
 var _useLayoutEffect = _interopRequireDefault(require("rc-util/lib/hooks/useLayoutEffect"));
@@ -94,7 +95,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       var win = (0, _util.getWin)(popupElement);
 
       // Placement
-      var placementInfo = builtinPlacements[placement] || popupAlign || {};
+      var placementInfo = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, builtinPlacements[placement]), popupAlign);
 
       // Reset first
       popupElement.style.left = '0';
@@ -149,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,
@@ -175,7 +179,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       var _scaleY = toNum(Math.round(popupHeight / parseFloat(height) * 1000) / 1000);
 
       // No need to align since it's not visible in view
-      if (_scaleX === 0 || _scaleY === 0 || target instanceof HTMLElement && !(0, _isVisible.default)(target)) {
+      if (_scaleX === 0 || _scaleY === 0 || (0, _findDOMNode.isDOM)(target) && !(0, _isVisible.default)(target)) {
         return;
       }
 

package/lib/index.js

@@ -16,6 +16,7 @@ var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
 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,7 +96,7 @@ function generateTrigger() {
       popupEle = _React$useState2[0],
       setPopupEle = _React$useState2[1];
     var setPopupRef = React.useCallback(function (node) {
-      if (node instanceof HTMLElement) {
+      if ((0, _findDOMNode.isDOM)(node)) {
         setPopupEle(node);
       }
       parentContext === null || parentContext === void 0 ? void 0 : parentContext.registerSubPopup(id, node);
@@ -108,7 +109,7 @@ function generateTrigger() {
       targetEle = _React$useState4[0],
       setTargetEle = _React$useState4[1];
     var setTargetRef = React.useCallback(function (node) {
-      if (node instanceof HTMLElement) {
+      if ((0, _findDOMNode.isDOM)(node)) {
         setTargetEle(node);
       }
     }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"
@@ -66,7 +66,7 @@
     "rc-align": "^4.0.0",
     "rc-motion": "^2.0.0",
     "rc-resize-observer": "^1.3.1",
-    "rc-util": "^5.27.1"
+    "rc-util": "^5.29.2"
   },
   "peerDependencies": {
     "react": ">=16.9.0",