@rc-component/trigger 1.3.0 → 1.3.2

package/es/Popup/ServerPortal.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+/**
+ * Portal will not work in SSR. We need wrap this to not to break.
+ */
+export default function ServerPortal(): React.ReactElement;

package/es/Popup/ServerPortal.js

@@ -0,0 +1,6 @@
+/**
+ * Portal will not work in SSR. We need wrap this to not to break.
+ */
+export default function ServerPortal() {
+  return null;
+}

package/es/Popup/index.js

@@ -5,9 +5,11 @@ import classNames from 'classnames';
 import CSSMotion from 'rc-motion';
 import ResizeObserver from 'rc-resize-observer';
 import useLayoutEffect from "rc-util/es/hooks/useLayoutEffect";
+import canUseDom from "rc-util/es/Dom/canUseDom";
 import * as React from 'react';
 import Arrow from "./Arrow";
 import Mask from "./Mask";
+import ServerPortal from "./ServerPortal";
 var Popup = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var popup = props.popup,
     className = props.className,
@@ -28,7 +30,7 @@ var Popup = /*#__PURE__*/React.forwardRef(function (props, ref) {
     forceRender = props.forceRender,
     getPopupContainer = props.getPopupContainer,
     autoDestroy = props.autoDestroy,
-    Portal = props.portal,
+    portal = props.portal,
     zIndex = props.zIndex,
     onMouseEnter = props.onMouseEnter,
     onMouseLeave = props.onMouseLeave,
@@ -90,6 +92,7 @@ var Popup = /*#__PURE__*/React.forwardRef(function (props, ref) {
   if (!open) {
     miscStyle.pointerEvents = 'none';
   }
+  var Portal = canUseDom() ? portal : ServerPortal;
   return /*#__PURE__*/React.createElement(Portal, {
     open: forceRender || isNodeVisible,
     getContainer: getPopupContainer && function () {

package/es/hooks/useAlign.js

@@ -197,11 +197,17 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
         adjustY = overflow.adjustY,
         shiftX = overflow.shiftX,
         shiftY = overflow.shiftY;
+      var supportAdjust = function supportAdjust(val) {
+        if (typeof val === 'boolean') {
+          return val;
+        }
+        return val >= 0;
+      };
 
       // >>>>>>>>>> Top & Bottom
       var nextPopupY = popupRect.y + nextOffsetY;
       var nextPopupBottom = nextPopupY + popupHeight;
-      var needAdjustY = adjustY === true || adjustY >= 0;
+      var needAdjustY = supportAdjust(adjustY);
 
       // Bottom to Top
       if (needAdjustY && popupPoints[0] === 't' && nextPopupBottom > visibleArea.bottom) {
@@ -218,7 +224,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       // >>>>>>>>>> Left & Right
       var nextPopupX = popupRect.x + nextOffsetX;
       var nextPopupRight = nextPopupX + popupWidth;
-      var needAdjustX = adjustX === true || adjustX >= 0;
+      var needAdjustX = supportAdjust(adjustX);
 
       // >>>>> Flip
       // Right to Left

package/lib/Popup/ServerPortal.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+/**
+ * Portal will not work in SSR. We need wrap this to not to break.
+ */
+export default function ServerPortal(): React.ReactElement;

package/lib/Popup/ServerPortal.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = ServerPortal;
+/**
+ * Portal will not work in SSR. We need wrap this to not to break.
+ */
+function ServerPortal() {
+  return null;
+}

package/lib/Popup/index.js

@@ -13,9 +13,11 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _rcMotion = _interopRequireDefault(require("rc-motion"));
 var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
 var _useLayoutEffect = _interopRequireDefault(require("rc-util/lib/hooks/useLayoutEffect"));
+var _canUseDom = _interopRequireDefault(require("rc-util/lib/Dom/canUseDom"));
 var React = _interopRequireWildcard(require("react"));
 var _Arrow = _interopRequireDefault(require("./Arrow"));
 var _Mask = _interopRequireDefault(require("./Mask"));
+var _ServerPortal = _interopRequireDefault(require("./ServerPortal"));
 var Popup = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var popup = props.popup,
     className = props.className,
@@ -36,7 +38,7 @@ var Popup = /*#__PURE__*/React.forwardRef(function (props, ref) {
     forceRender = props.forceRender,
     getPopupContainer = props.getPopupContainer,
     autoDestroy = props.autoDestroy,
-    Portal = props.portal,
+    portal = props.portal,
     zIndex = props.zIndex,
     onMouseEnter = props.onMouseEnter,
     onMouseLeave = props.onMouseLeave,
@@ -98,6 +100,7 @@ var Popup = /*#__PURE__*/React.forwardRef(function (props, ref) {
   if (!open) {
     miscStyle.pointerEvents = 'none';
   }
+  var Portal = (0, _canUseDom.default)() ? portal : _ServerPortal.default;
   return /*#__PURE__*/React.createElement(Portal, {
     open: forceRender || isNodeVisible,
     getContainer: getPopupContainer && function () {

package/lib/hooks/useAlign.js

@@ -205,11 +205,17 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
         adjustY = overflow.adjustY,
         shiftX = overflow.shiftX,
         shiftY = overflow.shiftY;
+      var supportAdjust = function supportAdjust(val) {
+        if (typeof val === 'boolean') {
+          return val;
+        }
+        return val >= 0;
+      };
 
       // >>>>>>>>>> Top & Bottom
       var nextPopupY = popupRect.y + nextOffsetY;
       var nextPopupBottom = nextPopupY + popupHeight;
-      var needAdjustY = adjustY === true || adjustY >= 0;
+      var needAdjustY = supportAdjust(adjustY);
 
       // Bottom to Top
       if (needAdjustY && popupPoints[0] === 't' && nextPopupBottom > visibleArea.bottom) {
@@ -226,7 +232,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       // >>>>>>>>>> Left & Right
       var nextPopupX = popupRect.x + nextOffsetX;
       var nextPopupRight = nextPopupX + popupWidth;
-      var needAdjustX = adjustX === true || adjustX >= 0;
+      var needAdjustX = supportAdjust(adjustX);
 
       // >>>>> Flip
       // Right to Left

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"
@@ -45,8 +45,8 @@
     "@testing-library/react": "^13.0.0",
     "@types/classnames": "^2.2.10",
     "@types/jest": "^26.0.15",
-    "@types/react": "^16.8.19",
-    "@types/react-dom": "^16.8.4",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
     "cross-env": "^7.0.1",
     "dumi": "^2.1.0",
     "eslint": "^7.0.0",