@rc-component/portal 1.0.0-7 → 1.0.0-9

package/es/Portal.js

@@ -39,9 +39,8 @@ export default function Portal(props) {
   var _React$useState = React.useState(open),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       mergedRender = _React$useState2[0],
-      setMergedRender = _React$useState2[1];
+      setMergedRender = _React$useState2[1]; // ====================== Should Render ======================
 
-  useScrollLocker(autoLock && open); // ====================== Should Render ======================
 
   React.useEffect(function () {
     if (autoDestroy || open) {
@@ -67,7 +66,9 @@ export default function Portal(props) {
       defaultContainer = _useDom2[0],
       queueCreate = _useDom2[1];
 
-  var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Render ==========================
+  var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Locker ==========================
+
+  useScrollLocker(autoLock && open && canUseDom() && (mergedContainer === defaultContainer || mergedContainer === document.body)); // ========================= Render ==========================
   // Do not render when nothing need render
   // When innerContainer is `undefined`, it may not ready since user use ref in the same render
 

package/es/useDom.js

@@ -2,6 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import * as React from 'react';
 import useLayoutEffect from "rc-util/es/hooks/useLayoutEffect";
+import canUseDom from "rc-util/es/Dom/canUseDom";
 import OrderContext from "./Context";
 var EMPTY_LIST = [];
 /**
@@ -11,6 +12,10 @@ var EMPTY_LIST = [];
 
 export default function useDom(render, debug) {
   var _React$useState = React.useState(function () {
+    if (!canUseDom()) {
+      return null;
+    }
+
     var defaultEle = document.createElement('div');
 
     if (process.env.NODE_ENV !== 'production' && debug) {

package/lib/Portal.js

@@ -57,9 +57,8 @@ function Portal(props) {
   var _React$useState = React.useState(open),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       mergedRender = _React$useState2[0],
-      setMergedRender = _React$useState2[1];
+      setMergedRender = _React$useState2[1]; // ====================== Should Render ======================
 
-  (0, _useScrollLocker.default)(autoLock && open); // ====================== Should Render ======================
 
   React.useEffect(function () {
     if (autoDestroy || open) {
@@ -85,7 +84,9 @@ function Portal(props) {
       defaultContainer = _useDom2[0],
       queueCreate = _useDom2[1];
 
-  var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Render ==========================
+  var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Locker ==========================
+
+  (0, _useScrollLocker.default)(autoLock && open && (0, _canUseDom.default)() && (mergedContainer === defaultContainer || mergedContainer === document.body)); // ========================= Render ==========================
   // Do not render when nothing need render
   // When innerContainer is `undefined`, it may not ready since user use ref in the same render
 

package/lib/useDom.js

@@ -17,6 +17,8 @@ var React = _interopRequireWildcard(require("react"));
 
 var _useLayoutEffect = _interopRequireDefault(require("rc-util/lib/hooks/useLayoutEffect"));
 
+var _canUseDom = _interopRequireDefault(require("rc-util/lib/Dom/canUseDom"));
+
 var _Context = _interopRequireDefault(require("./Context"));
 
 var EMPTY_LIST = [];
@@ -27,6 +29,10 @@ var EMPTY_LIST = [];
 
 function useDom(render, debug) {
   var _React$useState = React.useState(function () {
+    if (!(0, _canUseDom.default)()) {
+      return null;
+    }
+
     var defaultEle = document.createElement('div');
 
     if (process.env.NODE_ENV !== 'production' && debug) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/portal",
-  "version": "1.0.0-7",
+  "version": "1.0.0-9",
   "description": "React Portal Component",
   "keywords": [
     "react",
@@ -36,8 +36,10 @@
     "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish",
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
     "start": "dumi dev",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
+    "test": "npm run test:client && npm run test:server",
+    "test:client": "umi-test --testPathIgnorePatterns=ssr.test.tsx --testPathIgnorePatterns=ssr.test.tsx",
+    "test:coverage": "npm run test:client --coverage",
+    "test:server": "umi-test --env=node tests/ssr.test.tsx",
     "watch": "father dev"
   },
   "dependencies": {