@salutejs/plasma-new-hope 0.141.0 → 0.141.2-canary.1412.10789995138.0

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

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

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

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

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

@@ -14,9 +14,11 @@ export var POPUP_PORTAL_ID = 'plasma-popup-root';
 var items = [];
 var PopupContext = /*#__PURE__*/createContext({
   items: items,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   register: function register(_info) {
     throw new Error('Function not implemented. Add PopupProvider');
   },
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   unregister: function unregister(_id) {
     throw new Error('Function not implemented. Add PopupProvider');
   }
@@ -27,6 +29,7 @@ export var usePopupContext = function usePopupContext() {
 export var PopupProvider = function PopupProvider(_ref) {
   var children = _ref.children;
   var prevBodyOverflowY = useRef(typeof document !== 'undefined' ? document.body.style.overflowY : '');
+  // eslint-disable-next-line no-shadow
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],

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

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useEffect, useState } from 'react';
 import { usePopupContext } from '../PopupContext';
 
-// Хук для поключения анимации
+// Хук для подключения анимации
 var usePopupAnimation = function usePopupAnimation() {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),

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

@@ -80,7 +80,7 @@ const StyledButton = styled(Button)`
 `;
 
 const StyledWrapper = styled.div`
-    height: 1200px;
+    height: 300px;
 `;
 
 const Content = styled.div`

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

@@ -55,7 +55,7 @@ const StyledButton = styled(Button)`
 `;
 
 const StyledWrapper = styled.div`
-    height: 1200px;
+    height: 600px;
 `;
 
 const OtherContent = styled.div`

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

@@ -80,7 +80,7 @@ const StyledButton = styled(Button)`
 `;
 
 const StyledWrapper = styled.div`
-    height: 1200px;
+    height: 300px;
 `;
 
 const Content = styled.div`

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

@@ -55,7 +55,7 @@ const StyledButton = styled(Button)`
 `;
 
 const StyledWrapper = styled.div`
-    height: 1200px;
+    height: 600px;
 `;
 
 const OtherContent = styled.div`

package/types/components/Popup/Popup.d.ts

@@ -3,7 +3,7 @@ import { RootProps } from '../../engines/types';
 import type { PopupPlacement, PopupPositionType, PopupProps } from './Popup.types';
 export declare const handlePosition: (placement: PopupPlacement, offset: [number, number] | [string, string]) => PopupPositionType;
 /**
- * Базовый копмонент Popup.
+ * Базовый компонент Popup.
  */
 export declare const popupRoot: (Root: RootProps<HTMLDivElement, PopupProps>) => React.ForwardRefExoticComponent<PopupProps & React.RefAttributes<HTMLDivElement>>;
 export declare const popupConfig: {

package/types/components/Popup/Popup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Popup.d.ts","sourceRoot":"","sources":["../../../src/components/Popup/Popup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIhD,OAAO,KAAK,EAAuB,cAAc,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMxG,eAAO,MAAM,cAAc,cACZ,cAAc,UACjB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAC5C,iBA8DF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,SAAU,UAAU,cAAc,EAAE,UAAU,CAAC,sFAyGhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBA3GQ,UAAU,cAAc,EAAE,UAAU,CAAC;;;;CAkHpE,CAAC"}
+{"version":3,"file":"Popup.d.ts","sourceRoot":"","sources":["../../../src/components/Popup/Popup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAIlD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIhD,OAAO,KAAK,EAAuB,cAAc,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAOxG,eAAO,MAAM,cAAc,cACZ,cAAc,UACjB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAC5C,iBA8DF,CAAC;AAoIF;;GAEG;AACH,eAAO,MAAM,SAAS,SAAU,UAAU,cAAc,EAAE,UAAU,CAAC,sFAkGhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBApGQ,UAAU,cAAc,EAAE,UAAU,CAAC;;;;CA2GpE,CAAC"}

package/types/components/Popup/Popup.styles.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { PopupRootContainerProps } from './Popup.types';
 export declare const StyledPortal: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & Record<never, unknown>>;
+export declare const StyledPortalContainer: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & Record<never, unknown>>;
 export declare const PopupView: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & Record<never, unknown>>;
 export declare const PopupRootContainer: import("@linaria/react").StyledComponent<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & PopupRootContainerProps>;
 //# sourceMappingURL=Popup.styles.d.ts.map

package/types/components/Popup/Popup.styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Popup.styles.d.ts","sourceRoot":"","sources":["../../../src/components/Popup/Popup.styles.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAG7D,eAAO,MAAM,YAAY,qKAAe,CAAC;AAEzC,eAAO,MAAM,SAAS,qKAIrB,CAAC;AAEF,eAAO,MAAM,kBAAkB,sKAQ9B,CAAC"}
+{"version":3,"file":"Popup.styles.d.ts","sourceRoot":"","sources":["../../../src/components/Popup/Popup.styles.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAG7D,eAAO,MAAM,YAAY,qKAgBxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,qKAEjC,CAAC;AAEF,eAAO,MAAM,SAAS,qKAIrB,CAAC;AAEF,eAAO,MAAM,kBAAkB,sKAQ9B,CAAC"}

package/types/components/Popup/PopupContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PopupContext.d.ts","sourceRoot":"","sources":["../../../src/components/Popup/PopupContext.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAkD,EAAE,EAAE,iBAAiB,EAAU,MAAM,OAAO,CAAC;AAI7G,OAAO,KAAK,EAAE,gBAAgB,EAAa,MAAM,eAAe,CAAC;AAEjE,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAcnD,eAAO,MAAM,eAAe,wBAAiC,CAAC;AAE9D,eAAO,MAAM,aAAa,EAAE,EAAE,CAAC,iBAAiB,CAmD/C,CAAC"}
+{"version":3,"file":"PopupContext.d.ts","sourceRoot":"","sources":["../../../src/components/Popup/PopupContext.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAkD,EAAE,EAAE,iBAAiB,EAAU,MAAM,OAAO,CAAC;AAI7G,OAAO,KAAK,EAAE,gBAAgB,EAAa,MAAM,eAAe,CAAC;AAEjE,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAgBnD,eAAO,MAAM,eAAe,wBAAiC,CAAC;AAE9D,eAAO,MAAM,aAAa,EAAE,EAAE,CAAC,iBAAiB,CAoD/C,CAAC"}

package/cjs/components/Popup/Popup.styles_141jyqa.css

@@ -1,3 +0,0 @@
-
-.p1cjo3us{position:relative;max-width:100%;pointer-events:all;}
-.p5u7tqa{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);}

package/es/components/Popup/Popup.styles_141jyqa.css

@@ -1,3 +0,0 @@
-
-.p1cjo3us{position:relative;max-width:100%;pointer-events:all;}
-.p5u7tqa{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);}