@salutejs/plasma-new-hope 0.162.1-dev.0 → 0.162.2-dev.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. package/cjs/components/Drawer/Drawer.css +3 -2
  2. package/cjs/components/Drawer/Drawer.styles.js +2 -0
  3. package/cjs/components/Drawer/Drawer.styles.js.map +1 -1
  4. package/cjs/components/Modal/Modal.css +3 -2
  5. package/cjs/components/Notification/NotificationsProvider.css +3 -2
  6. package/cjs/components/Popup/Popup.js +30 -41
  7. package/cjs/components/Popup/Popup.js.map +1 -1
  8. package/cjs/components/Popup/Popup.styles.js +35 -16
  9. package/cjs/components/Popup/Popup.styles.js.map +1 -1
  10. package/cjs/components/Popup/Popup.styles_gq4luz.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 +3 -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 +3 -2
  19. package/emotion/cjs/components/Popup/Popup.js +29 -41
  20. package/emotion/cjs/components/Popup/Popup.styles.js +32 -17
  21. package/emotion/cjs/components/Popup/PopupContext.js +22 -10
  22. package/emotion/cjs/components/Popup/PopupRoot.js +3 -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 +31 -43
  29. package/emotion/es/components/Popup/Popup.styles.js +31 -16
  30. package/emotion/es/components/Popup/PopupContext.js +23 -11
  31. package/emotion/es/components/Popup/PopupRoot.js +3 -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 +3 -2
  38. package/es/components/Drawer/Drawer.styles.js +2 -0
  39. package/es/components/Drawer/Drawer.styles.js.map +1 -1
  40. package/es/components/Modal/Modal.css +3 -2
  41. package/es/components/Notification/NotificationsProvider.css +3 -2
  42. package/es/components/Popup/Popup.js +32 -43
  43. package/es/components/Popup/Popup.js.map +1 -1
  44. package/es/components/Popup/Popup.styles.js +34 -17
  45. package/es/components/Popup/Popup.styles.js.map +1 -1
  46. package/es/components/Popup/Popup.styles_gq4luz.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 +3 -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 +3 -2
  55. package/package.json +2 -2
  56. package/styled-components/cjs/components/Popup/Popup.js +29 -41
  57. package/styled-components/cjs/components/Popup/Popup.styles.js +17 -11
  58. package/styled-components/cjs/components/Popup/PopupContext.js +22 -10
  59. package/styled-components/cjs/components/Popup/PopupRoot.js +3 -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 +31 -43
  66. package/styled-components/es/components/Popup/Popup.styles.js +16 -10
  67. package/styled-components/es/components/Popup/PopupContext.js +23 -11
  68. package/styled-components/es/components/Popup/PopupRoot.js +3 -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/PopupRoot.d.ts.map +1 -1
  82. package/types/components/Popup/hooks/usePopup.d.ts +1 -0
  83. package/types/components/Popup/hooks/usePopup.d.ts.map +1 -1
  84. package/cjs/components/Popup/Popup.css +0 -3
  85. package/cjs/components/Popup/Popup.styles_141jyqa.css +0 -3
  86. package/es/components/Popup/Popup.css +0 -3
  87. package/es/components/Popup/Popup.styles_141jyqa.css +0 -3
@@ -1,14 +1,21 @@
1
1
  import { slicedToArray as _slicedToArray, toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
2
- import React, { useContext, useRef, useState, useEffect, createContext } from 'react';
2
+ import React, { useContext, useRef, useState, createContext } from 'react';
3
3
  import { hasModals } from '../Modal/ModalContext.js';
4
+ import { canUseDOM } from '../../utils/canUseDOM.js';
5
+ import { safeUseId } from '../../utils/react.js';
6
+ import { Portal } from '../Portal/Portal.js';
7
+ import { StyledPortal } from './Popup.styles.js';
4
8
 
5
9
  var POPUP_PORTAL_ID = 'plasma-popup-root';
6
10
  var items = [];
7
11
  var PopupContext = /*#__PURE__*/createContext({
8
12
  items: items,
13
+ rootId: POPUP_PORTAL_ID,
14
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
9
15
  register: function register(_info) {
10
16
  throw new Error('Function not implemented. Add PopupProvider');
11
17
  },
18
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
12
19
  unregister: function unregister(_id) {
13
20
  throw new Error('Function not implemented. Add PopupProvider');
14
21
  }
@@ -18,12 +25,18 @@ var usePopupContext = function usePopupContext() {
18
25
  };
19
26
  var PopupProvider = function PopupProvider(_ref) {
20
27
  var children = _ref.children;
21
- var prevBodyOverflowY = useRef(typeof document !== 'undefined' ? document.body.style.overflowY : '');
28
+ var prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');
29
+ // eslint-disable-next-line no-shadow
22
30
  var _useState = useState([]),
23
31
  _useState2 = _slicedToArray(_useState, 2),
24
32
  items = _useState2[0],
25
33
  setItems = _useState2[1];
34
+ var uuid = safeUseId();
35
+ var rootId = "".concat(POPUP_PORTAL_ID, "-").concat(uuid);
26
36
  var register = function register(info) {
37
+ if (!canUseDOM) {
38
+ return;
39
+ }
27
40
  setItems(function (prevItems) {
28
41
  var _info$info;
29
42
  if ((_info$info = info.info) !== null && _info$info !== void 0 && _info$info.isModal && !hasModals(prevItems)) {
@@ -34,6 +47,9 @@ var PopupProvider = function PopupProvider(_ref) {
34
47
  });
35
48
  };
36
49
  var unregister = function unregister(id) {
50
+ if (!canUseDOM) {
51
+ return;
52
+ }
37
53
  setItems(function (prevItems) {
38
54
  var index = prevItems.findIndex(function (item) {
39
55
  return id === item.id;
@@ -53,20 +69,17 @@ var PopupProvider = function PopupProvider(_ref) {
53
69
  };
54
70
  var context = {
55
71
  items: items,
72
+ rootId: rootId,
56
73
  register: register,
57
74
  unregister: unregister
58
75
  };
59
- useEffect(function () {
60
- return function () {
61
- var portal = document.createElement('div');
62
- if (portal && document.body.contains(portal)) {
63
- document.body.removeChild(portal);
64
- }
65
- };
66
- }, []);
67
76
  return /*#__PURE__*/React.createElement(PopupContext.Provider, {
68
77
  value: context
69
- }, children);
78
+ }, children, /*#__PURE__*/React.createElement(Portal, {
79
+ container: document.body
80
+ }, /*#__PURE__*/React.createElement(StyledPortal, {
81
+ id: rootId
82
+ })));
70
83
  };
71
84
 
72
85
  export { POPUP_PORTAL_ID, PopupProvider, usePopupContext };
@@ -1 +1 @@
1
- {"version":3,"file":"PopupContext.js","sources":["../../../src/components/Popup/PopupContext.tsx"],"sourcesContent":["import React, { createContext, useEffect, useState, useContext, FC, PropsWithChildren, useRef } from 'react';\n\nimport { hasModals } from '../Modal/ModalContext';\n\nimport type { PopupContextType, PopupInfo } from './Popup.types';\n\nexport const POPUP_PORTAL_ID = 'plasma-popup-root';\n\nconst items: PopupInfo[] = [];\n\nconst PopupContext = createContext<PopupContextType>({\n items,\n register(_info: PopupInfo): void {\n throw new Error('Function not implemented. Add PopupProvider');\n },\n unregister(_id: string): void {\n throw new Error('Function not implemented. Add PopupProvider');\n },\n});\n\nexport const usePopupContext = () => useContext(PopupContext);\n\nexport const PopupProvider: FC<PropsWithChildren> = ({ children }) => {\n const prevBodyOverflowY = useRef(typeof document !== 'undefined' ? document.body.style.overflowY : '');\n const [items, setItems] = useState<PopupInfo[]>([]);\n\n const register = (info: PopupInfo) => {\n setItems((prevItems) => {\n if (info.info?.isModal && !hasModals(prevItems)) {\n prevBodyOverflowY.current = document.body.style.overflowY;\n document.body.style.overflowY = 'hidden';\n }\n\n return [...prevItems, info];\n });\n };\n\n const unregister = (id: string) => {\n setItems((prevItems) => {\n const index = prevItems.findIndex((item: PopupInfo) => id === item.id);\n\n if (index === -1) {\n return prevItems;\n }\n\n const prevHasModals = hasModals(prevItems);\n prevItems.splice(index, 1);\n\n if (prevHasModals && !hasModals(prevItems)) {\n document.body.style.overflowY = prevBodyOverflowY.current;\n }\n\n // при return prevItems не обновится контекст\n return [...prevItems];\n });\n };\n\n const context = {\n items,\n register,\n unregister,\n };\n\n useEffect(() => {\n return () => {\n const portal = document.createElement('div');\n if (portal && document.body.contains(portal)) {\n document.body.removeChild(portal);\n }\n };\n }, []);\n\n return <PopupContext.Provider value={context}>{children}</PopupContext.Provider>;\n};\n"],"names":["POPUP_PORTAL_ID","items","PopupContext","createContext","register","_info","Error","unregister","_id","usePopupContext","useContext","PopupProvider","_ref","children","prevBodyOverflowY","useRef","document","body","style","overflowY","_useState","useState","_useState2","_slicedToArray","setItems","info","prevItems","_info$info","isModal","hasModals","current","concat","_toConsumableArray","id","index","findIndex","item","prevHasModals","splice","context","useEffect","portal","createElement","contains","removeChild","React","Provider","value"],"mappings":"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"}
1
+ {"version":3,"file":"PopupContext.js","sources":["../../../src/components/Popup/PopupContext.tsx"],"sourcesContent":["import React, { createContext, useState, useContext, FC, PropsWithChildren, useRef } from 'react';\n\nimport { hasModals } from '../Modal/ModalContext';\nimport { canUseDOM, safeUseId } from '../../utils';\nimport { Portal } from '../Portal';\n\nimport type { PopupContextType, PopupInfo } from './Popup.types';\nimport { StyledPortal } from './Popup.styles';\n\nexport const POPUP_PORTAL_ID = 'plasma-popup-root';\n\nconst items: PopupInfo[] = [];\n\nconst PopupContext = createContext<PopupContextType>({\n items,\n rootId: POPUP_PORTAL_ID,\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n register(_info: PopupInfo): void {\n throw new Error('Function not implemented. Add PopupProvider');\n },\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n unregister(_id: string): void {\n throw new Error('Function not implemented. Add PopupProvider');\n },\n});\n\nexport const usePopupContext = () => useContext(PopupContext);\n\nexport const PopupProvider: FC<PropsWithChildren> = ({ children }) => {\n const prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');\n // eslint-disable-next-line no-shadow\n const [items, setItems] = useState<PopupInfo[]>([]);\n\n const uuid = safeUseId();\n const rootId = `${POPUP_PORTAL_ID}-${uuid}`;\n\n const register = (info: PopupInfo) => {\n if (!canUseDOM) {\n return;\n }\n\n setItems((prevItems) => {\n if (info.info?.isModal && !hasModals(prevItems)) {\n prevBodyOverflowY.current = document.body.style.overflowY;\n document.body.style.overflowY = 'hidden';\n }\n\n return [...prevItems, info];\n });\n };\n\n const unregister = (id: string) => {\n if (!canUseDOM) {\n return;\n }\n\n setItems((prevItems) => {\n const index = prevItems.findIndex((item: PopupInfo) => id === item.id);\n\n if (index === -1) {\n return prevItems;\n }\n\n const prevHasModals = hasModals(prevItems);\n prevItems.splice(index, 1);\n\n if (prevHasModals && !hasModals(prevItems)) {\n document.body.style.overflowY = prevBodyOverflowY.current;\n }\n\n // при return prevItems не обновится контекст\n return [...prevItems];\n });\n };\n\n const context = {\n items,\n rootId,\n register,\n unregister,\n };\n\n return (\n <PopupContext.Provider value={context}>\n {children}\n <Portal container={document.body}>\n <StyledPortal id={rootId} />\n </Portal>\n </PopupContext.Provider>\n );\n};\n"],"names":["POPUP_PORTAL_ID","items","PopupContext","createContext","rootId","register","_info","Error","unregister","_id","usePopupContext","useContext","PopupProvider","_ref","children","prevBodyOverflowY","useRef","canUseDOM","document","body","style","overflowY","_useState","useState","_useState2","_slicedToArray","setItems","uuid","safeUseId","concat","info","prevItems","_info$info","isModal","hasModals","current","_toConsumableArray","id","index","findIndex","item","prevHasModals","splice","context","React","createElement","Provider","value","Portal","container","StyledPortal"],"mappings":"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"}
@@ -5,7 +5,7 @@ import { usePopupContext } from './PopupContext.js';
5
5
  import { PopupRootContainer, PopupView } from './Popup.styles.js';
6
6
  import { classes } from './Popup.tokens.js';
7
7
 
8
- var _excluded = ["id", "placement", "offset", "frame", "setVisible", "children", "role", "zIndex", "animationInfo", "className"];
8
+ var _excluded = ["id", "placement", "offset", "setVisible", "children", "role", "frame", "zIndex", "animationInfo"];
9
9
 
10
10
  /**
11
11
  * Корень Popup.
@@ -18,6 +18,7 @@ var PopupRoot = /*#__PURE__*/forwardRef(function (_ref, ref) {
18
18
  setVisible = _ref.setVisible,
19
19
  children = _ref.children,
20
20
  role = _ref.role,
21
+ frame = _ref.frame,
21
22
  zIndex = _ref.zIndex,
22
23
  animationInfo = _ref.animationInfo,
23
24
  rest = _objectWithoutProperties(_ref, _excluded);
@@ -41,6 +42,7 @@ var PopupRoot = /*#__PURE__*/forwardRef(function (_ref, ref) {
41
42
  placement: placement,
42
43
  offset: offset,
43
44
  zIndex: zIndex,
45
+ frame: frame,
44
46
  onAnimationEnd: handleAnimationEnd,
45
47
  onTransitionEnd: handleAnimationEnd
46
48
  }, rest), /*#__PURE__*/React.createElement(PopupView, {
@@ -1 +1 @@
1
- {"version":3,"file":"PopupRoot.js","sources":["../../../src/components/Popup/PopupRoot.tsx"],"sourcesContent":["import React, { useCallback, forwardRef, useRef, AnimationEvent, TransitionEvent } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\n\nimport { usePopupContext } from './PopupContext';\nimport type { PopupRootProps } from './Popup.types';\nimport { PopupRootContainer, PopupView } from './Popup.styles';\nimport { classes } from './Popup.tokens';\n\n/**\n * Корень Popup.\n * Управляет показом/скрытием и анимацией всплывающего окна.\n */\nexport const PopupRoot = forwardRef<HTMLDivElement, PopupRootProps>(\n ({ id, placement, offset, frame, setVisible, children, role, zIndex, animationInfo, className, ...rest }, ref) => {\n const contentRef = useRef<HTMLDivElement | null>(null);\n const innerRef = useForkRef<HTMLDivElement>(contentRef, ref);\n\n const popupController = usePopupContext();\n\n const handleAnimationEnd = useCallback(\n (e: AnimationEvent<HTMLDivElement> | TransitionEvent<HTMLDivElement>) => {\n if (!contentRef || e.target !== contentRef.current) {\n return;\n }\n e.stopPropagation();\n if (animationInfo?.endAnimation) {\n popupController.unregister(id);\n setVisible(false);\n animationInfo.setEndAnimation(false);\n }\n },\n [popupController.unregister, animationInfo?.endAnimation, setVisible],\n );\n\n return (\n <PopupRootContainer\n className={classes.root}\n ref={innerRef}\n placement={placement}\n offset={offset}\n zIndex={zIndex}\n onAnimationEnd={handleAnimationEnd}\n onTransitionEnd={handleAnimationEnd}\n {...rest}\n >\n <PopupView role={role}>{children}</PopupView>\n </PopupRootContainer>\n );\n },\n);\n"],"names":["PopupRoot","forwardRef","_ref","ref","id","placement","offset","setVisible","children","role","zIndex","animationInfo","rest","_objectWithoutProperties","_excluded","contentRef","useRef","innerRef","useForkRef","popupController","usePopupContext","handleAnimationEnd","useCallback","e","target","current","stopPropagation","endAnimation","unregister","setEndAnimation","React","createElement","PopupRootContainer","_extends","className","classes","root","onAnimationEnd","onTransitionEnd","PopupView"],"mappings":";;;;;;;;;AAQA;AACA;AACA;AACA;AACO,IAAMA,SAAS,gBAAGC,UAAU,CAC/B,UAAAC,IAAA,EAA0GC,GAAG,EAAK;AAAA,EAAA,IAA/GC,EAAE,GAAAF,IAAA,CAAFE,EAAE,CAAA;IAAEC,SAAS,GAAAH,IAAA,CAATG,SAAS,CAAA;IAAEC,MAAM,GAAAJ,IAAA,CAANI,MAAM,CAAA;IAASC,UAAU,GAAAL,IAAA,CAAVK,UAAU,CAAA;IAAEC,QAAQ,GAAAN,IAAA,CAARM,QAAQ,CAAA;IAAEC,IAAI,GAAAP,IAAA,CAAJO,IAAI,CAAA;IAAEC,MAAM,GAAAR,IAAA,CAANQ,MAAM,CAAA;IAAEC,aAAa,GAAAT,IAAA,CAAbS,aAAa,CAAA;IAAgBC,IAAI,GAAAC,wBAAA,CAAAX,IAAA,EAAAY,SAAA,EAAA;AAClG,EAAA,IAAMC,UAAU,GAAGC,MAAM,CAAwB,IAAI,CAAC,CAAA;AACtD,EAAA,IAAMC,QAAQ,GAAGC,UAAU,CAAiBH,UAAU,EAAEZ,GAAG,CAAC,CAAA;AAE5D,EAAA,IAAMgB,eAAe,GAAGC,eAAe,EAAE,CAAA;AAEzC,EAAA,IAAMC,kBAAkB,GAAGC,WAAW,CAClC,UAACC,CAAmE,EAAK;IACrE,IAAI,CAACR,UAAU,IAAIQ,CAAC,CAACC,MAAM,KAAKT,UAAU,CAACU,OAAO,EAAE;AAChD,MAAA,OAAA;AACJ,KAAA;IACAF,CAAC,CAACG,eAAe,EAAE,CAAA;AACnB,IAAA,IAAIf,aAAa,KAAbA,IAAAA,IAAAA,aAAa,eAAbA,aAAa,CAAEgB,YAAY,EAAE;AAC7BR,MAAAA,eAAe,CAACS,UAAU,CAACxB,EAAE,CAAC,CAAA;MAC9BG,UAAU,CAAC,KAAK,CAAC,CAAA;AACjBI,MAAAA,aAAa,CAACkB,eAAe,CAAC,KAAK,CAAC,CAAA;AACxC,KAAA;AACJ,GAAC,EACD,CAACV,eAAe,CAACS,UAAU,EAAEjB,aAAa,KAAA,IAAA,IAAbA,aAAa,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAbA,aAAa,CAAEgB,YAAY,EAAEpB,UAAU,CACxE,CAAC,CAAA;AAED,EAAA,oBACIuB,KAAA,CAAAC,aAAA,CAACC,kBAAkB,EAAAC,QAAA,CAAA;IACfC,SAAS,EAAEC,OAAO,CAACC,IAAK;AACxBjC,IAAAA,GAAG,EAAEc,QAAS;AACdZ,IAAAA,SAAS,EAAEA,SAAU;AACrBC,IAAAA,MAAM,EAAEA,MAAO;AACfI,IAAAA,MAAM,EAAEA,MAAO;AACf2B,IAAAA,cAAc,EAAEhB,kBAAmB;AACnCiB,IAAAA,eAAe,EAAEjB,kBAAAA;AAAmB,GAAA,EAChCT,IAAI,CAERkB,eAAAA,KAAA,CAAAC,aAAA,CAACQ,SAAS,EAAA;AAAC9B,IAAAA,IAAI,EAAEA,IAAAA;GAAOD,EAAAA,QAAoB,CAC5B,CAAC,CAAA;AAE7B,CACJ;;;;"}
1
+ {"version":3,"file":"PopupRoot.js","sources":["../../../src/components/Popup/PopupRoot.tsx"],"sourcesContent":["import React, { useCallback, forwardRef, useRef, AnimationEvent, TransitionEvent } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\n\nimport { usePopupContext } from './PopupContext';\nimport type { PopupRootProps } from './Popup.types';\nimport { PopupRootContainer, PopupView } from './Popup.styles';\nimport { classes } from './Popup.tokens';\n\n/**\n * Корень Popup.\n * Управляет показом/скрытием и анимацией всплывающего окна.\n */\nexport const PopupRoot = forwardRef<HTMLDivElement, PopupRootProps>(\n ({ id, placement, offset, setVisible, children, role, frame, zIndex, animationInfo, ...rest }, ref) => {\n const contentRef = useRef<HTMLDivElement | null>(null);\n const innerRef = useForkRef<HTMLDivElement>(contentRef, ref);\n\n const popupController = usePopupContext();\n\n const handleAnimationEnd = useCallback(\n (e: AnimationEvent<HTMLDivElement> | TransitionEvent<HTMLDivElement>) => {\n if (!contentRef || e.target !== contentRef.current) {\n return;\n }\n e.stopPropagation();\n if (animationInfo?.endAnimation) {\n popupController.unregister(id);\n setVisible(false);\n animationInfo.setEndAnimation(false);\n }\n },\n [popupController.unregister, animationInfo?.endAnimation, setVisible],\n );\n\n return (\n <PopupRootContainer\n className={classes.root}\n ref={innerRef}\n placement={placement}\n offset={offset}\n zIndex={zIndex}\n frame={frame}\n onAnimationEnd={handleAnimationEnd}\n onTransitionEnd={handleAnimationEnd}\n {...rest}\n >\n <PopupView role={role}>{children}</PopupView>\n </PopupRootContainer>\n );\n },\n);\n"],"names":["PopupRoot","forwardRef","_ref","ref","id","placement","offset","setVisible","children","role","frame","zIndex","animationInfo","rest","_objectWithoutProperties","_excluded","contentRef","useRef","innerRef","useForkRef","popupController","usePopupContext","handleAnimationEnd","useCallback","e","target","current","stopPropagation","endAnimation","unregister","setEndAnimation","React","createElement","PopupRootContainer","_extends","className","classes","root","onAnimationEnd","onTransitionEnd","PopupView"],"mappings":";;;;;;;;;AAQA;AACA;AACA;AACA;AACO,IAAMA,SAAS,gBAAGC,UAAU,CAC/B,UAAAC,IAAA,EAA+FC,GAAG,EAAK;AAAA,EAAA,IAApGC,EAAE,GAAAF,IAAA,CAAFE,EAAE;IAAEC,SAAS,GAAAH,IAAA,CAATG,SAAS;IAAEC,MAAM,GAAAJ,IAAA,CAANI,MAAM;IAAEC,UAAU,GAAAL,IAAA,CAAVK,UAAU;IAAEC,QAAQ,GAAAN,IAAA,CAARM,QAAQ;IAAEC,IAAI,GAAAP,IAAA,CAAJO,IAAI;IAAEC,KAAK,GAAAR,IAAA,CAALQ,KAAK;IAAEC,MAAM,GAAAT,IAAA,CAANS,MAAM;IAAEC,aAAa,GAAAV,IAAA,CAAbU,aAAa;AAAKC,IAAAA,IAAI,GAAAC,wBAAA,CAAAZ,IAAA,EAAAa,SAAA,CAAA,CAAA;AACvF,EAAA,IAAMC,UAAU,GAAGC,MAAM,CAAwB,IAAI,CAAC,CAAA;AACtD,EAAA,IAAMC,QAAQ,GAAGC,UAAU,CAAiBH,UAAU,EAAEb,GAAG,CAAC,CAAA;AAE5D,EAAA,IAAMiB,eAAe,GAAGC,eAAe,EAAE,CAAA;AAEzC,EAAA,IAAMC,kBAAkB,GAAGC,WAAW,CAClC,UAACC,CAAmE,EAAK;IACrE,IAAI,CAACR,UAAU,IAAIQ,CAAC,CAACC,MAAM,KAAKT,UAAU,CAACU,OAAO,EAAE;AAChD,MAAA,OAAA;AACJ,KAAA;IACAF,CAAC,CAACG,eAAe,EAAE,CAAA;AACnB,IAAA,IAAIf,aAAa,KAAbA,IAAAA,IAAAA,aAAa,eAAbA,aAAa,CAAEgB,YAAY,EAAE;AAC7BR,MAAAA,eAAe,CAACS,UAAU,CAACzB,EAAE,CAAC,CAAA;MAC9BG,UAAU,CAAC,KAAK,CAAC,CAAA;AACjBK,MAAAA,aAAa,CAACkB,eAAe,CAAC,KAAK,CAAC,CAAA;AACxC,KAAA;AACJ,GAAC,EACD,CAACV,eAAe,CAACS,UAAU,EAAEjB,aAAa,KAAA,IAAA,IAAbA,aAAa,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAbA,aAAa,CAAEgB,YAAY,EAAErB,UAAU,CACxE,CAAC,CAAA;AAED,EAAA,oBACIwB,KAAA,CAAAC,aAAA,CAACC,kBAAkB,EAAAC,QAAA,CAAA;IACfC,SAAS,EAAEC,OAAO,CAACC,IAAK;AACxBlC,IAAAA,GAAG,EAAEe,QAAS;AACdb,IAAAA,SAAS,EAAEA,SAAU;AACrBC,IAAAA,MAAM,EAAEA,MAAO;AACfK,IAAAA,MAAM,EAAEA,MAAO;AACfD,IAAAA,KAAK,EAAEA,KAAM;AACb4B,IAAAA,cAAc,EAAEhB,kBAAmB;AACnCiB,IAAAA,eAAe,EAAEjB,kBAAAA;AAAmB,GAAA,EAChCT,IAAI,CAERkB,eAAAA,KAAA,CAAAC,aAAA,CAACQ,SAAS,EAAA;AAAC/B,IAAAA,IAAI,EAAEA,IAAAA;GAAOD,EAAAA,QAAoB,CAC5B,CAAC,CAAA;AAE7B,CACJ;;;;"}
@@ -2,7 +2,7 @@ import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2 } from
2
2
  import { useState, useEffect } from 'react';
3
3
  import { usePopupContext } from '../PopupContext.js';
4
4
 
5
- // Хук для поключения анимации
5
+ // Хук для подключения анимации
6
6
  var usePopupAnimation = function usePopupAnimation() {
7
7
  var _useState = useState(false),
8
8
  _useState2 = _slicedToArray(_useState, 2),
@@ -74,7 +74,8 @@ var usePopup = function usePopup(_ref) {
74
74
  isVisible: isVisible,
75
75
  setVisible: setVisible,
76
76
  animationInfo: animationInfo,
77
- withAnimation: withAnimation
77
+ withAnimation: withAnimation,
78
+ rootId: popupController.rootId
78
79
  };
79
80
  };
80
81
 
@@ -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
@@ -282,8 +282,9 @@
282
282
  .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;}
283
283
 
284
284
 
285
- .Popup_styles_141jyqa_p1cjo3us__ed39c2a3{position:relative;max-width:100%;pointer-events:all;}
286
- .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);}
285
+ .Popup_styles_gq4luz_s1cjo3us__bb610b96{width:0;}
286
+ .Popup_styles_gq4luz_p5u7tqa__bb610b96{position:relative;max-width:100%;pointer-events:all;}
287
+ .Popup_styles_gq4luz_p1f40oul__bb610b96{position:var(--p1f40oul-0);z-index:var(--p1f40oul-1);left:var(--p1f40oul-2);right:var(--p1f40oul-3);top:var(--p1f40oul-4);bottom:var(--p1f40oul-5);-webkit-transform:var(--p1f40oul-6);-ms-transform:var(--p1f40oul-6);transform:var(--p1f40oul-6);}
287
288
 
288
289
  .NotificationsPortal_6417q6_s19gbs9t__4166aeb6 > .NotificationsPortal_6417q6_popupBaseRoot__4166aeb6{overflow:hidden;}
289
290
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salutejs/plasma-new-hope",
3
- "version": "0.162.1-dev.0",
3
+ "version": "0.162.2-dev.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": "79f52e0ff17fff31a9512b882ee619b4d234b78d"
127
+ "gitHead": "55b24768e7a0a17614e998ee2286d89c36c0ee82"
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,46 @@ 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,
138
+ frame: frame,
171
139
  animationInfo: animationInfo,
172
140
  setVisible: setVisible
173
- }, children))));
141
+ }, children));
142
+ if (typeof frame !== 'string' && frame && frame.current) {
143
+ return /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
144
+ container: frame.current
145
+ }, rootNode);
146
+ }
147
+ var withFrameId = typeof frame === 'string' && frame !== 'document';
148
+ var containerElement = withFrameId && _utils.canUseDOM && document.getElementById(frame);
149
+ if (containerElement) {
150
+ return /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
151
+ container: containerElement
152
+ }, /*#__PURE__*/_react["default"].createElement(_Popup2.StyledPortalContainer, {
153
+ ref: portalRef
154
+ }, portalRef.current && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
155
+ container: portalRef.current
156
+ }, rootNode)), ' ');
157
+ }
158
+ var globalPortal = _utils.canUseDOM && document.getElementById(rootId);
159
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, globalPortal && /*#__PURE__*/_react["default"].createElement(_Portal.Portal, {
160
+ container: globalPortal
161
+ }, rootNode));
174
162
  });
175
163
  };
176
164
  var popupConfig = exports.popupConfig = {
@@ -3,34 +3,40 @@
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
12
  })([""]);
13
- var PopupView = exports.PopupView = /*#__PURE__*/_styledComponents["default"].div.withConfig({
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) {
19
- var zIndex = _ref.zIndex;
20
- return zIndex || _utils.DEFAULT_Z_INDEX;
20
+ componentId: "plasma-new-hope__sc-rkhnjn-3"
21
+ })(["position:", ";z-index:", ";left:", ";right:", ";top:", ";bottom:", ";transform:", ";"], function (_ref) {
22
+ var frame = _ref.frame;
23
+ return frame === 'document' ? 'fixed' : 'absolute';
21
24
  }, function (_ref2) {
22
- var position = _ref2.position;
23
- return position.left || '';
25
+ var zIndex = _ref2.zIndex;
26
+ return zIndex || _utils.DEFAULT_Z_INDEX;
24
27
  }, function (_ref3) {
25
28
  var position = _ref3.position;
26
- return position.right || '';
29
+ return position.left || '';
27
30
  }, function (_ref4) {
28
31
  var position = _ref4.position;
29
- return position.top || '';
32
+ return position.right || '';
30
33
  }, function (_ref5) {
31
34
  var position = _ref5.position;
32
- return position.bottom || '';
35
+ return position.top || '';
33
36
  }, function (_ref6) {
34
37
  var position = _ref6.position;
38
+ return position.bottom || '';
39
+ }, function (_ref7) {
40
+ var position = _ref7.position;
35
41
  return position.transform || '';
36
42
  });
@@ -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", "frame", "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,12 @@ 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,
30
+ frame = _ref.frame,
31
31
  zIndex = _ref.zIndex,
32
32
  animationInfo = _ref.animationInfo,
33
- className = _ref.className,
34
33
  rest = _objectWithoutProperties(_ref, _excluded);
35
34
  var contentRef = (0, _react.useRef)(null);
36
35
  var innerRef = (0, _plasmaCore.useForkRef)(contentRef, ref);
@@ -52,6 +51,7 @@ var PopupRoot = exports.PopupRoot = /*#__PURE__*/(0, _react.forwardRef)(function
52
51
  placement: placement,
53
52
  offset: offset,
54
53
  zIndex: zIndex,
54
+ frame: frame,
55
55
  onAnimationEnd: handleAnimationEnd,
56
56
  onTransitionEnd: handleAnimationEnd
57
57
  }, rest), /*#__PURE__*/_react["default"].createElement(_Popup.PopupView, {
@@ -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: [