@salutejs/plasma-new-hope 0.160.0-dev.0 → 0.160.1-canary.1412.11145262601.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (86) hide show
  1. package/cjs/components/Drawer/Drawer.css +4 -3
  2. package/cjs/components/Drawer/Drawer.styles.js +3 -0
  3. package/cjs/components/Drawer/Drawer.styles.js.map +1 -1
  4. package/cjs/components/Modal/Modal.css +4 -3
  5. package/cjs/components/Notification/NotificationsProvider.css +4 -3
  6. package/cjs/components/Popup/Popup.js +29 -41
  7. package/cjs/components/Popup/Popup.js.map +1 -1
  8. package/cjs/components/Popup/Popup.styles.js +21 -9
  9. package/cjs/components/Popup/Popup.styles.js.map +1 -1
  10. package/cjs/components/Popup/Popup.styles_1nezasm.css +4 -0
  11. package/cjs/components/Popup/PopupContext.css +4 -0
  12. package/cjs/components/Popup/PopupContext.js +23 -10
  13. package/cjs/components/Popup/PopupContext.js.map +1 -1
  14. package/cjs/components/Popup/PopupRoot.js +1 -1
  15. package/cjs/components/Popup/PopupRoot.js.map +1 -1
  16. package/cjs/components/Popup/hooks/usePopup.js +3 -2
  17. package/cjs/components/Popup/hooks/usePopup.js.map +1 -1
  18. package/cjs/index.css +4 -3
  19. package/emotion/cjs/components/Popup/Popup.js +28 -41
  20. package/emotion/cjs/components/Popup/Popup.styles.js +26 -6
  21. package/emotion/cjs/components/Popup/PopupContext.js +22 -10
  22. package/emotion/cjs/components/Popup/PopupRoot.js +1 -3
  23. package/emotion/cjs/components/Popup/hooks/usePopup.js +3 -2
  24. package/emotion/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +3 -0
  25. package/emotion/cjs/examples/plasma_b2c/components/Popup/Popup.stories.tsx +3 -0
  26. package/emotion/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +3 -0
  27. package/emotion/cjs/examples/plasma_web/components/Popup/Popup.stories.tsx +3 -0
  28. package/emotion/es/components/Popup/Popup.js +30 -43
  29. package/emotion/es/components/Popup/Popup.styles.js +25 -5
  30. package/emotion/es/components/Popup/PopupContext.js +23 -11
  31. package/emotion/es/components/Popup/PopupRoot.js +1 -3
  32. package/emotion/es/components/Popup/hooks/usePopup.js +3 -2
  33. package/emotion/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +3 -0
  34. package/emotion/es/examples/plasma_b2c/components/Popup/Popup.stories.tsx +3 -0
  35. package/emotion/es/examples/plasma_web/components/Modal/Modal.stories.tsx +3 -0
  36. package/emotion/es/examples/plasma_web/components/Popup/Popup.stories.tsx +3 -0
  37. package/es/components/Drawer/Drawer.css +4 -3
  38. package/es/components/Drawer/Drawer.styles.js +3 -0
  39. package/es/components/Drawer/Drawer.styles.js.map +1 -1
  40. package/es/components/Modal/Modal.css +4 -3
  41. package/es/components/Notification/NotificationsProvider.css +4 -3
  42. package/es/components/Popup/Popup.js +31 -43
  43. package/es/components/Popup/Popup.js.map +1 -1
  44. package/es/components/Popup/Popup.styles.js +20 -10
  45. package/es/components/Popup/Popup.styles.js.map +1 -1
  46. package/es/components/Popup/Popup.styles_1nezasm.css +4 -0
  47. package/es/components/Popup/PopupContext.css +4 -0
  48. package/es/components/Popup/PopupContext.js +24 -11
  49. package/es/components/Popup/PopupContext.js.map +1 -1
  50. package/es/components/Popup/PopupRoot.js +1 -1
  51. package/es/components/Popup/PopupRoot.js.map +1 -1
  52. package/es/components/Popup/hooks/usePopup.js +3 -2
  53. package/es/components/Popup/hooks/usePopup.js.map +1 -1
  54. package/es/index.css +4 -3
  55. package/package.json +2 -2
  56. package/styled-components/cjs/components/Popup/Popup.js +28 -41
  57. package/styled-components/cjs/components/Popup/Popup.styles.js +8 -5
  58. package/styled-components/cjs/components/Popup/PopupContext.js +22 -10
  59. package/styled-components/cjs/components/Popup/PopupRoot.js +1 -3
  60. package/styled-components/cjs/components/Popup/hooks/usePopup.js +3 -2
  61. package/styled-components/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +3 -0
  62. package/styled-components/cjs/examples/plasma_b2c/components/Popup/Popup.stories.tsx +3 -0
  63. package/styled-components/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +3 -0
  64. package/styled-components/cjs/examples/plasma_web/components/Popup/Popup.stories.tsx +3 -0
  65. package/styled-components/es/components/Popup/Popup.js +30 -43
  66. package/styled-components/es/components/Popup/Popup.styles.js +7 -4
  67. package/styled-components/es/components/Popup/PopupContext.js +23 -11
  68. package/styled-components/es/components/Popup/PopupRoot.js +1 -3
  69. package/styled-components/es/components/Popup/hooks/usePopup.js +3 -2
  70. package/styled-components/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +3 -0
  71. package/styled-components/es/examples/plasma_b2c/components/Popup/Popup.stories.tsx +3 -0
  72. package/styled-components/es/examples/plasma_web/components/Modal/Modal.stories.tsx +3 -0
  73. package/styled-components/es/examples/plasma_web/components/Popup/Popup.stories.tsx +3 -0
  74. package/types/components/Popup/Popup.d.ts +1 -1
  75. package/types/components/Popup/Popup.d.ts.map +1 -1
  76. package/types/components/Popup/Popup.styles.d.ts +1 -0
  77. package/types/components/Popup/Popup.styles.d.ts.map +1 -1
  78. package/types/components/Popup/Popup.types.d.ts +1 -0
  79. package/types/components/Popup/Popup.types.d.ts.map +1 -1
  80. package/types/components/Popup/PopupContext.d.ts.map +1 -1
  81. package/types/components/Popup/hooks/usePopup.d.ts +1 -0
  82. package/types/components/Popup/hooks/usePopup.d.ts.map +1 -1
  83. package/cjs/components/Popup/Popup.css +0 -3
  84. package/cjs/components/Popup/Popup.styles_141jyqa.css +0 -3
  85. package/es/components/Popup/Popup.css +0 -3
  86. package/es/components/Popup/Popup.styles_141jyqa.css +0 -3
@@ -1 +1 @@
1
- {"version":3,"file":"usePopup.js","sources":["../../../../src/components/Popup/hooks/usePopup.ts"],"sourcesContent":["import { useEffect, useState } from 'react';\n\nimport type { PopupAnimationInfo, PopupHookArgs } from '../Popup.types';\nimport { usePopupContext } from '../PopupContext';\n\n// Хук для поключения анимации\nconst usePopupAnimation = (): PopupAnimationInfo => {\n const [endAnimation, setEndAnimation] = useState<boolean>(false);\n const [endTransition, setEndTransition] = useState<boolean>(false);\n\n return { endAnimation, endTransition, setEndTransition, setEndAnimation };\n};\n\n// Хук для внутреннего состояния, необходимого для правильного отображения вложенных окон, а также для анимации\nexport const usePopup = ({ isOpen, id, popupInfo, withAnimation }: PopupHookArgs) => {\n const [isVisible, setVisible] = useState<boolean>(false);\n const popupController = usePopupContext();\n const animationInfo = usePopupAnimation();\n\n // для использования transition в качестве анимации\n useEffect(() => {\n if (withAnimation && animationInfo) {\n animationInfo.setEndTransition(!isVisible || animationInfo?.endAnimation);\n }\n }, [animationInfo, withAnimation, isVisible]);\n\n // сначала добавление/удаление из контекста, и только после этого отображение/скрытие\n useEffect(() => {\n // при первом открытии\n if (isOpen && !isVisible) {\n popupController.register({ id, ...popupInfo });\n setVisible(true);\n animationInfo.setEndAnimation(false);\n return;\n }\n\n if (isOpen || !isVisible) {\n return;\n }\n\n // если есть анимация - закрытие по окончании анимации\n if (withAnimation) {\n animationInfo.setEndAnimation(true);\n return;\n }\n\n // иначе обычное закрытие\n popupController.unregister(id);\n setVisible(false);\n }, [isOpen, isVisible, animationInfo]);\n\n useEffect(() => {\n return () => {\n popupController.unregister(id);\n };\n }, [id]);\n\n return { isVisible, setVisible, animationInfo, withAnimation };\n};\n"],"names":["usePopupAnimation","_useState","useState","_useState2","_slicedToArray","endAnimation","setEndAnimation","_useState3","_useState4","endTransition","setEndTransition","usePopup","_ref","isOpen","id","popupInfo","withAnimation","_useState5","_useState6","isVisible","setVisible","popupController","usePopupContext","animationInfo","useEffect","register","_objectSpread","unregister"],"mappings":"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"}
1
+ {"version":3,"file":"usePopup.js","sources":["../../../../src/components/Popup/hooks/usePopup.ts"],"sourcesContent":["import { useEffect, useState } from 'react';\n\nimport type { PopupAnimationInfo, PopupHookArgs } from '../Popup.types';\nimport { usePopupContext } from '../PopupContext';\n\n// Хук для подключения анимации\nconst usePopupAnimation = (): PopupAnimationInfo => {\n const [endAnimation, setEndAnimation] = useState<boolean>(false);\n const [endTransition, setEndTransition] = useState<boolean>(false);\n\n return { endAnimation, endTransition, setEndTransition, setEndAnimation };\n};\n\n// Хук для внутреннего состояния, необходимого для правильного отображения вложенных окон, а также для анимации\nexport const usePopup = ({ isOpen, id, popupInfo, withAnimation }: PopupHookArgs) => {\n const [isVisible, setVisible] = useState<boolean>(false);\n const popupController = usePopupContext();\n const animationInfo = usePopupAnimation();\n\n // для использования transition в качестве анимации\n useEffect(() => {\n if (withAnimation && animationInfo) {\n animationInfo.setEndTransition(!isVisible || animationInfo?.endAnimation);\n }\n }, [animationInfo, withAnimation, isVisible]);\n\n // сначала добавление/удаление из контекста, и только после этого отображение/скрытие\n useEffect(() => {\n // при первом открытии\n if (isOpen && !isVisible) {\n popupController.register({ id, ...popupInfo });\n setVisible(true);\n animationInfo.setEndAnimation(false);\n return;\n }\n\n if (isOpen || !isVisible) {\n return;\n }\n\n // если есть анимация - закрытие по окончании анимации\n if (withAnimation) {\n animationInfo.setEndAnimation(true);\n return;\n }\n\n // иначе обычное закрытие\n popupController.unregister(id);\n setVisible(false);\n }, [isOpen, isVisible, animationInfo]);\n\n useEffect(() => {\n return () => {\n popupController.unregister(id);\n };\n }, [id]);\n\n return { isVisible, setVisible, animationInfo, withAnimation, rootId: popupController.rootId };\n};\n"],"names":["usePopupAnimation","_useState","useState","_useState2","_slicedToArray","endAnimation","setEndAnimation","_useState3","_useState4","endTransition","setEndTransition","usePopup","_ref","isOpen","id","popupInfo","withAnimation","_useState5","_useState6","isVisible","setVisible","popupController","usePopupContext","animationInfo","useEffect","register","_objectSpread","unregister","rootId"],"mappings":"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"}
package/es/index.css CHANGED
@@ -265,9 +265,10 @@
265
265
 
266
266
  .Subtitle_styles_1plleej_b810c19__d9c54bce{font-family:var(--typo-font-family);font-size:var(--typo-font-size);font-style:var(--typo-font-style);-webkit-letter-spacing:var(--typo-font-letter-spacing);-moz-letter-spacing:var(--typo-font-letter-spacing);-ms-letter-spacing:var(--typo-font-letter-spacing);letter-spacing:var(--typo-font-letter-spacing);line-height:var(--typo-font-line-height);font-weight:var(--typo-font-weight);overflow-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;}
267
267
 
268
-
269
- .Popup_styles_141jyqa_p1cjo3us__ed39c2a3{position:relative;max-width:100%;pointer-events:all;}
270
- .Popup_styles_141jyqa_p5u7tqa__ed39c2a3{position:absolute;z-index:var(--p5u7tqa-0);left:var(--p5u7tqa-1);right:var(--p5u7tqa-2);top:var(--p5u7tqa-3);bottom:var(--p5u7tqa-4);-webkit-transform:var(--p5u7tqa-5);-ms-transform:var(--p5u7tqa-5);transform:var(--p5u7tqa-5);}
268
+ .Popup_styles_1nezasm_svkpf6n__d48d0426{position:fixed;width:0;pointer-events:0;}
269
+ .Popup_styles_1nezasm_s1cjo3us__d48d0426{width:0;}
270
+ .Popup_styles_1nezasm_p5u7tqa__d48d0426{position:relative;max-width:100%;pointer-events:all;}
271
+ .Popup_styles_1nezasm_p1f40oul__d48d0426{position:fixed;z-index:var(--p1f40oul-0);left:var(--p1f40oul-1);right:var(--p1f40oul-2);top:var(--p1f40oul-3);bottom:var(--p1f40oul-4);-webkit-transform:var(--p1f40oul-5);-ms-transform:var(--p1f40oul-5);transform:var(--p1f40oul-5);}
271
272
 
272
273
  .NotificationsPortal_6417q6_s19gbs9t__4166aeb6 > .NotificationsPortal_6417q6_popupBaseRoot__4166aeb6{overflow:hidden;}
273
274
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salutejs/plasma-new-hope",
3
- "version": "0.160.0-dev.0",
3
+ "version": "0.160.1-canary.1412.11145262601.0",
4
4
  "description": "Salute Design System blueprint",
5
5
  "main": "cjs/index.js",
6
6
  "module": "es/index.js",
@@ -124,5 +124,5 @@
124
124
  "react-popper": "2.3.0",
125
125
  "storeon": "3.1.5"
126
126
  },
127
- "gitHead": "febc628a023ac71fbdff3e9c74ba3ac520ddcd33"
127
+ "gitHead": "f02a7ec05afef3e92fe9332207f11bc21122f22c"
128
128
  }
@@ -9,10 +9,10 @@ var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react")
9
9
  var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
10
10
  var _utils = /*#__PURE__*/require("../../utils");
11
11
  var _Portal = /*#__PURE__*/require("../Portal");
12
- var _PopupContext = /*#__PURE__*/require("./PopupContext");
13
12
  var _PopupRoot = /*#__PURE__*/require("./PopupRoot");
14
13
  var _hooks = /*#__PURE__*/require("./hooks");
15
14
  var _Popup = /*#__PURE__*/require("./Popup.tokens");
15
+ var _Popup2 = /*#__PURE__*/require("./Popup.styles");
16
16
  var _excluded = ["id", "isOpen", "opened", "placement", "offset", "frame", "children", "overlay", "role", "zIndex", "popupInfo", "withAnimation", "className"];
17
17
  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); }
18
18
  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; }
@@ -48,8 +48,8 @@ var handlePosition = exports.handlePosition = function handlePosition(placement,
48
48
  var bottom;
49
49
  var transform;
50
50
  var placements = placement.split('-');
51
- placements.forEach(function (placement) {
52
- switch (placement) {
51
+ placements.forEach(function (placementValue) {
52
+ switch (placementValue) {
53
53
  case 'left':
54
54
  left = x;
55
55
  break;
@@ -84,7 +84,7 @@ var handlePosition = exports.handlePosition = function handlePosition(placement,
84
84
  };
85
85
 
86
86
  /**
87
- * Базовый копмонент Popup.
87
+ * Базовый компонент Popup.
88
88
  */
89
89
  var popupRoot = exports.popupRoot = function popupRoot(Root) {
90
90
  return /*#__PURE__*/(0, _react.forwardRef)(function (_ref, outerRootRef) {
@@ -119,58 +119,45 @@ var popupRoot = exports.popupRoot = function popupRoot(Root) {
119
119
  }),
120
120
  isVisible = _usePopup.isVisible,
121
121
  animationInfo = _usePopup.animationInfo,
122
- setVisible = _usePopup.setVisible;
122
+ setVisible = _usePopup.setVisible,
123
+ rootId = _usePopup.rootId;
123
124
  var portalRef = (0, _react.useRef)(null);
124
125
  var contentRef = (0, _react.useRef)(null);
125
126
  var innerRef = (0, _plasmaCore.useForkRef)(contentRef, outerRootRef);
126
- var _useState = (0, _react.useState)(false),
127
- _useState2 = _slicedToArray(_useState, 2),
128
- forceRender = _useState2[1];
129
- (0, _react.useEffect)(function () {
130
- var portal = document.getElementById(_PopupContext.POPUP_PORTAL_ID);
131
- if (typeof frame !== 'string' && frame && frame.current) {
132
- portal = frame.current;
133
- }
134
- if (!portal) {
135
- portal = document.createElement('div');
136
- portal.setAttribute('id', _PopupContext.POPUP_PORTAL_ID);
137
- /**
138
- * Нужно для того, чтобы во фрейме не происходило скачков контента
139
- * при анимации через transform, если есть элемент с шириной/высотой в 100% (Overlay)
140
- */
141
- portal.style.width = '0';
142
- if (typeof frame === 'string' && frame !== 'document') {
143
- var _document$getElementB;
144
- (_document$getElementB = document.getElementById(frame)) === null || _document$getElementB === void 0 || _document$getElementB.appendChild(portal);
145
- } else {
146
- document.body.appendChild(portal);
147
- }
148
- }
149
- portalRef.current = portal;
150
-
151
- /**
152
- * Изменение стейта нужно для того, чтобы Popup
153
- * отобразился после записи DOM элемента в portalRef.current
154
- */
155
- forceRender(true);
156
- }, []);
157
127
  if (!isVisible && !innerIsOpen) {
158
128
  return null;
159
129
  }
160
130
  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 : '');
161
- return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, portalRef.current && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
162
- container: portalRef.current
163
- }, /*#__PURE__*/_react["default"].createElement(Root, _extends({
131
+ var rootNode = /*#__PURE__*/_react["default"].createElement(Root, _extends({
164
132
  className: cls
165
133
  }, rest), overlay, /*#__PURE__*/_react["default"].createElement(_PopupRoot.PopupRoot, {
166
134
  id: innerId,
167
135
  ref: innerRef,
168
136
  position: handlePosition(placement, offset),
169
- frame: frame,
170
137
  zIndex: zIndex,
171
138
  animationInfo: animationInfo,
172
139
  setVisible: setVisible
173
- }, children))));
140
+ }, children));
141
+ if (typeof frame !== 'string' && frame && frame.current) {
142
+ return /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
143
+ container: frame.current
144
+ }, rootNode);
145
+ }
146
+ var withFrameId = typeof frame === 'string' && frame !== 'document';
147
+ var containerElement = withFrameId && document.getElementById(frame);
148
+ if (containerElement) {
149
+ return /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
150
+ container: containerElement
151
+ }, /*#__PURE__*/_react["default"].createElement(_Popup2.StyledPortalContainer, {
152
+ ref: portalRef
153
+ }, portalRef.current && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
154
+ container: portalRef.current
155
+ }, rootNode)), ' ');
156
+ }
157
+ var globalPortal = _utils.canUseDOM && document.getElementById(rootId);
158
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, globalPortal && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
159
+ container: globalPortal
160
+ }, rootNode));
174
161
  });
175
162
  };
176
163
  var popupConfig = exports.popupConfig = {
@@ -3,19 +3,22 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.StyledPortal = exports.PopupView = exports.PopupRootContainer = void 0;
6
+ exports.StyledPortalContainer = exports.StyledPortal = exports.PopupView = exports.PopupRootContainer = void 0;
7
7
  var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
8
8
  var _utils = /*#__PURE__*/require("./utils");
9
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
10
10
  var StyledPortal = exports.StyledPortal = /*#__PURE__*/_styledComponents["default"].div.withConfig({
11
11
  componentId: "plasma-new-hope__sc-rkhnjn-0"
12
- })([""]);
13
- var PopupView = exports.PopupView = /*#__PURE__*/_styledComponents["default"].div.withConfig({
12
+ })(["position:fixed;width:0;pointer-events:0;"]);
13
+ var StyledPortalContainer = exports.StyledPortalContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
14
14
  componentId: "plasma-new-hope__sc-rkhnjn-1"
15
+ })(["width:0;"]);
16
+ var PopupView = exports.PopupView = /*#__PURE__*/_styledComponents["default"].div.withConfig({
17
+ componentId: "plasma-new-hope__sc-rkhnjn-2"
15
18
  })(["position:relative;max-width:100%;pointer-events:all;"]);
16
19
  var PopupRootContainer = exports.PopupRootContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
17
- componentId: "plasma-new-hope__sc-rkhnjn-2"
18
- })(["position:absolute;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref) {
20
+ componentId: "plasma-new-hope__sc-rkhnjn-3"
21
+ })(["position:fixed;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref) {
19
22
  var zIndex = _ref.zIndex;
20
23
  return zIndex || _utils.DEFAULT_Z_INDEX;
21
24
  }, function (_ref2) {
@@ -7,6 +7,9 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.usePopupContext = exports.PopupProvider = exports.POPUP_PORTAL_ID = void 0;
8
8
  var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
9
9
  var _ModalContext = /*#__PURE__*/require("../Modal/ModalContext");
10
+ var _utils = /*#__PURE__*/require("../../utils");
11
+ var _Portal = /*#__PURE__*/require("../Portal");
12
+ var _Popup = /*#__PURE__*/require("./Popup.styles");
10
13
  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); }
11
14
  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; }
12
15
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -23,9 +26,12 @@ var POPUP_PORTAL_ID = exports.POPUP_PORTAL_ID = 'plasma-popup-root';
23
26
  var items = [];
24
27
  var PopupContext = /*#__PURE__*/(0, _react.createContext)({
25
28
  items: items,
29
+ rootId: POPUP_PORTAL_ID,
30
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
26
31
  register: function register(_info) {
27
32
  throw new Error('Function not implemented. Add PopupProvider');
28
33
  },
34
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
29
35
  unregister: function unregister(_id) {
30
36
  throw new Error('Function not implemented. Add PopupProvider');
31
37
  }
@@ -35,12 +41,18 @@ var usePopupContext = exports.usePopupContext = function usePopupContext() {
35
41
  };
36
42
  var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
37
43
  var children = _ref.children;
38
- var prevBodyOverflowY = (0, _react.useRef)(typeof document !== 'undefined' ? document.body.style.overflowY : '');
44
+ var prevBodyOverflowY = (0, _react.useRef)(_utils.canUseDOM ? document.body.style.overflowY : '');
45
+ // eslint-disable-next-line no-shadow
39
46
  var _useState = (0, _react.useState)([]),
40
47
  _useState2 = _slicedToArray(_useState, 2),
41
48
  items = _useState2[0],
42
49
  setItems = _useState2[1];
50
+ var uuid = (0, _utils.safeUseId)();
51
+ var rootId = "".concat(POPUP_PORTAL_ID, "-").concat(uuid);
43
52
  var register = function register(info) {
53
+ if (!_utils.canUseDOM) {
54
+ return;
55
+ }
44
56
  setItems(function (prevItems) {
45
57
  var _info$info;
46
58
  if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !(0, _ModalContext.hasModals)(prevItems)) {
@@ -51,6 +63,9 @@ var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
51
63
  });
52
64
  };
53
65
  var unregister = function unregister(id) {
66
+ if (!_utils.canUseDOM) {
67
+ return;
68
+ }
54
69
  setItems(function (prevItems) {
55
70
  var index = prevItems.findIndex(function (item) {
56
71
  return id === item.id;
@@ -70,18 +85,15 @@ var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
70
85
  };
71
86
  var context = {
72
87
  items: items,
88
+ rootId: rootId,
73
89
  register: register,
74
90
  unregister: unregister
75
91
  };
76
- (0, _react.useEffect)(function () {
77
- return function () {
78
- var portal = document.createElement('div');
79
- if (portal && document.body.contains(portal)) {
80
- document.body.removeChild(portal);
81
- }
82
- };
83
- }, []);
84
92
  return /*#__PURE__*/_react["default"].createElement(PopupContext.Provider, {
85
93
  value: context
86
- }, children);
94
+ }, children, /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
95
+ container: document.body
96
+ }, /*#__PURE__*/_react["default"].createElement(_Popup.StyledPortal, {
97
+ id: rootId
98
+ })));
87
99
  };
@@ -10,7 +10,7 @@ var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
10
10
  var _PopupContext = /*#__PURE__*/require("./PopupContext");
11
11
  var _Popup = /*#__PURE__*/require("./Popup.styles");
12
12
  var _Popup2 = /*#__PURE__*/require("./Popup.tokens");
13
- var _excluded = ["id", "placement", "offset", "frame", "setVisible", "children", "role", "zIndex", "animationInfo", "className"];
13
+ var _excluded = ["id", "placement", "offset", "setVisible", "children", "role", "zIndex", "animationInfo"];
14
14
  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); }
15
15
  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; }
16
16
  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
24
24
  var id = _ref.id,
25
25
  placement = _ref.placement,
26
26
  offset = _ref.offset,
27
- frame = _ref.frame,
28
27
  setVisible = _ref.setVisible,
29
28
  children = _ref.children,
30
29
  role = _ref.role,
31
30
  zIndex = _ref.zIndex,
32
31
  animationInfo = _ref.animationInfo,
33
- className = _ref.className,
34
32
  rest = _objectWithoutProperties(_ref, _excluded);
35
33
  var contentRef = (0, _react.useRef)(null);
36
34
  var innerRef = (0, _plasmaCore.useForkRef)(contentRef, ref);
@@ -18,7 +18,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
18
18
  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; }
19
19
  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; } }
20
20
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
21
- // Хук для поключения анимации
21
+ // Хук для подключения анимации
22
22
  var usePopupAnimation = function usePopupAnimation() {
23
23
  var _useState = (0, _react.useState)(false),
24
24
  _useState2 = _slicedToArray(_useState, 2),
@@ -90,6 +90,7 @@ var usePopup = exports.usePopup = function usePopup(_ref) {
90
90
  isVisible: isVisible,
91
91
  setVisible: setVisible,
92
92
  animationInfo: animationInfo,
93
- withAnimation: withAnimation
93
+ withAnimation: withAnimation,
94
+ rootId: popupController.rootId
94
95
  };
95
96
  };
@@ -14,6 +14,9 @@ import { Modal, modalClasses } from './Modal';
14
14
  export default {
15
15
  title: 'plasma_b2c/Modal',
16
16
  decorators: [WithTheme],
17
+ parameters: {
18
+ docs: { story: { inline: false, iframeHeight: '30rem' } },
19
+ },
17
20
  argTypes: {
18
21
  placement: {
19
22
  options: [
@@ -12,6 +12,9 @@ import { Popup, popupClasses, PopupProvider } from './Popup';
12
12
  const meta: Meta<typeof Popup> = {
13
13
  title: 'plasma_b2c/Popup',
14
14
  decorators: [WithTheme],
15
+ parameters: {
16
+ docs: { story: { inline: false, iframeHeight: '30rem' } },
17
+ },
15
18
  argTypes: {
16
19
  placement: {
17
20
  options: [
@@ -14,6 +14,9 @@ import { Modal, modalClasses } from './Modal';
14
14
  export default {
15
15
  title: 'plasma_web/Modal',
16
16
  decorators: [WithTheme],
17
+ parameters: {
18
+ docs: { story: { inline: false, iframeHeight: '30rem' } },
19
+ },
17
20
  argTypes: {
18
21
  placement: {
19
22
  options: [
@@ -12,6 +12,9 @@ import { Popup, popupClasses, PopupProvider } from './Popup';
12
12
  const meta: Meta<typeof Popup> = {
13
13
  title: 'plasma_web/Popup',
14
14
  decorators: [WithTheme],
15
+ parameters: {
16
+ docs: { story: { inline: false, iframeHeight: '30rem' } },
17
+ },
15
18
  argTypes: {
16
19
  placement: {
17
20
  options: [
@@ -8,14 +8,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React, { forwardRef, useEffect, useRef, useState } from 'react';
11
+ import React, { forwardRef, useRef } from 'react';
12
12
  import { useForkRef, safeUseId } from '@salutejs/plasma-core';
13
- import { cx } from '../../utils';
13
+ import { canUseDOM, cx } from '../../utils';
14
14
  import { Portal } from '../Portal';
15
- import { POPUP_PORTAL_ID } from './PopupContext';
16
15
  import { PopupRoot } from './PopupRoot';
17
16
  import { usePopup } from './hooks';
18
17
  import { classes } from './Popup.tokens';
18
+ import { StyledPortalContainer } from './Popup.styles';
19
19
  export var handlePosition = function handlePosition(placement, offset) {
20
20
  var x = '0rem';
21
21
  var y = '0rem';
@@ -39,8 +39,8 @@ export var handlePosition = function handlePosition(placement, offset) {
39
39
  var bottom;
40
40
  var transform;
41
41
  var placements = placement.split('-');
42
- placements.forEach(function (placement) {
43
- switch (placement) {
42
+ placements.forEach(function (placementValue) {
43
+ switch (placementValue) {
44
44
  case 'left':
45
45
  left = x;
46
46
  break;
@@ -75,7 +75,7 @@ export var handlePosition = function handlePosition(placement, offset) {
75
75
  };
76
76
 
77
77
  /**
78
- * Базовый копмонент Popup.
78
+ * Базовый компонент Popup.
79
79
  */
80
80
  export var popupRoot = function popupRoot(Root) {
81
81
  return /*#__PURE__*/forwardRef(function (_ref, outerRootRef) {
@@ -110,58 +110,45 @@ export var popupRoot = function popupRoot(Root) {
110
110
  }),
111
111
  isVisible = _usePopup.isVisible,
112
112
  animationInfo = _usePopup.animationInfo,
113
- setVisible = _usePopup.setVisible;
113
+ setVisible = _usePopup.setVisible,
114
+ rootId = _usePopup.rootId;
114
115
  var portalRef = useRef(null);
115
116
  var contentRef = useRef(null);
116
117
  var innerRef = useForkRef(contentRef, outerRootRef);
117
- var _useState = useState(false),
118
- _useState2 = _slicedToArray(_useState, 2),
119
- forceRender = _useState2[1];
120
- useEffect(function () {
121
- var portal = document.getElementById(POPUP_PORTAL_ID);
122
- if (typeof frame !== 'string' && frame && frame.current) {
123
- portal = frame.current;
124
- }
125
- if (!portal) {
126
- portal = document.createElement('div');
127
- portal.setAttribute('id', POPUP_PORTAL_ID);
128
- /**
129
- * Нужно для того, чтобы во фрейме не происходило скачков контента
130
- * при анимации через transform, если есть элемент с шириной/высотой в 100% (Overlay)
131
- */
132
- portal.style.width = '0';
133
- if (typeof frame === 'string' && frame !== 'document') {
134
- var _document$getElementB;
135
- (_document$getElementB = document.getElementById(frame)) === null || _document$getElementB === void 0 || _document$getElementB.appendChild(portal);
136
- } else {
137
- document.body.appendChild(portal);
138
- }
139
- }
140
- portalRef.current = portal;
141
-
142
- /**
143
- * Изменение стейта нужно для того, чтобы Popup
144
- * отобразился после записи DOM элемента в portalRef.current
145
- */
146
- forceRender(true);
147
- }, []);
148
118
  if (!isVisible && !innerIsOpen) {
149
119
  return null;
150
120
  }
151
121
  var cls = cx(className, animationInfo !== null && animationInfo !== void 0 && animationInfo.endAnimation ? classes.endAnimation : '', animationInfo !== null && animationInfo !== void 0 && animationInfo.endTransition ? classes.endTransition : '');
152
- return /*#__PURE__*/React.createElement(React.Fragment, null, portalRef.current && /*#__PURE__*/React.createElement(Portal, {
153
- container: portalRef.current
154
- }, /*#__PURE__*/React.createElement(Root, _extends({
122
+ var rootNode = /*#__PURE__*/React.createElement(Root, _extends({
155
123
  className: cls
156
124
  }, rest), overlay, /*#__PURE__*/React.createElement(PopupRoot, {
157
125
  id: innerId,
158
126
  ref: innerRef,
159
127
  position: handlePosition(placement, offset),
160
- frame: frame,
161
128
  zIndex: zIndex,
162
129
  animationInfo: animationInfo,
163
130
  setVisible: setVisible
164
- }, children))));
131
+ }, children));
132
+ if (typeof frame !== 'string' && frame && frame.current) {
133
+ return /*#__PURE__*/React.createElement(Portal, {
134
+ container: frame.current
135
+ }, rootNode);
136
+ }
137
+ var withFrameId = typeof frame === 'string' && frame !== 'document';
138
+ var containerElement = withFrameId && document.getElementById(frame);
139
+ if (containerElement) {
140
+ return /*#__PURE__*/React.createElement(Portal, {
141
+ container: containerElement
142
+ }, /*#__PURE__*/React.createElement(StyledPortalContainer, {
143
+ ref: portalRef
144
+ }, portalRef.current && /*#__PURE__*/React.createElement(Portal, {
145
+ container: portalRef.current
146
+ }, rootNode)), ' ');
147
+ }
148
+ var globalPortal = canUseDOM && document.getElementById(rootId);
149
+ return /*#__PURE__*/React.createElement(React.Fragment, null, globalPortal && /*#__PURE__*/React.createElement(Portal, {
150
+ container: globalPortal
151
+ }, rootNode));
165
152
  });
166
153
  };
167
154
  export var popupConfig = {
@@ -2,13 +2,16 @@ import styled from 'styled-components';
2
2
  import { DEFAULT_Z_INDEX } from './utils';
3
3
  export var StyledPortal = /*#__PURE__*/styled.div.withConfig({
4
4
  componentId: "plasma-new-hope__sc-rkhnjn-0"
5
- })([""]);
6
- export var PopupView = /*#__PURE__*/styled.div.withConfig({
5
+ })(["position:fixed;width:0;pointer-events:0;"]);
6
+ export var StyledPortalContainer = /*#__PURE__*/styled.div.withConfig({
7
7
  componentId: "plasma-new-hope__sc-rkhnjn-1"
8
+ })(["width:0;"]);
9
+ export var PopupView = /*#__PURE__*/styled.div.withConfig({
10
+ componentId: "plasma-new-hope__sc-rkhnjn-2"
8
11
  })(["position:relative;max-width:100%;pointer-events:all;"]);
9
12
  export var PopupRootContainer = /*#__PURE__*/styled.div.withConfig({
10
- componentId: "plasma-new-hope__sc-rkhnjn-2"
11
- })(["position:absolute;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref) {
13
+ componentId: "plasma-new-hope__sc-rkhnjn-3"
14
+ })(["position:fixed;z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref) {
12
15
  var zIndex = _ref.zIndex;
13
16
  return zIndex || DEFAULT_Z_INDEX;
14
17
  }, function (_ref2) {
@@ -8,15 +8,21 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  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; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React, { createContext, useEffect, useState, useContext, useRef } from 'react';
11
+ import React, { createContext, useState, useContext, useRef } from 'react';
12
12
  import { hasModals } from '../Modal/ModalContext';
13
+ import { canUseDOM, safeUseId } from '../../utils';
14
+ import { Portal } from '../Portal';
15
+ import { StyledPortal } from './Popup.styles';
13
16
  export var POPUP_PORTAL_ID = 'plasma-popup-root';
14
17
  var items = [];
15
18
  var PopupContext = /*#__PURE__*/createContext({
16
19
  items: items,
20
+ rootId: POPUP_PORTAL_ID,
21
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
17
22
  register: function register(_info) {
18
23
  throw new Error('Function not implemented. Add PopupProvider');
19
24
  },
25
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
20
26
  unregister: function unregister(_id) {
21
27
  throw new Error('Function not implemented. Add PopupProvider');
22
28
  }
@@ -26,12 +32,18 @@ export var usePopupContext = function usePopupContext() {
26
32
  };
27
33
  export var PopupProvider = function PopupProvider(_ref) {
28
34
  var children = _ref.children;
29
- var prevBodyOverflowY = useRef(typeof document !== 'undefined' ? document.body.style.overflowY : '');
35
+ var prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');
36
+ // eslint-disable-next-line no-shadow
30
37
  var _useState = useState([]),
31
38
  _useState2 = _slicedToArray(_useState, 2),
32
39
  items = _useState2[0],
33
40
  setItems = _useState2[1];
41
+ var uuid = safeUseId();
42
+ var rootId = "".concat(POPUP_PORTAL_ID, "-").concat(uuid);
34
43
  var register = function register(info) {
44
+ if (!canUseDOM) {
45
+ return;
46
+ }
35
47
  setItems(function (prevItems) {
36
48
  var _info$info;
37
49
  if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !hasModals(prevItems)) {
@@ -42,6 +54,9 @@ export var PopupProvider = function PopupProvider(_ref) {
42
54
  });
43
55
  };
44
56
  var unregister = function unregister(id) {
57
+ if (!canUseDOM) {
58
+ return;
59
+ }
45
60
  setItems(function (prevItems) {
46
61
  var index = prevItems.findIndex(function (item) {
47
62
  return id === item.id;
@@ -61,18 +76,15 @@ export var PopupProvider = function PopupProvider(_ref) {
61
76
  };
62
77
  var context = {
63
78
  items: items,
79
+ rootId: rootId,
64
80
  register: register,
65
81
  unregister: unregister
66
82
  };
67
- useEffect(function () {
68
- return function () {
69
- var portal = document.createElement('div');
70
- if (portal && document.body.contains(portal)) {
71
- document.body.removeChild(portal);
72
- }
73
- };
74
- }, []);
75
83
  return /*#__PURE__*/React.createElement(PopupContext.Provider, {
76
84
  value: context
77
- }, children);
85
+ }, children, /*#__PURE__*/React.createElement(Portal, {
86
+ container: document.body
87
+ }, /*#__PURE__*/React.createElement(StyledPortal, {
88
+ id: rootId
89
+ })));
78
90
  };
@@ -1,4 +1,4 @@
1
- var _excluded = ["id", "placement", "offset", "frame", "setVisible", "children", "role", "zIndex", "animationInfo", "className"];
1
+ var _excluded = ["id", "placement", "offset", "setVisible", "children", "role", "zIndex", "animationInfo"];
2
2
  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); }
3
3
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
4
4
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -16,13 +16,11 @@ export var PopupRoot = /*#__PURE__*/forwardRef(function (_ref, ref) {
16
16
  var id = _ref.id,
17
17
  placement = _ref.placement,
18
18
  offset = _ref.offset,
19
- frame = _ref.frame,
20
19
  setVisible = _ref.setVisible,
21
20
  children = _ref.children,
22
21
  role = _ref.role,
23
22
  zIndex = _ref.zIndex,
24
23
  animationInfo = _ref.animationInfo,
25
- className = _ref.className,
26
24
  rest = _objectWithoutProperties(_ref, _excluded);
27
25
  var contentRef = useRef(null);
28
26
  var innerRef = useForkRef(contentRef, ref);
@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
13
  import { useEffect, useState } from 'react';
14
14
  import { usePopupContext } from '../PopupContext';
15
15
 
16
- // Хук для поключения анимации
16
+ // Хук для подключения анимации
17
17
  var usePopupAnimation = function usePopupAnimation() {
18
18
  var _useState = useState(false),
19
19
  _useState2 = _slicedToArray(_useState, 2),
@@ -85,6 +85,7 @@ export var usePopup = function usePopup(_ref) {
85
85
  isVisible: isVisible,
86
86
  setVisible: setVisible,
87
87
  animationInfo: animationInfo,
88
- withAnimation: withAnimation
88
+ withAnimation: withAnimation,
89
+ rootId: popupController.rootId
89
90
  };
90
91
  };