@salutejs/plasma-new-hope 0.158.0-dev.0 → 0.158.1-canary.1412.11141453905.0

package/styled-components/cjs/components/Popup/Popup.js

@@ -6,14 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.popupRoot = exports.popupConfig = exports.handlePosition = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
+var _reactDom = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("react-dom"));
 var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
 var _utils = /*#__PURE__*/require("../../utils");
 var _Portal = /*#__PURE__*/require("../Portal");
-var _PopupContext = /*#__PURE__*/require("./PopupContext");
 var _PopupRoot = /*#__PURE__*/require("./PopupRoot");
 var _hooks = /*#__PURE__*/require("./hooks");
 var _Popup = /*#__PURE__*/require("./Popup.tokens");
+var _Popup2 = /*#__PURE__*/require("./Popup.styles");
 var _excluded = ["id", "isOpen", "opened", "placement", "offset", "frame", "children", "overlay", "role", "zIndex", "popupInfo", "withAnimation", "className"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -48,8 +50,8 @@ var handlePosition = exports.handlePosition = function handlePosition(placement,
   var bottom;
   var transform;
   var placements = placement.split('-');
-  placements.forEach(function (placement) {
-    switch (placement) {
+  placements.forEach(function (placementValue) {
+    switch (placementValue) {
       case 'left':
         left = x;
         break;
@@ -84,7 +86,7 @@ var handlePosition = exports.handlePosition = function handlePosition(placement,
 };
 
 /**
- * Базовый копмонент Popup.
+ * Базовый компонент Popup.
  */
 var popupRoot = exports.popupRoot = function popupRoot(Root) {
   return /*#__PURE__*/(0, _react.forwardRef)(function (_ref, outerRootRef) {
@@ -114,63 +116,49 @@ var popupRoot = exports.popupRoot = function popupRoot(Root) {
     var _usePopup = (0, _hooks.usePopup)({
         isOpen: innerIsOpen,
         id: innerId,
+        isGlobalPopup: !frame || frame === 'document',
         popupInfo: popupInfo,
         withAnimation: withAnimation
       }),
       isVisible = _usePopup.isVisible,
       animationInfo = _usePopup.animationInfo,
-      setVisible = _usePopup.setVisible;
+      setVisible = _usePopup.setVisible,
+      rootId = _usePopup.rootId;
     var portalRef = (0, _react.useRef)(null);
     var contentRef = (0, _react.useRef)(null);
     var innerRef = (0, _plasmaCore.useForkRef)(contentRef, outerRootRef);
-    var _useState = (0, _react.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      forceRender = _useState2[1];
-    (0, _react.useEffect)(function () {
-      var portal = document.getElementById(_PopupContext.POPUP_PORTAL_ID);
-      if (typeof frame !== 'string' && frame && frame.current) {
-        portal = frame.current;
-      }
-      if (!portal) {
-        portal = document.createElement('div');
-        portal.setAttribute('id', _PopupContext.POPUP_PORTAL_ID);
-        /**
-         * Нужно для того, чтобы во фрейме не происходило скачков контента
-         * при анимации через transform, если есть элемент с шириной/высотой в 100% (Overlay)
-         */
-        portal.style.width = '0';
-        if (typeof frame === 'string' && frame !== 'document') {
-          var _document$getElementB;
-          (_document$getElementB = document.getElementById(frame)) === null || _document$getElementB === void 0 || _document$getElementB.appendChild(portal);
-        } else {
-          document.body.appendChild(portal);
-        }
-      }
-      portalRef.current = portal;
-
-      /**
-       * Изменение стейта нужно для того, чтобы Popup
-       * отобразился после записи DOM элемента в portalRef.current
-       */
-      forceRender(true);
-    }, []);
     if (!isVisible && !innerIsOpen) {
       return null;
     }
     var cls = (0, _utils.cx)(className, animationInfo !== null && animationInfo !== void 0 && animationInfo.endAnimation ? _Popup.classes.endAnimation : '', animationInfo !== null && animationInfo !== void 0 && animationInfo.endTransition ? _Popup.classes.endTransition : '');
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, portalRef.current && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
-      container: portalRef.current
-    }, /*#__PURE__*/_react["default"].createElement(Root, _extends({
+    var rootNode = /*#__PURE__*/_react["default"].createElement(Root, _extends({
       className: cls
     }, rest), overlay, /*#__PURE__*/_react["default"].createElement(_PopupRoot.PopupRoot, {
       id: innerId,
       ref: innerRef,
       position: handlePosition(placement, offset),
-      frame: frame,
       zIndex: zIndex,
       animationInfo: animationInfo,
       setVisible: setVisible
-    }, children))));
+    }, children));
+    if (typeof frame !== 'string' && frame && frame.current) {
+      return /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
+        container: frame.current
+      }, rootNode);
+    }
+    var withFrameId = typeof frame === 'string' && frame !== 'document';
+    var containerElement = withFrameId && document.getElementById(frame);
+    if (containerElement) {
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_reactDom["default"].createPortal( /*#__PURE__*/_react["default"].createElement(_Popup2.StyledPortalContainer, {
+        ref: portalRef
+      }, portalRef.current && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
+        container: portalRef.current
+      }, rootNode)), containerElement));
+    }
+    var globalPortal = _utils.canUseDOM && document.getElementById(rootId);
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, globalPortal && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
+      container: globalPortal
+    }, rootNode));
   });
 };
 var popupConfig = exports.popupConfig = {

package/styled-components/cjs/components/Popup/Popup.styles.js

@@ -3,34 +3,43 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.StyledPortal = exports.PopupView = exports.PopupRootContainer = void 0;
+exports.StyledPortalContainer = exports.StyledPortal = exports.PopupView = exports.PopupRootContainer = void 0;
 var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
 var _utils = /*#__PURE__*/require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var StyledPortal = exports.StyledPortal = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-rkhnjn-0"
-})([""]);
-var PopupView = exports.PopupView = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+})(["position:fixed;top:0;left:0;right:0;bottom:0;z-index:", ";width:", ";pointer-events:", ";"], _utils.DEFAULT_Z_INDEX, function (_ref) {
+  var hasContent = _ref.hasContent;
+  return hasContent ? 'auto' : '0';
+}, function (_ref2) {
+  var hasContent = _ref2.hasContent;
+  return hasContent ? 'auto' : 'none';
+});
+var StyledPortalContainer = exports.StyledPortalContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-rkhnjn-1"
+})(["width:0;"]);
+var PopupView = exports.PopupView = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  componentId: "plasma-new-hope__sc-rkhnjn-2"
 })(["position:relative;max-width:100%;pointer-events:all;"]);
 var PopupRootContainer = exports.PopupRootContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-rkhnjn-2"
-})(["position:absolute;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref) {
-  var zIndex = _ref.zIndex;
+  componentId: "plasma-new-hope__sc-rkhnjn-3"
+})(["position:absolute;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref3) {
+  var zIndex = _ref3.zIndex;
   return zIndex || _utils.DEFAULT_Z_INDEX;
-}, function (_ref2) {
-  var position = _ref2.position;
-  return position.left || '';
-}, function (_ref3) {
-  var position = _ref3.position;
-  return position.right || '';
 }, function (_ref4) {
   var position = _ref4.position;
-  return position.top || '';
+  return position.left || '';
 }, function (_ref5) {
   var position = _ref5.position;
-  return position.bottom || '';
+  return position.right || '';
 }, function (_ref6) {
   var position = _ref6.position;
+  return position.top || '';
+}, function (_ref7) {
+  var position = _ref7.position;
+  return position.bottom || '';
+}, function (_ref8) {
+  var position = _ref8.position;
   return position.transform || '';
 });

package/styled-components/cjs/components/Popup/PopupContext.js

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.usePopupContext = exports.PopupProvider = exports.POPUP_PORTAL_ID = void 0;
 var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
+var _reactDom = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("react-dom"));
 var _ModalContext = /*#__PURE__*/require("../Modal/ModalContext");
+var _utils = /*#__PURE__*/require("../../utils");
+var _Popup = /*#__PURE__*/require("./Popup.styles");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -23,9 +27,12 @@ var POPUP_PORTAL_ID = exports.POPUP_PORTAL_ID = 'plasma-popup-root';
 var items = [];
 var PopupContext = /*#__PURE__*/(0, _react.createContext)({
   items: items,
+  rootId: POPUP_PORTAL_ID,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   register: function register(_info) {
     throw new Error('Function not implemented. Add PopupProvider');
   },
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   unregister: function unregister(_id) {
     throw new Error('Function not implemented. Add PopupProvider');
   }
@@ -35,29 +42,46 @@ var usePopupContext = exports.usePopupContext = function usePopupContext() {
 };
 var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
   var children = _ref.children;
-  var prevBodyOverflowY = (0, _react.useRef)(typeof document !== 'undefined' ? document.body.style.overflowY : '');
+  var globalItemsCount = (0, _react.useRef)(0);
+  var prevBodyOverflowY = (0, _react.useRef)(_utils.canUseDOM ? document.body.style.overflowY : '');
+  // eslint-disable-next-line no-shadow
   var _useState = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
     setItems = _useState2[1];
+  var uuid = (0, _utils.safeUseId)();
+  var rootId = "".concat(POPUP_PORTAL_ID, "-").concat(uuid);
   var register = function register(info) {
+    if (!_utils.canUseDOM) {
+      return;
+    }
     setItems(function (prevItems) {
       var _info$info;
       if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !(0, _ModalContext.hasModals)(prevItems)) {
         prevBodyOverflowY.current = document.body.style.overflowY;
         document.body.style.overflowY = 'hidden';
       }
+      if (info.isGlobalPopup) {
+        globalItemsCount.current += 1;
+      }
       return [].concat(_toConsumableArray(prevItems), [info]);
     });
   };
   var unregister = function unregister(id) {
+    if (!_utils.canUseDOM) {
+      return;
+    }
     setItems(function (prevItems) {
+      var _prevItems$index;
       var index = prevItems.findIndex(function (item) {
         return id === item.id;
       });
       if (index === -1) {
         return prevItems;
       }
+      if (prevItems !== null && prevItems !== void 0 && (_prevItems$index = prevItems[index]) !== null && _prevItems$index !== void 0 && _prevItems$index.isGlobalPopup) {
+        globalItemsCount.current -= 1;
+      }
       var prevHasModals = (0, _ModalContext.hasModals)(prevItems);
       prevItems.splice(index, 1);
       if (prevHasModals && !(0, _ModalContext.hasModals)(prevItems)) {
@@ -70,18 +94,14 @@ var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
   };
   var context = {
     items: items,
+    rootId: rootId,
     register: register,
     unregister: unregister
   };
-  (0, _react.useEffect)(function () {
-    return function () {
-      var portal = document.createElement('div');
-      if (portal && document.body.contains(portal)) {
-        document.body.removeChild(portal);
-      }
-    };
-  }, []);
   return /*#__PURE__*/_react["default"].createElement(PopupContext.Provider, {
     value: context
-  }, children);
+  }, children, /*#__PURE__*/_reactDom["default"].createPortal( /*#__PURE__*/_react["default"].createElement(_Popup.StyledPortal, {
+    id: rootId,
+    hasContent: globalItemsCount.current > 0
+  }), document.body));
 };

package/styled-components/cjs/components/Popup/PopupRoot.js

@@ -10,7 +10,7 @@ var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
 var _PopupContext = /*#__PURE__*/require("./PopupContext");
 var _Popup = /*#__PURE__*/require("./Popup.styles");
 var _Popup2 = /*#__PURE__*/require("./Popup.tokens");
-var _excluded = ["id", "placement", "offset", "frame", "setVisible", "children", "role", "zIndex", "animationInfo", "className"];
+var _excluded = ["id", "placement", "offset", "setVisible", "children", "role", "zIndex", "animationInfo"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -24,13 +24,11 @@ var PopupRoot = exports.PopupRoot = /*#__PURE__*/(0, _react.forwardRef)(function
   var id = _ref.id,
     placement = _ref.placement,
     offset = _ref.offset,
-    frame = _ref.frame,
     setVisible = _ref.setVisible,
     children = _ref.children,
     role = _ref.role,
     zIndex = _ref.zIndex,
     animationInfo = _ref.animationInfo,
-    className = _ref.className,
     rest = _objectWithoutProperties(_ref, _excluded);
   var contentRef = (0, _react.useRef)(null);
   var innerRef = (0, _plasmaCore.useForkRef)(contentRef, ref);

package/styled-components/cjs/components/Popup/hooks/usePopup.js

@@ -18,7 +18,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-// Хук для поключения анимации
+// Хук для подключения анимации
 var usePopupAnimation = function usePopupAnimation() {
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -40,6 +40,7 @@ var usePopupAnimation = function usePopupAnimation() {
 var usePopup = exports.usePopup = function usePopup(_ref) {
   var isOpen = _ref.isOpen,
     id = _ref.id,
+    isGlobalPopup = _ref.isGlobalPopup,
     popupInfo = _ref.popupInfo,
     withAnimation = _ref.withAnimation;
   var _useState5 = (0, _react.useState)(false),
@@ -61,7 +62,8 @@ var usePopup = exports.usePopup = function usePopup(_ref) {
     // при первом открытии
     if (isOpen && !isVisible) {
       popupController.register(_objectSpread({
-        id: id
+        id: id,
+        isGlobalPopup: isGlobalPopup
       }, popupInfo));
       setVisible(true);
       animationInfo.setEndAnimation(false);
@@ -90,6 +92,7 @@ var usePopup = exports.usePopup = function usePopup(_ref) {
     isVisible: isVisible,
     setVisible: setVisible,
     animationInfo: animationInfo,
-    withAnimation: withAnimation
+    withAnimation: withAnimation,
+    rootId: popupController.rootId
   };
 };

package/styled-components/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx

@@ -14,6 +14,9 @@ import { Modal, modalClasses } from './Modal';
 export default {
     title: 'plasma_b2c/Modal',
     decorators: [WithTheme],
+    parameters: {
+        docs: { story: { inline: false, iframeHeight: '30rem' } },
+    },
     argTypes: {
         placement: {
             options: [

package/styled-components/cjs/examples/plasma_b2c/components/Popup/Popup.stories.tsx

@@ -12,6 +12,9 @@ import { Popup, popupClasses, PopupProvider } from './Popup';
 const meta: Meta<typeof Popup> = {
     title: 'plasma_b2c/Popup',
     decorators: [WithTheme],
+    parameters: {
+        docs: { story: { inline: false, iframeHeight: '30rem' } },
+    },
     argTypes: {
         placement: {
             options: [

package/styled-components/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx

@@ -14,6 +14,9 @@ import { Modal, modalClasses } from './Modal';
 export default {
     title: 'plasma_web/Modal',
     decorators: [WithTheme],
+    parameters: {
+        docs: { story: { inline: false, iframeHeight: '30rem' } },
+    },
     argTypes: {
         placement: {
             options: [

package/styled-components/cjs/examples/plasma_web/components/Popup/Popup.stories.tsx

@@ -12,6 +12,9 @@ import { Popup, popupClasses, PopupProvider } from './Popup';
 const meta: Meta<typeof Popup> = {
     title: 'plasma_web/Popup',
     decorators: [WithTheme],
+    parameters: {
+        docs: { story: { inline: false, iframeHeight: '30rem' } },
+    },
     argTypes: {
         placement: {
             options: [

package/styled-components/es/components/Popup/Popup.js

@@ -8,14 +8,15 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import React, { forwardRef, useRef } from 'react';
+import ReactDOM from 'react-dom';
 import { useForkRef, safeUseId } from '@salutejs/plasma-core';
-import { cx } from '../../utils';
+import { canUseDOM, cx } from '../../utils';
 import { Portal } from '../Portal';
-import { POPUP_PORTAL_ID } from './PopupContext';
 import { PopupRoot } from './PopupRoot';
 import { usePopup } from './hooks';
 import { classes } from './Popup.tokens';
+import { StyledPortalContainer } from './Popup.styles';
 export var handlePosition = function handlePosition(placement, offset) {
   var x = '0rem';
   var y = '0rem';
@@ -39,8 +40,8 @@ export var handlePosition = function handlePosition(placement, offset) {
   var bottom;
   var transform;
   var placements = placement.split('-');
-  placements.forEach(function (placement) {
-    switch (placement) {
+  placements.forEach(function (placementValue) {
+    switch (placementValue) {
       case 'left':
         left = x;
         break;
@@ -75,7 +76,7 @@ export var handlePosition = function handlePosition(placement, offset) {
 };
 
 /**
- * Базовый копмонент Popup.
+ * Базовый компонент Popup.
  */
 export var popupRoot = function popupRoot(Root) {
   return /*#__PURE__*/forwardRef(function (_ref, outerRootRef) {
@@ -105,63 +106,49 @@ export var popupRoot = function popupRoot(Root) {
     var _usePopup = usePopup({
         isOpen: innerIsOpen,
         id: innerId,
+        isGlobalPopup: !frame || frame === 'document',
         popupInfo: popupInfo,
         withAnimation: withAnimation
       }),
       isVisible = _usePopup.isVisible,
       animationInfo = _usePopup.animationInfo,
-      setVisible = _usePopup.setVisible;
+      setVisible = _usePopup.setVisible,
+      rootId = _usePopup.rootId;
     var portalRef = useRef(null);
     var contentRef = useRef(null);
     var innerRef = useForkRef(contentRef, outerRootRef);
-    var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      forceRender = _useState2[1];
-    useEffect(function () {
-      var portal = document.getElementById(POPUP_PORTAL_ID);
-      if (typeof frame !== 'string' && frame && frame.current) {
-        portal = frame.current;
-      }
-      if (!portal) {
-        portal = document.createElement('div');
-        portal.setAttribute('id', POPUP_PORTAL_ID);
-        /**
-         * Нужно для того, чтобы во фрейме не происходило скачков контента
-         * при анимации через transform, если есть элемент с шириной/высотой в 100% (Overlay)
-         */
-        portal.style.width = '0';
-        if (typeof frame === 'string' && frame !== 'document') {
-          var _document$getElementB;
-          (_document$getElementB = document.getElementById(frame)) === null || _document$getElementB === void 0 || _document$getElementB.appendChild(portal);
-        } else {
-          document.body.appendChild(portal);
-        }
-      }
-      portalRef.current = portal;
-
-      /**
-       * Изменение стейта нужно для того, чтобы Popup
-       * отобразился после записи DOM элемента в portalRef.current
-       */
-      forceRender(true);
-    }, []);
     if (!isVisible && !innerIsOpen) {
       return null;
     }
     var cls = cx(className, animationInfo !== null && animationInfo !== void 0 && animationInfo.endAnimation ? classes.endAnimation : '', animationInfo !== null && animationInfo !== void 0 && animationInfo.endTransition ? classes.endTransition : '');
-    return /*#__PURE__*/React.createElement(React.Fragment, null, portalRef.current && /*#__PURE__*/React.createElement(Portal, {
-      container: portalRef.current
-    }, /*#__PURE__*/React.createElement(Root, _extends({
+    var rootNode = /*#__PURE__*/React.createElement(Root, _extends({
       className: cls
     }, rest), overlay, /*#__PURE__*/React.createElement(PopupRoot, {
       id: innerId,
       ref: innerRef,
       position: handlePosition(placement, offset),
-      frame: frame,
       zIndex: zIndex,
       animationInfo: animationInfo,
       setVisible: setVisible
-    }, children))));
+    }, children));
+    if (typeof frame !== 'string' && frame && frame.current) {
+      return /*#__PURE__*/React.createElement(Portal, {
+        container: frame.current
+      }, rootNode);
+    }
+    var withFrameId = typeof frame === 'string' && frame !== 'document';
+    var containerElement = withFrameId && document.getElementById(frame);
+    if (containerElement) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement(StyledPortalContainer, {
+        ref: portalRef
+      }, portalRef.current && /*#__PURE__*/React.createElement(Portal, {
+        container: portalRef.current
+      }, rootNode)), containerElement));
+    }
+    var globalPortal = canUseDOM && document.getElementById(rootId);
+    return /*#__PURE__*/React.createElement(React.Fragment, null, globalPortal && /*#__PURE__*/React.createElement(Portal, {
+      container: globalPortal
+    }, rootNode));
   });
 };
 export var popupConfig = {

package/styled-components/es/components/Popup/Popup.styles.js

@@ -2,28 +2,37 @@ import styled from 'styled-components';
 import { DEFAULT_Z_INDEX } from './utils';
 export var StyledPortal = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-rkhnjn-0"
-})([""]);
-export var PopupView = /*#__PURE__*/styled.div.withConfig({
+})(["position:fixed;top:0;left:0;right:0;bottom:0;z-index:", ";width:", ";pointer-events:", ";"], DEFAULT_Z_INDEX, function (_ref) {
+  var hasContent = _ref.hasContent;
+  return hasContent ? 'auto' : '0';
+}, function (_ref2) {
+  var hasContent = _ref2.hasContent;
+  return hasContent ? 'auto' : 'none';
+});
+export var StyledPortalContainer = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-rkhnjn-1"
+})(["width:0;"]);
+export var PopupView = /*#__PURE__*/styled.div.withConfig({
+  componentId: "plasma-new-hope__sc-rkhnjn-2"
 })(["position:relative;max-width:100%;pointer-events:all;"]);
 export var PopupRootContainer = /*#__PURE__*/styled.div.withConfig({
-  componentId: "plasma-new-hope__sc-rkhnjn-2"
-})(["position:absolute;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref) {
-  var zIndex = _ref.zIndex;
+  componentId: "plasma-new-hope__sc-rkhnjn-3"
+})(["position:absolute;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref3) {
+  var zIndex = _ref3.zIndex;
   return zIndex || DEFAULT_Z_INDEX;
-}, function (_ref2) {
-  var position = _ref2.position;
-  return position.left || '';
-}, function (_ref3) {
-  var position = _ref3.position;
-  return position.right || '';
 }, function (_ref4) {
   var position = _ref4.position;
-  return position.top || '';
+  return position.left || '';
 }, function (_ref5) {
   var position = _ref5.position;
-  return position.bottom || '';
+  return position.right || '';
 }, function (_ref6) {
   var position = _ref6.position;
+  return position.top || '';
+}, function (_ref7) {
+  var position = _ref7.position;
+  return position.bottom || '';
+}, function (_ref8) {
+  var position = _ref8.position;
   return position.transform || '';
 });