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

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

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

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

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

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

@@ -23,11 +23,9 @@ var POPUP_PORTAL_ID = exports.POPUP_PORTAL_ID = 'plasma-popup-root';
 var items = [];
 var PopupContext = /*#__PURE__*/(0, _react.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');
   }
@@ -38,7 +36,6 @@ var usePopupContext = exports.usePopupContext = function usePopupContext() {
 var PopupProvider = exports.PopupProvider = function PopupProvider(_ref) {
   var children = _ref.children;
   var prevBodyOverflowY = (0, _react.useRef)(typeof document !== 'undefined' ? document.body.style.overflowY : '');
-  // eslint-disable-next-line no-shadow
   var _useState = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],

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

@@ -18,7 +18,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-// Хук для подключения анимации
+// Хук для поключения анимации
 var usePopupAnimation = function usePopupAnimation() {
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),

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

@@ -126,7 +126,7 @@ var textAreaRoot = exports.textAreaRoot = function textAreaRoot(Root) {
       _useState6 = _slicedToArray(_useState5, 2),
       uncontrolledValue = _useState6[0],
       setUncontrolledValue = _useState6[1];
-    var outerRef = innerRef && 'current' in innerRef ? innerRef : /*#__PURE__*/(0, _react.createRef)();
+    var outerRef = /*#__PURE__*/(0, _react.createRef)();
     var innerOptional = required ? false : optional;
     var hasHelper = Boolean(leftHelper || rightHelper || helperText);
     var hasOuterLabel = Boolean(label && labelPlacement === 'outer');
@@ -157,6 +157,7 @@ var textAreaRoot = exports.textAreaRoot = function textAreaRoot(Root) {
       if (value === undefined) {
         setUncontrolledValue(event === null || event === void 0 ? void 0 : event.target.value);
       }
+      console.log(event);
       onChange === null || onChange === void 0 || onChange(event);
     }, [value, onChange]);
     var dynamicLabelClasses = getDynamicLabelClasses(_objectSpread({
@@ -198,7 +199,7 @@ var textAreaRoot = exports.textAreaRoot = function textAreaRoot(Root) {
       hasContentRight: Boolean(contentRight),
       hasHelper: hasHelper,
       applyCustomWidth: applyCustomWidth,
-      ref: outerRef,
+      ref: (0, _utils.mergeRefs)(outerRef, innerRef),
       disabled: disabled,
       height: autoResize ? minAuto : height,
       width: width,

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

@@ -0,0 +1,68 @@
+import { useForm } from 'react-hook-form';
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+
+import { WithTheme } from '../../../_helpers';
+import { Button } from '../Button/Button';
+import { TextField } from '../TextField/TextField';
+import { TextArea } from '../TextArea/TextArea'; // TextArea.tsx 120 строка, не работает из-за некорректного ref
+import { Checkbox } from '../Checkbox/Checkbox';
+import { Switch } from '../Switch/Switch';
+import { Radiobox } from '../Radiobox/Radiobox';
+import { RadioGroup } from '../../../../components/Radiobox';
+
+type StoryDropdownProps = {};
+
+const langName = 'language';
+const itemsRadiobox = [
+    { langName, value: 'c', label: 'C', disabled: false },
+    { langName, value: 'cpp', label: 'C++', disabled: false },
+    { langName, value: 'assembly', label: 'Assembly', disabled: false },
+];
+
+const DefaultForm = () => {
+    const { register, handleSubmit } = useForm();
+    const onSubmit = (data) => {
+        console.log(data);
+    };
+
+    return (
+        <form onSubmit={handleSubmit(onSubmit)} style={{ display: 'flex', flexDirection: 'column', gap: '20px' }}>
+            <TextField {...register('textfield')} placeholder="Textfield" required={false} />
+            <TextArea {...register('textarea')} autoResize placeholder="Textarea" />
+            <Checkbox {...register('checkbox')} label="Checkbox" />
+            <Switch {...register('switch')} label="Switch" labelPosition="after" />
+            <RadioGroup aria-labelledby="radiogroup-title-id">
+                <div id="radiogroup-title-id" style={{ margin: '1rem 0', fontWeight: '600' }}>
+                    Выберите язык программирования для изучения.
+                </div>
+                {itemsRadiobox.map((item) => (
+                    <Radiobox
+                        key={item.value}
+                        value={item.value}
+                        label={item.label}
+                        disabled={item.disabled}
+                        {...register('radiobox')}
+                    />
+                ))}
+            </RadioGroup>
+            <Button type="submit">Отправить</Button>
+        </form>
+    );
+};
+
+const meta: Meta<StoryDropdownProps> = {
+    title: 'plasma_b2c/Form',
+    decorators: [WithTheme],
+    component: DefaultForm,
+};
+
+export default meta;
+
+const StoryNormal = () => {
+    return <DefaultForm />;
+};
+
+export const Default: StoryObj<StoryDropdownProps> = {
+    render: () => <StoryNormal />,
+};

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

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

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

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

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

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

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

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

package/styled-components/cjs/utils/index.js

@@ -12,6 +12,8 @@ var _exportNames = {
   IS_REACT_18: true,
   safeUseId: true,
   isNumber: true,
+  mergeRefs: true,
+  setRefList: true,
   isEmpty: true
 };
 Object.defineProperty(exports, "IS_REACT_18", {
@@ -51,17 +53,30 @@ Object.defineProperty(exports, "isNumber", {
     return _isNumber.isNumber;
   }
 });
+Object.defineProperty(exports, "mergeRefs", {
+  enumerable: true,
+  get: function get() {
+    return _setRefList.mergeRefs;
+  }
+});
 Object.defineProperty(exports, "safeUseId", {
   enumerable: true,
   get: function get() {
     return _react.safeUseId;
   }
 });
+Object.defineProperty(exports, "setRefList", {
+  enumerable: true,
+  get: function get() {
+    return _setRefList.setRefList;
+  }
+});
 var _canUseDOM = /*#__PURE__*/require("./canUseDOM");
 var _extractTextFrom = /*#__PURE__*/require("./extractTextFrom");
 var _getSizeValueFromProp = /*#__PURE__*/require("./getSizeValueFromProp");
 var _react = /*#__PURE__*/require("./react");
 var _isNumber = /*#__PURE__*/require("./isNumber");
+var _setRefList = /*#__PURE__*/require("./setRefList");
 var _isEmpty = /*#__PURE__*/require("./isEmpty");
 var _getPopoverPlacement = /*#__PURE__*/require("./getPopoverPlacement");
 Object.keys(_getPopoverPlacement).forEach(function (key) {

package/styled-components/cjs/utils/setRefList.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeRefs = mergeRefs;
+exports.setRefList = setRefList;
+function mergeRefs() {
+  for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) {
+    refs[_key] = arguments[_key];
+  }
+  return function (val) {
+    setRefList.apply(void 0, [val].concat(refs));
+  };
+}
+function setRefList(val) {
+  for (var _len2 = arguments.length, refs = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+    refs[_key2 - 1] = arguments[_key2];
+  }
+  refs.forEach(function (ref) {
+    if (typeof ref === 'function') {
+      ref(val);
+    } else if (ref != null) {
+      ref.current = val;
+    }
+  });
+}