@salutejs/plasma-new-hope 0.118.0-dev.0 → 0.118.1-canary.1345.10282607319.0

package/es/utils/focusManager.js

@@ -0,0 +1,52 @@
+import { createClass as _createClass, classCallCheck as _classCallCheck, defineProperty as _defineProperty } from '../_virtual/_rollupPluginBabelHelpers.js';
+import { findTabbableDescendants } from './tabbable.js';
+
+/**
+ *  Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.
+ *  Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.
+ * */
+var FocusManager = /*#__PURE__*/_createClass(function FocusManager() {
+  var _this = this;
+  _classCallCheck(this, FocusManager);
+  // массив с элементами, которые нужно зафокусить после анмаунта
+  _defineProperty(this, "focusAfterElements", []);
+  // массив с trap нодами
+  _defineProperty(this, "focusNodes", []);
+  _defineProperty(this, "handleFocus", function () {
+    // Фокус всегда должен находиться внутри необходимой ноды
+    var focusNode = _this.focusNodes[_this.focusNodes.length - 1];
+    if (!focusNode || focusNode.contains(document.activeElement)) {
+      return;
+    }
+
+    // Выделяем первый tabbable элемент
+    var el = findTabbableDescendants(focusNode)[0] || focusNode;
+    el.focus();
+  });
+  // добавление на фокус после анмаунта
+  _defineProperty(this, "markForFocusAfter", function (focusAfterNode) {
+    var node = focusAfterNode && focusAfterNode.current ? focusAfterNode.current : document.activeElement;
+    _this.focusAfterElements.push(node);
+  });
+  // фокус на необходимый элемент
+  _defineProperty(this, "returnFocus", function () {
+    var _this$focusAfterEleme;
+    var toFocus = (_this$focusAfterEleme = _this.focusAfterElements.pop()) !== null && _this$focusAfterEleme !== void 0 ? _this$focusAfterEleme : null;
+    if (toFocus) {
+      toFocus.focus();
+    }
+  });
+  // при маунте ноды
+  _defineProperty(this, "setupScopedFocus", function (element) {
+    _this.focusNodes.push(element);
+    document.addEventListener('focusin', _this.handleFocus, true);
+  });
+  // при анмаунте
+  _defineProperty(this, "teardownScopedFocus", function () {
+    _this.focusNodes.pop();
+    document.removeEventListener('focusin', _this.handleFocus);
+  });
+});
+
+export { FocusManager };
+//# sourceMappingURL=focusManager.js.map

package/es/utils/focusManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"focusManager.js","sources":["../../src/utils/focusManager.ts"],"sourcesContent":["import { findTabbableDescendants } from './tabbable';\n\n/**\n *  Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.\n *  Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.\n * */\nexport class FocusManager {\n    // массив с элементами, которые нужно зафокусить после анмаунта\n    private focusAfterElements: Array<HTMLElement> = [];\n\n    // массив с trap нодами\n    private focusNodes: Array<HTMLElement> = [];\n\n    private handleFocus = () => {\n        // Фокус всегда должен находиться внутри необходимой ноды\n        const focusNode = this.focusNodes[this.focusNodes.length - 1];\n\n        if (!focusNode || focusNode.contains(document.activeElement)) {\n            return;\n        }\n\n        // Выделяем первый tabbable элемент\n        const el = findTabbableDescendants(focusNode)[0] || focusNode;\n        el.focus();\n    };\n\n    // добавление на фокус после анмаунта\n    public markForFocusAfter = (focusAfterNode?: React.RefObject<HTMLElement>) => {\n        const node =\n            focusAfterNode && focusAfterNode.current ? focusAfterNode.current : (document.activeElement as HTMLElement);\n        this.focusAfterElements.push(node);\n    };\n\n    // фокус на необходимый элемент\n    public returnFocus = () => {\n        const toFocus = this.focusAfterElements.pop() ?? null;\n        if (toFocus) {\n            toFocus.focus();\n        }\n    };\n\n    // при маунте ноды\n    public setupScopedFocus = (element: HTMLElement) => {\n        this.focusNodes.push(element);\n        document.addEventListener('focusin', this.handleFocus, true);\n    };\n\n    // при анмаунте\n    public teardownScopedFocus = () => {\n        this.focusNodes.pop();\n        document.removeEventListener('focusin', this.handleFocus);\n    };\n}\n"],"names":["FocusManager","_createClass","_this","_classCallCheck","_defineProperty","focusNode","focusNodes","length","contains","document","activeElement","el","findTabbableDescendants","focus","focusAfterNode","node","current","focusAfterElements","push","_this$focusAfterEleme","toFocus","pop","element","addEventListener","handleFocus","removeEventListener"],"mappings":";;;AAEA;AACA;AACA;AACA;AACA,IAAaA,YAAY,gBAAAC,YAAA,CAAA,SAAAD,YAAA,GAAA;AAAA,EAAA,IAAAE,KAAA,GAAA,IAAA,CAAA;AAAAC,EAAAA,eAAA,OAAAH,YAAA,CAAA,CAAA;AACrB;AAAAI,EAAAA,eAAA,6BACiD,EAAE,CAAA,CAAA;AAEnD;AAAAA,EAAAA,eAAA,qBACyC,EAAE,CAAA,CAAA;AAAAA,EAAAA,eAAA,sBAErB,YAAM;AACxB;AACA,IAAA,IAAMC,SAAS,GAAGH,KAAI,CAACI,UAAU,CAACJ,KAAI,CAACI,UAAU,CAACC,MAAM,GAAG,CAAC,CAAC,CAAA;IAE7D,IAAI,CAACF,SAAS,IAAIA,SAAS,CAACG,QAAQ,CAACC,QAAQ,CAACC,aAAa,CAAC,EAAE;AAC1D,MAAA,OAAA;AACJ,KAAA;;AAEA;IACA,IAAMC,EAAE,GAAGC,uBAAuB,CAACP,SAAS,CAAC,CAAC,CAAC,CAAC,IAAIA,SAAS,CAAA;IAC7DM,EAAE,CAACE,KAAK,EAAE,CAAA;GACb,CAAA,CAAA;AAED;EAAAT,eAAA,CAAA,IAAA,EAAA,mBAAA,EAC2B,UAACU,cAA6C,EAAK;AAC1E,IAAA,IAAMC,IAAI,GACND,cAAc,IAAIA,cAAc,CAACE,OAAO,GAAGF,cAAc,CAACE,OAAO,GAAIP,QAAQ,CAACC,aAA6B,CAAA;AAC/GR,IAAAA,KAAI,CAACe,kBAAkB,CAACC,IAAI,CAACH,IAAI,CAAC,CAAA;GACrC,CAAA,CAAA;AAED;AAAAX,EAAAA,eAAA,sBACqB,YAAM;AAAA,IAAA,IAAAe,qBAAA,CAAA;AACvB,IAAA,IAAMC,OAAO,GAAAD,CAAAA,qBAAA,GAAGjB,KAAI,CAACe,kBAAkB,CAACI,GAAG,EAAE,MAAAF,IAAAA,IAAAA,qBAAA,KAAAA,KAAAA,CAAAA,GAAAA,qBAAA,GAAI,IAAI,CAAA;AACrD,IAAA,IAAIC,OAAO,EAAE;MACTA,OAAO,CAACP,KAAK,EAAE,CAAA;AACnB,KAAA;GACH,CAAA,CAAA;AAED;EAAAT,eAAA,CAAA,IAAA,EAAA,kBAAA,EAC0B,UAACkB,OAAoB,EAAK;AAChDpB,IAAAA,KAAI,CAACI,UAAU,CAACY,IAAI,CAACI,OAAO,CAAC,CAAA;IAC7Bb,QAAQ,CAACc,gBAAgB,CAAC,SAAS,EAAErB,KAAI,CAACsB,WAAW,EAAE,IAAI,CAAC,CAAA;GAC/D,CAAA,CAAA;AAED;AAAApB,EAAAA,eAAA,8BAC6B,YAAM;AAC/BF,IAAAA,KAAI,CAACI,UAAU,CAACe,GAAG,EAAE,CAAA;IACrBZ,QAAQ,CAACgB,mBAAmB,CAAC,SAAS,EAAEvB,KAAI,CAACsB,WAAW,CAAC,CAAA;GAC5D,CAAA,CAAA;AAAA,CAAA;;;;"}

package/es/utils/scopeTab.js

@@ -0,0 +1,33 @@
+import { findTabbableDescendants } from './tabbable.js';
+
+/**
+ * Управлление фокусом лишь внутри ноды через tab
+ * @param node
+ * @param event
+ */
+var scopeTab = function scopeTab(node, event) {
+  var tabbable = findTabbableDescendants(node);
+  if (!tabbable.length) {
+    event.preventDefault();
+    return;
+  }
+
+  // смотрим, является ли элемент крайним - первый или последним
+  var finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];
+  var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
+
+  // если не является, то передаем обработку таба самому браузеру
+  if (!leavingFinalTabbable) {
+    return;
+  }
+
+  // иначе зацкливаемся
+  event.preventDefault();
+  var target = tabbable[event.shiftKey ? tabbable.length - 1 : 0];
+  if (target) {
+    target.focus();
+  }
+};
+
+export { scopeTab };
+//# sourceMappingURL=scopeTab.js.map

package/es/utils/scopeTab.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scopeTab.js","sources":["../../src/utils/scopeTab.ts"],"sourcesContent":["import { findTabbableDescendants } from './tabbable';\n\n/**\n * Управлление фокусом лишь внутри ноды через tab\n * @param node\n * @param event\n */\nexport const scopeTab = (node: HTMLElement, event: KeyboardEvent) => {\n    const tabbable = findTabbableDescendants(node);\n    if (!tabbable.length) {\n        event.preventDefault();\n        return;\n    }\n\n    // смотрим, является ли элемент крайним - первый или последним\n    const finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];\n    const leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;\n\n    // если не является, то передаем обработку таба самому браузеру\n    if (!leavingFinalTabbable) {\n        return;\n    }\n\n    // иначе зацкливаемся\n    event.preventDefault();\n    const target = tabbable[event.shiftKey ? tabbable.length - 1 : 0];\n    if (target) {\n        target.focus();\n    }\n};\n"],"names":["scopeTab","node","event","tabbable","findTabbableDescendants","length","preventDefault","finalTabbable","shiftKey","leavingFinalTabbable","document","activeElement","target","focus"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACO,IAAMA,QAAQ,GAAG,SAAXA,QAAQA,CAAIC,IAAiB,EAAEC,KAAoB,EAAK;AACjE,EAAA,IAAMC,QAAQ,GAAGC,uBAAuB,CAACH,IAAI,CAAC,CAAA;AAC9C,EAAA,IAAI,CAACE,QAAQ,CAACE,MAAM,EAAE;IAClBH,KAAK,CAACI,cAAc,EAAE,CAAA;AACtB,IAAA,OAAA;AACJ,GAAA;;AAEA;AACA,EAAA,IAAMC,aAAa,GAAGJ,QAAQ,CAACD,KAAK,CAACM,QAAQ,GAAG,CAAC,GAAGL,QAAQ,CAACE,MAAM,GAAG,CAAC,CAAC,CAAA;AACxE,EAAA,IAAMI,oBAAoB,GAAGF,aAAa,KAAKG,QAAQ,CAACC,aAAa,IAAIV,IAAI,KAAKS,QAAQ,CAACC,aAAa,CAAA;;AAExG;EACA,IAAI,CAACF,oBAAoB,EAAE;AACvB,IAAA,OAAA;AACJ,GAAA;;AAEA;EACAP,KAAK,CAACI,cAAc,EAAE,CAAA;AACtB,EAAA,IAAMM,MAAM,GAAGT,QAAQ,CAACD,KAAK,CAACM,QAAQ,GAAGL,QAAQ,CAACE,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;AACjE,EAAA,IAAIO,MAAM,EAAE;IACRA,MAAM,CAACC,KAAK,EAAE,CAAA;AAClB,GAAA;AACJ;;;;"}

package/es/utils/tabbable.js

@@ -0,0 +1,43 @@
+var tabbableNode = /input|select|textarea|button|object/;
+var focusSelector = /*#__PURE__*/['input', 'select', 'textarea', 'a', 'button', 'object', '[tabindex]', 'audio[controls]', 'video[controls]', '[contenteditable]:not([contenteditable="false"])'].join(',');
+var isHidden = function isHidden(el) {
+  return el.offsetWidth <= 0 && el.offsetHeight <= 0 || el.style.display === 'none' || el.style.visibility === 'hidden' || el.style.opacity === '0';
+};
+var isVisible = function isVisible(element, parentContainer) {
+  var parentElement = element;
+  while (parentElement) {
+    if (parentElement === parentContainer || parentElement === document.body) {
+      break;
+    }
+    if (isHidden(parentElement)) {
+      return false;
+    }
+    parentElement = parentElement.parentNode;
+  }
+  return true;
+};
+var getElementTabIndex = function getElementTabIndex(element) {
+  var tabIndex = element.getAttribute('tabindex');
+  return tabIndex === null ? NaN : parseInt(tabIndex, 10);
+};
+var isFocusable = function isFocusable(element, parentContainer) {
+  var nodeName = element.nodeName.toLowerCase();
+  var isTabIndexNotNaN = !Number.isNaN(getElementTabIndex(element));
+  var res = tabbableNode.test(nodeName) && !element.disabled || (element instanceof HTMLAnchorElement ? element.href || isTabIndexNotNaN : isTabIndexNotNaN);
+  return Boolean(res) && isVisible(element, parentContainer);
+};
+var isTabble = function isTabble(element, parentContainer) {
+  var tabIndex = getElementTabIndex(element);
+  var isTabIndexNaN = Number.isNaN(tabIndex);
+  return (isTabIndexNaN || tabIndex >= 0) && isFocusable(element, parentContainer);
+};
+
+// Все элементы внутри данной ноды, до которых можно добраться табом
+var findTabbableDescendants = function findTabbableDescendants(element) {
+  return Array.from(element.querySelectorAll(focusSelector)).filter(function (el) {
+    return isTabble(el, element);
+  });
+};
+
+export { findTabbableDescendants, focusSelector, isFocusable, isTabble, isVisible };
+//# sourceMappingURL=tabbable.js.map

package/es/utils/tabbable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tabbable.js","sources":["../../src/utils/tabbable.ts"],"sourcesContent":["const tabbableNode = /input|select|textarea|button|object/;\n\nexport const focusSelector = [\n    'input',\n    'select',\n    'textarea',\n    'a',\n    'button',\n    'object',\n    '[tabindex]',\n    'audio[controls]',\n    'video[controls]',\n    '[contenteditable]:not([contenteditable=\"false\"])',\n].join(',');\n\nconst isHidden = (el: HTMLElement) => {\n    return (\n        (el.offsetWidth <= 0 && el.offsetHeight <= 0) ||\n        el.style.display === 'none' ||\n        el.style.visibility === 'hidden' ||\n        el.style.opacity === '0'\n    );\n};\n\nexport const isVisible = (element: HTMLElement, parentContainer?: HTMLElement): boolean => {\n    let parentElement: HTMLElement = element;\n\n    while (parentElement) {\n        if (parentElement === parentContainer || parentElement === document.body) {\n            break;\n        }\n\n        if (isHidden(parentElement)) {\n            return false;\n        }\n\n        parentElement = parentElement.parentNode as HTMLElement;\n    }\n\n    return true;\n};\n\nconst getElementTabIndex = (element: HTMLElement): number => {\n    const tabIndex = element.getAttribute('tabindex');\n\n    return tabIndex === null ? NaN : parseInt(tabIndex as string, 10);\n};\n\nexport const isFocusable = (element: HTMLElement, parentContainer?: HTMLElement): boolean => {\n    const nodeName = element.nodeName.toLowerCase();\n    const isTabIndexNotNaN = !Number.isNaN(getElementTabIndex(element));\n    const res =\n        (tabbableNode.test(nodeName) && !(element as HTMLSelectElement).disabled) ||\n        (element instanceof HTMLAnchorElement ? element.href || isTabIndexNotNaN : isTabIndexNotNaN);\n\n    return Boolean(res) && isVisible(element, parentContainer);\n};\n\nexport const isTabble = (element: HTMLElement, parentContainer?: HTMLElement): boolean => {\n    const tabIndex = getElementTabIndex(element);\n    const isTabIndexNaN = Number.isNaN(tabIndex);\n    return (isTabIndexNaN || tabIndex >= 0) && isFocusable(element, parentContainer);\n};\n\n// Все элементы внутри данной ноды, до которых можно добраться табом\nexport const findTabbableDescendants = (element: HTMLElement): Array<HTMLElement> => {\n    return Array.from(element.querySelectorAll<HTMLElement>(focusSelector)).filter((el) => isTabble(el, element));\n};\n"],"names":["tabbableNode","focusSelector","join","isHidden","el","offsetWidth","offsetHeight","style","display","visibility","opacity","isVisible","element","parentContainer","parentElement","document","body","parentNode","getElementTabIndex","tabIndex","getAttribute","NaN","parseInt","isFocusable","nodeName","toLowerCase","isTabIndexNotNaN","Number","isNaN","res","test","disabled","HTMLAnchorElement","href","Boolean","isTabble","isTabIndexNaN","findTabbableDescendants","Array","from","querySelectorAll","filter"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-new-hope",
-  "version": "0.118.0-dev.0",
+  "version": "0.118.1-canary.1345.10282607319.0",
   "description": "Salute Design System blueprint",
   "main": "cjs/index.js",
   "module": "es/index.js",
@@ -80,7 +80,7 @@
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-node-resolve": "^15.1.0",
-    "@salutejs/plasma-sb-utils": "0.163.0-dev.0",
+    "@salutejs/plasma-sb-utils": "0.163.1-canary.1345.10282607319.0",
     "@storybook/addon-docs": "^7.6.17",
     "@storybook/addon-essentials": "^7.6.17",
     "@storybook/addons": "^7.6.17",
@@ -110,7 +110,7 @@
     "@linaria/core": "5.0.2",
     "@linaria/react": "5.0.3",
     "@popperjs/core": "2.11.8",
-    "@salutejs/plasma-core": "1.165.0-dev.0",
+    "@salutejs/plasma-core": "1.165.1-canary.1345.10282607319.0",
     "dayjs": "1.11.11",
     "focus-visible": "5.2.0",
     "lodash.throttle": "4.1.1",
@@ -118,5 +118,5 @@
     "react-popper": "2.3.0",
     "storeon": "3.1.5"
   },
-  "gitHead": "4d14239f0c11c8dc5f85020fe7c98e956419895e"
+  "gitHead": "ec124a34ebff82bfeca411fca9cf7961df4af595"
 }

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

@@ -11,8 +11,9 @@ var _engines = /*#__PURE__*/require("../../engines");
 var _Popup = /*#__PURE__*/require("../Popup");
 var _Overlay = /*#__PURE__*/require("../Overlay");
 var _utils = /*#__PURE__*/require("../Popup/utils");
+var _hooks = /*#__PURE__*/require("../../hooks");
 var _Modal = /*#__PURE__*/require("./Modal.tokens");
-var _hooks = /*#__PURE__*/require("./hooks");
+var _hooks2 = /*#__PURE__*/require("./hooks");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _ModalContext = /*#__PURE__*/require("./ModalContext");
 var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "isOpen"];
@@ -48,13 +49,13 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
       view = _ref.view,
       isOpen = _ref.isOpen,
       rest = _objectWithoutProperties(_ref, _excluded);
-    var trapRef = (0, _plasmaCore.useFocusTrap)(true, initialFocusRef, focusAfterRef);
+    var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef, true);
     var popupController = (0, _Popup.usePopupContext)();
     var innerRef = (0, _plasmaCore.useForkRef)(trapRef, outerRootRef);
     var uniqId = (0, _plasmaCore.safeUseId)();
     var innerId = id || uniqId;
     var overlayBackgroundToken = withBlur ? "var(".concat(_Modal.tokens.modalOverlayWithBlurColor, ")") : "var(".concat(_Modal.tokens.modalOverlayColor, ")");
-    var _useModal = (0, _hooks.useModal)({
+    var _useModal = (0, _hooks2.useModal)({
         id: innerId,
         isOpen: isOpen,
         closeOnEsc: closeOnEsc,

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import styled from 'styled-components';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
@@ -6,6 +6,7 @@ import { SSRProvider } from '@salutejs/plasma-core';
 
 import { PopupProvider, popupClasses } from '../Popup/Popup';
 import { Button } from '../Button/Button';
+import { TextField } from '../TextField/TextField';
 import { WithTheme } from '../../../_helpers';
 
 import { Modal, modalClasses } from './Modal';
@@ -206,3 +207,114 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
     },
     render: (args) => <StoryModalDemo {...args} />,
 };
+
+const StyledModalAnimation = styled(Modal)`
+    /* stylelint-disable */
+    && .${popupClasses.root} {
+        animation: fadeIn 1s forwards;
+    }
+
+    &&.${popupClasses.endAnimation} .${popupClasses.root} {
+        animation: fadeOut 1s forwards;
+    }
+
+    && .${modalClasses.overlay} {
+        animation: overlayFadeIn 1s forwards;
+    }
+
+    &&.${popupClasses.endAnimation} .${modalClasses.overlay} {
+        animation: overlayFadeOut 1s forwards;
+    }
+    /* stylelint-enable */
+
+    @keyframes overlayFadeIn {
+        from {
+            opacity: 0;
+        }
+
+        to {
+            opacity: 1;
+        }
+    }
+
+    @keyframes overlayFadeOut {
+        from {
+            opacity: 1;
+        }
+
+        to {
+            opacity: 0;
+        }
+    }
+
+    @keyframes fadeIn {
+        from {
+            opacity: 0;
+            transform: translate(-50%, 100%);
+        }
+
+        to {
+            opacity: 1;
+            transform: translate(-50%, -50%);
+        }
+    }
+
+    @keyframes fadeOut {
+        from {
+            opacity: 1;
+            transform: translate(-50%, -50%);
+        }
+
+        to {
+            opacity: 0;
+            transform: translate(-50%, 100%);
+        }
+    }
+`;
+
+const StoryModalAnimationDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
+    const ref = useRef(null);
+    const [isOpen, setIsOpen] = useState(false);
+
+    const close = useCallback(() => {
+        setIsOpen(false);
+    }, []);
+
+    return (
+        <SSRProvider>
+            <PopupProvider>
+                <Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
+                <StyledModalAnimation
+                    id="modal"
+                    frame="theme-root"
+                    withAnimation
+                    onClose={() => setIsOpen(false)}
+                    isOpen={isOpen}
+                    placement={placement}
+                    offset={[offsetX, offsetY]}
+                    initialFocusRef={ref}
+                    {...rest}
+                >
+                    <Content>
+                        <TextField value="Text" onChange={() => {}} />
+                        <TextField ref={ref} value="Text2" onChange={() => {}} />
+                        <Button text="Закрыть" onClick={close} />
+                    </Content>
+                </StyledModalAnimation>
+            </PopupProvider>
+        </SSRProvider>
+    );
+};
+
+export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
+    args: {
+        placement: 'bottom',
+        withAnimation: true,
+        withBlur: false,
+        closeOnEsc: true,
+        closeOnOverlayClick: true,
+        offsetX: 0,
+        offsetY: 0,
+    },
+    render: (args) => <StoryModalAnimationDemo {...args} />,
+};

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import styled from 'styled-components';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
@@ -6,6 +6,7 @@ import { SSRProvider } from '@salutejs/plasma-core';
 
 import { PopupProvider, popupClasses } from '../Popup/Popup';
 import { Button } from '../Button/Button';
+import { TextField } from '../TextField/TextField';
 import { WithTheme } from '../../../_helpers';
 
 import { Modal, modalClasses } from './Modal';
@@ -206,3 +207,114 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
     },
     render: (args) => <StoryModalDemo {...args} />,
 };
+
+const StyledModalAnimation = styled(Modal)`
+    /* stylelint-disable */
+    && .${popupClasses.root} {
+        animation: fadeIn 1s forwards;
+    }
+
+    &&.${popupClasses.endAnimation} .${popupClasses.root} {
+        animation: fadeOut 1s forwards;
+    }
+
+    && .${modalClasses.overlay} {
+        animation: overlayFadeIn 1s forwards;
+    }
+
+    &&.${popupClasses.endAnimation} .${modalClasses.overlay} {
+        animation: overlayFadeOut 1s forwards;
+    }
+    /* stylelint-enable */
+
+    @keyframes overlayFadeIn {
+        from {
+            opacity: 0;
+        }
+
+        to {
+            opacity: 1;
+        }
+    }
+
+    @keyframes overlayFadeOut {
+        from {
+            opacity: 1;
+        }
+
+        to {
+            opacity: 0;
+        }
+    }
+
+    @keyframes fadeIn {
+        from {
+            opacity: 0;
+            transform: translate(-50%, 100%);
+        }
+
+        to {
+            opacity: 1;
+            transform: translate(-50%, -50%);
+        }
+    }
+
+    @keyframes fadeOut {
+        from {
+            opacity: 1;
+            transform: translate(-50%, -50%);
+        }
+
+        to {
+            opacity: 0;
+            transform: translate(-50%, 100%);
+        }
+    }
+`;
+
+const StoryModalAnimationDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
+    const ref = useRef(null);
+    const [isOpen, setIsOpen] = useState(false);
+
+    const close = useCallback(() => {
+        setIsOpen(false);
+    }, []);
+
+    return (
+        <SSRProvider>
+            <PopupProvider>
+                <Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
+                <StyledModalAnimation
+                    id="modal"
+                    frame="theme-root"
+                    withAnimation
+                    onClose={() => setIsOpen(false)}
+                    isOpen={isOpen}
+                    placement={placement}
+                    offset={[offsetX, offsetY]}
+                    initialFocusRef={ref}
+                    {...rest}
+                >
+                    <Content>
+                        <TextField value="Text" onChange={() => {}} />
+                        <TextField ref={ref} value="Text2" onChange={() => {}} />
+                        <Button text="Закрыть" onClick={close} />
+                    </Content>
+                </StyledModalAnimation>
+            </PopupProvider>
+        </SSRProvider>
+    );
+};
+
+export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
+    args: {
+        placement: 'bottom',
+        withAnimation: true,
+        withBlur: false,
+        closeOnEsc: true,
+        closeOnOverlayClick: true,
+        offsetX: 0,
+        offsetY: 0,
+    },
+    render: (args) => <StoryModalAnimationDemo {...args} />,
+};

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

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "useDidMountEffect", {
     return _useDidMountEffect.useDidMountEffect;
   }
 });
+Object.defineProperty(exports, "useFocusTrap", {
+  enumerable: true,
+  get: function get() {
+    return _useFocusTrap.useFocusTrap;
+  }
+});
 Object.defineProperty(exports, "useForceUpdate", {
   enumerable: true,
   get: function get() {
@@ -40,6 +46,7 @@ Object.defineProperty(exports, "useUniqId", {
   }
 });
 var _useUniqId = /*#__PURE__*/require("./useUniqId");
+var _useFocusTrap = /*#__PURE__*/require("./useFocusTrap");
 var _usePreviousValue = /*#__PURE__*/require("./usePreviousValue");
 var _useForceUpdate = /*#__PURE__*/require("./useForceUpdate");
 var _useDidMountEffect = /*#__PURE__*/require("./useDidMountEffect");

package/styled-components/cjs/hooks/useFocusTrap.js

@@ -0,0 +1,95 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFocusTrap = void 0;
+var _react = /*#__PURE__*/require("react");
+var _focusManager = /*#__PURE__*/require("../utils/focusManager");
+var _tabbable = /*#__PURE__*/require("../utils/tabbable");
+var _scopeTab = /*#__PURE__*/require("../utils/scopeTab");
+// Находим элемент для фокуса
+var getFocusElement = function getFocusElement(node, firstFocusSelector) {
+  var focusElement = null;
+  if (firstFocusSelector) {
+    if (typeof firstFocusSelector === 'string') {
+      focusElement = node.querySelector(firstFocusSelector);
+    } else if (firstFocusSelector.current) {
+      focusElement = firstFocusSelector.current;
+    }
+  }
+  if (!focusElement) {
+    var children = Array.from(node.querySelectorAll(_tabbable.focusSelector));
+    focusElement = children.find(function (el) {
+      return (0, _tabbable.isTabble)(el);
+    }) || null;
+  }
+
+  // Если ничего не нашлось, то может ли сама нода быть под фокусом
+  if (!focusElement && (0, _tabbable.isFocusable)(node)) {
+    focusElement = node;
+  }
+  return focusElement;
+};
+var processNode = function processNode(node, firstFocusSelector, ref) {
+  if (ref !== null && ref !== void 0 && ref.current) {
+    ref.current.removeEventListener('animationend', function () {
+      processNode(node, firstFocusSelector, ref);
+    });
+  }
+  var focusElement = getFocusElement(node, firstFocusSelector);
+  if (focusElement) {
+    focusElement.focus();
+  }
+};
+var focusManager = /*#__PURE__*/new _focusManager.FocusManager();
+
+/**
+ *  Захватывает фокус внутри DOM node.
+ * */
+var useFocusTrap = exports.useFocusTrap = function useFocusTrap() {
+  var active = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var firstFocusSelector = arguments.length > 1 ? arguments[1] : undefined;
+  var focusAfterNode = arguments.length > 2 ? arguments[2] : undefined;
+  var focusAfterAnimation = arguments.length > 3 ? arguments[3] : undefined;
+  var ref = (0, _react.useRef)();
+  var setRef = (0, _react.useCallback)(function (node) {
+    if (ref.current) {
+      focusManager.teardownScopedFocus();
+      focusManager.returnFocus();
+    }
+    if (active && node) {
+      focusManager.setupScopedFocus(node);
+      focusManager.markForFocusAfter(focusAfterNode);
+
+      // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
+      setTimeout(function () {
+        if (ref !== null && ref !== void 0 && ref.current && node.ownerDocument && focusAfterAnimation) {
+          ref.current.addEventListener('animationend', function () {
+            processNode(node, firstFocusSelector, ref);
+          });
+        } else if (node.ownerDocument) {
+          processNode(node, firstFocusSelector);
+        }
+      });
+      ref.current = node;
+      return;
+    }
+    ref.current = null;
+  }, [active, firstFocusSelector]);
+  (0, _react.useEffect)(function () {
+    if (!active) {
+      return;
+    }
+    var handleKeyDown = function handleKeyDown(event) {
+      if (event.key === 'Tab' && ref.current) {
+        (0, _scopeTab.scopeTab)(ref.current, event);
+      }
+    };
+    document.addEventListener('keydown', handleKeyDown);
+    return function () {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [active]);
+  return setRef;
+};

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

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FocusManager = void 0;
+var _tabbable = /*#__PURE__*/require("./tabbable");
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ *  Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.
+ *  Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.
+ * */
+var FocusManager = exports.FocusManager = /*#__PURE__*/_createClass(function FocusManager() {
+  var _this = this;
+  _classCallCheck(this, FocusManager);
+  // массив с элементами, которые нужно зафокусить после анмаунта
+  _defineProperty(this, "focusAfterElements", []);
+  // массив с trap нодами
+  _defineProperty(this, "focusNodes", []);
+  _defineProperty(this, "handleFocus", function () {
+    // Фокус всегда должен находиться внутри необходимой ноды
+    var focusNode = _this.focusNodes[_this.focusNodes.length - 1];
+    if (!focusNode || focusNode.contains(document.activeElement)) {
+      return;
+    }
+
+    // Выделяем первый tabbable элемент
+    var el = (0, _tabbable.findTabbableDescendants)(focusNode)[0] || focusNode;
+    el.focus();
+  });
+  // добавление на фокус после анмаунта
+  _defineProperty(this, "markForFocusAfter", function (focusAfterNode) {
+    var node = focusAfterNode && focusAfterNode.current ? focusAfterNode.current : document.activeElement;
+    _this.focusAfterElements.push(node);
+  });
+  // фокус на необходимый элемент
+  _defineProperty(this, "returnFocus", function () {
+    var _this$focusAfterEleme;
+    var toFocus = (_this$focusAfterEleme = _this.focusAfterElements.pop()) !== null && _this$focusAfterEleme !== void 0 ? _this$focusAfterEleme : null;
+    if (toFocus) {
+      toFocus.focus();
+    }
+  });
+  // при маунте ноды
+  _defineProperty(this, "setupScopedFocus", function (element) {
+    _this.focusNodes.push(element);
+    document.addEventListener('focusin', _this.handleFocus, true);
+  });
+  // при анмаунте
+  _defineProperty(this, "teardownScopedFocus", function () {
+    _this.focusNodes.pop();
+    document.removeEventListener('focusin', _this.handleFocus);
+  });
+});