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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/Portal.js CHANGED
@@ -39,9 +39,8 @@ export default function Portal(props) {
39
39
  var _React$useState = React.useState(open),
40
40
  _React$useState2 = _slicedToArray(_React$useState, 2),
41
41
  mergedRender = _React$useState2[0],
42
- setMergedRender = _React$useState2[1];
42
+ setMergedRender = _React$useState2[1]; // ====================== Should Render ======================
43
43
 
44
- useScrollLocker(autoLock && open); // ====================== Should Render ======================
45
44
 
46
45
  React.useEffect(function () {
47
46
  if (autoDestroy || open) {
@@ -67,7 +66,9 @@ export default function Portal(props) {
67
66
  defaultContainer = _useDom2[0],
68
67
  queueCreate = _useDom2[1];
69
68
 
70
- var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Render ==========================
69
+ var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Locker ==========================
70
+
71
+ useScrollLocker(autoLock && open && canUseDom() && (mergedContainer === defaultContainer || mergedContainer === document.body)); // ========================= Render ==========================
71
72
  // Do not render when nothing need render
72
73
  // When innerContainer is `undefined`, it may not ready since user use ref in the same render
73
74
 
package/lib/Portal.js CHANGED
@@ -57,9 +57,8 @@ function Portal(props) {
57
57
  var _React$useState = React.useState(open),
58
58
  _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
59
59
  mergedRender = _React$useState2[0],
60
- setMergedRender = _React$useState2[1];
60
+ setMergedRender = _React$useState2[1]; // ====================== Should Render ======================
61
61
 
62
- (0, _useScrollLocker.default)(autoLock && open); // ====================== Should Render ======================
63
62
 
64
63
  React.useEffect(function () {
65
64
  if (autoDestroy || open) {
@@ -85,7 +84,9 @@ function Portal(props) {
85
84
  defaultContainer = _useDom2[0],
86
85
  queueCreate = _useDom2[1];
87
86
 
88
- var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Render ==========================
87
+ var mergedContainer = innerContainer !== null && innerContainer !== void 0 ? innerContainer : defaultContainer; // ========================= Locker ==========================
88
+
89
+ (0, _useScrollLocker.default)(autoLock && open && (0, _canUseDom.default)() && (mergedContainer === defaultContainer || mergedContainer === document.body)); // ========================= Render ==========================
89
90
  // Do not render when nothing need render
90
91
  // When innerContainer is `undefined`, it may not ready since user use ref in the same render
91
92
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rc-component/portal",
3
- "version": "1.0.0-8",
3
+ "version": "1.0.0-9",
4
4
  "description": "React Portal Component",
5
5
  "keywords": [
6
6
  "react",