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

package/cjs/components/Modal/Modal.js

@@ -11,6 +11,8 @@ var PopupContext = require('../Popup/PopupContext.js');
 var Popup$1 = require('../Popup/Popup.js');
 var Overlay = require('../Overlay/Overlay.js');
 var index = require('../Popup/utils/index.js');
+var useFocusTrap = require('../../hooks/useFocusTrap.js');
+require('../../utils/react.js');
 var Modal_tokens = require('./Modal.tokens.js');
 var useModal = require('./hooks/useModal.js');
 var base = require('./variations/_view/base.js');
@@ -45,7 +47,7 @@ var modalRoot = function modalRoot(Root) {
       view = _ref.view,
       isOpen = _ref.isOpen,
       rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
-    var trapRef = plasmaCore.useFocusTrap(true, initialFocusRef, focusAfterRef);
+    var trapRef = useFocusTrap.useFocusTrap(true, initialFocusRef, focusAfterRef, true);
     var popupController = PopupContext.usePopupContext();
     var innerRef = plasmaCore.useForkRef(trapRef, outerRootRef);
     var uniqId = plasmaCore.safeUseId();

package/cjs/components/Modal/Modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n    forwardRef<HTMLDivElement, ModalProps>(\n        (\n            {\n                id,\n                withAnimation,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                withBlur,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                isOpen,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.modalOverlayWithBlurColor})`\n                : `var(${tokens.modalOverlayColor})`;\n\n            const { modalInfo } = useModal({ id: innerId, isOpen, closeOnEsc, onEscKeyDown, onClose, popupInfo });\n            const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onModalOverlayKeyDown = useCallback(\n                (event: React.MouseEvent<HTMLDivElement>) => {\n                    if (onOverlayClick) {\n                        onOverlayClick(event);\n                        return;\n                    }\n\n                    if (onClose) {\n                        onClose();\n                    }\n                },\n                [closeOnOverlayClick, onOverlayClick, onClose],\n            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    isOpen={isOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={\n                        <Root view={view}>\n                            <Overlay\n                                className={classes.overlay}\n                                zIndex={zIndex || DEFAULT_Z_INDEX}\n                                backgroundColorProperty={overlayBackgroundToken}\n                                withBlur={withBlur}\n                                transparent={transparent}\n                                isClickable={closeOnOverlayClick}\n                                onOverlayClick={onModalOverlayKeyDown}\n                            />\n                        </Root>\n                    }\n                    {...rest}\n                >\n                    {children}\n                </Popup>\n            );\n        },\n    );\n\nexport const modalConfig = {\n    name: 'Modal',\n    tag: 'div',\n    layout: modalRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n    },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","isOpen","rest","_objectWithoutProperties","_excluded","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","React","createElement","_extends","ref","overlay","Overlay","className","classes","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}
+{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { useFocusTrap } from '../../hooks';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n    forwardRef<HTMLDivElement, ModalProps>(\n        (\n            {\n                id,\n                withAnimation,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                withBlur,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                isOpen,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.modalOverlayWithBlurColor})`\n                : `var(${tokens.modalOverlayColor})`;\n\n            const { modalInfo } = useModal({ id: innerId, isOpen, closeOnEsc, onEscKeyDown, onClose, popupInfo });\n            const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onModalOverlayKeyDown = useCallback(\n                (event: React.MouseEvent<HTMLDivElement>) => {\n                    if (onOverlayClick) {\n                        onOverlayClick(event);\n                        return;\n                    }\n\n                    if (onClose) {\n                        onClose();\n                    }\n                },\n                [closeOnOverlayClick, onOverlayClick, onClose],\n            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    isOpen={isOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={\n                        <Root view={view}>\n                            <Overlay\n                                className={classes.overlay}\n                                zIndex={zIndex || DEFAULT_Z_INDEX}\n                                backgroundColorProperty={overlayBackgroundToken}\n                                withBlur={withBlur}\n                                transparent={transparent}\n                                isClickable={closeOnOverlayClick}\n                                onOverlayClick={onModalOverlayKeyDown}\n                            />\n                        </Root>\n                    }\n                    {...rest}\n                >\n                    {children}\n                </Popup>\n            );\n        },\n    );\n\nexport const modalConfig = {\n    name: 'Modal',\n    tag: 'div',\n    layout: modalRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n    },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","isOpen","rest","_objectWithoutProperties","_excluded","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","React","createElement","_extends","ref","overlay","Overlay","className","classes","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}

package/cjs/hooks/useFocusTrap.js

@@ -0,0 +1,97 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var focusManager$1 = require('../utils/focusManager.js');
+var tabbable = require('../utils/tabbable.js');
+var scopeTab = require('../utils/scopeTab.js');
+
+// Находим элемент для фокуса
+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 tabbable.isTabble(el);
+    }) || null;
+  }
+
+  // Если ничего не нашлось, то может ли сама нода быть под фокусом
+  if (!focusElement && 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$1.FocusManager();
+
+/**
+ *  Захватывает фокус внутри DOM node.
+ * */
+var 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 = React.useRef();
+  var setRef = 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]);
+  React.useEffect(function () {
+    if (!active) {
+      return;
+    }
+    var handleKeyDown = function handleKeyDown(event) {
+      if (event.key === 'Tab' && ref.current) {
+        scopeTab.scopeTab(ref.current, event);
+      }
+    };
+    document.addEventListener('keydown', handleKeyDown);
+    return function () {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [active]);
+  return setRef;
+};
+
+exports.useFocusTrap = useFocusTrap;
+//# sourceMappingURL=useFocusTrap.js.map

package/cjs/hooks/useFocusTrap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFocusTrap.js","sources":["../../src/hooks/useFocusTrap.ts"],"sourcesContent":["import { useCallback, useEffect, useRef } from 'react';\n\nimport { FocusManager } from '../utils/focusManager';\nimport { focusSelector, isFocusable, isTabble } from '../utils/tabbable';\nimport { scopeTab } from '../utils/scopeTab';\n\n// Находим элемент для фокуса\nconst getFocusElement = (\n    node: HTMLElement,\n    firstFocusSelector?: string | React.RefObject<HTMLElement>,\n): HTMLElement | null => {\n    let focusElement: HTMLElement | null = null;\n    if (firstFocusSelector) {\n        if (typeof firstFocusSelector === 'string') {\n            focusElement = node.querySelector(firstFocusSelector);\n        } else if (firstFocusSelector.current) {\n            focusElement = firstFocusSelector.current;\n        }\n    }\n\n    if (!focusElement) {\n        const children = Array.from<HTMLElement>(node.querySelectorAll(focusSelector));\n        focusElement = children.find((el) => isTabble(el)) || null;\n    }\n\n    // Если ничего не нашлось, то может ли сама нода быть под фокусом\n    if (!focusElement && isFocusable(node)) {\n        focusElement = node;\n    }\n\n    return focusElement;\n};\n\nconst processNode = (\n    node: HTMLElement,\n    firstFocusSelector?: string | React.RefObject<HTMLElement>,\n    ref?: React.MutableRefObject<HTMLElement | null | undefined>,\n) => {\n    if (ref?.current) {\n        ref.current.removeEventListener('animationend', () => {\n            processNode(node, firstFocusSelector, ref);\n        });\n    }\n    const focusElement = getFocusElement(node, firstFocusSelector);\n\n    if (focusElement) {\n        focusElement.focus();\n    }\n};\n\nconst focusManager = new FocusManager();\n\n/**\n *  Захватывает фокус внутри DOM node.\n * */\nexport const useFocusTrap = (\n    active = true,\n    firstFocusSelector?: string | React.RefObject<HTMLElement>,\n    focusAfterNode?: React.RefObject<HTMLElement>,\n    focusAfterAnimation?: boolean,\n): ((instance: HTMLElement | null) => void) => {\n    const ref = useRef<HTMLElement | null>();\n\n    const setRef = useCallback(\n        (node: HTMLElement | null) => {\n            if (ref.current) {\n                focusManager.teardownScopedFocus();\n                focusManager.returnFocus();\n            }\n\n            if (active && node) {\n                focusManager.setupScopedFocus(node);\n                focusManager.markForFocusAfter(focusAfterNode);\n\n                // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.\n                setTimeout(() => {\n                    if (ref?.current && node.ownerDocument && focusAfterAnimation) {\n                        ref.current.addEventListener('animationend', () => {\n                            processNode(node, firstFocusSelector, ref);\n                        });\n                    } else if (node.ownerDocument) {\n                        processNode(node, firstFocusSelector);\n                    }\n                });\n\n                ref.current = node;\n                return;\n            }\n\n            ref.current = null;\n        },\n        [active, firstFocusSelector],\n    );\n\n    useEffect(() => {\n        if (!active) {\n            return;\n        }\n\n        const handleKeyDown = (event: KeyboardEvent) => {\n            if (event.key === 'Tab' && ref.current) {\n                scopeTab(ref.current, event);\n            }\n        };\n\n        document.addEventListener('keydown', handleKeyDown);\n        return () => {\n            document.removeEventListener('keydown', handleKeyDown);\n        };\n    }, [active]);\n\n    return setRef;\n};\n"],"names":["getFocusElement","node","firstFocusSelector","focusElement","querySelector","current","children","Array","from","querySelectorAll","focusSelector","find","el","isTabble","isFocusable","processNode","ref","removeEventListener","focus","focusManager","FocusManager","useFocusTrap","active","arguments","length","undefined","focusAfterNode","focusAfterAnimation","useRef","setRef","useCallback","teardownScopedFocus","returnFocus","setupScopedFocus","markForFocusAfter","setTimeout","ownerDocument","addEventListener","useEffect","handleKeyDown","event","key","scopeTab","document"],"mappings":"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"}

package/cjs/index.js

@@ -15,6 +15,7 @@ var applySkeletonGradient = require('./mixins/applySkeletonGradient.js');
 var applyDisabled = require('./mixins/applyDisabled.js');
 var index = require('./engines/index.js');
 var useUniqId = require('./hooks/useUniqId.js');
+var useFocusTrap = require('./hooks/useFocusTrap.js');
 var usePreviousValue = require('./hooks/usePreviousValue.js');
 var useForceUpdate = require('./hooks/useForceUpdate.js');
 var useDidMountEffect = require('./hooks/useDidMountEffect.js');
@@ -269,6 +270,7 @@ exports.getSkeletonColor = applySkeletonGradient.getSkeletonColor;
 exports.applyDisabled = applyDisabled.applyDisabled;
 exports.css = index.css;
 exports.useUniqId = useUniqId.useUniqId;
+exports.useFocusTrap = useFocusTrap.useFocusTrap;
 exports.usePreviousValue = usePreviousValue.usePreviousValue;
 exports.useForceUpdate = useForceUpdate.useForceUpdate;
 exports.useDidMountEffect = useDidMountEffect.useDidMountEffect;

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/cjs/utils/focusManager.js

@@ -0,0 +1,56 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.js');
+var tabbable = require('./tabbable.js');
+
+/**
+ *  Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.
+ *  Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.
+ * */
+var FocusManager = /*#__PURE__*/_rollupPluginBabelHelpers.createClass(function FocusManager() {
+  var _this = this;
+  _rollupPluginBabelHelpers.classCallCheck(this, FocusManager);
+  // массив с элементами, которые нужно зафокусить после анмаунта
+  _rollupPluginBabelHelpers.defineProperty(this, "focusAfterElements", []);
+  // массив с trap нодами
+  _rollupPluginBabelHelpers.defineProperty(this, "focusNodes", []);
+  _rollupPluginBabelHelpers.defineProperty(this, "handleFocus", function () {
+    // Фокус всегда должен находиться внутри необходимой ноды
+    var focusNode = _this.focusNodes[_this.focusNodes.length - 1];
+    if (!focusNode || focusNode.contains(document.activeElement)) {
+      return;
+    }
+
+    // Выделяем первый tabbable элемент
+    var el = tabbable.findTabbableDescendants(focusNode)[0] || focusNode;
+    el.focus();
+  });
+  // добавление на фокус после анмаунта
+  _rollupPluginBabelHelpers.defineProperty(this, "markForFocusAfter", function (focusAfterNode) {
+    var node = focusAfterNode && focusAfterNode.current ? focusAfterNode.current : document.activeElement;
+    _this.focusAfterElements.push(node);
+  });
+  // фокус на необходимый элемент
+  _rollupPluginBabelHelpers.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();
+    }
+  });
+  // при маунте ноды
+  _rollupPluginBabelHelpers.defineProperty(this, "setupScopedFocus", function (element) {
+    _this.focusNodes.push(element);
+    document.addEventListener('focusin', _this.handleFocus, true);
+  });
+  // при анмаунте
+  _rollupPluginBabelHelpers.defineProperty(this, "teardownScopedFocus", function () {
+    _this.focusNodes.pop();
+    document.removeEventListener('focusin', _this.handleFocus);
+  });
+});
+
+exports.FocusManager = FocusManager;
+//# sourceMappingURL=focusManager.js.map

package/cjs/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,qCAAA,CAAA,SAAAD,YAAA,GAAA;AAAA,EAAA,IAAAE,KAAA,GAAA,IAAA,CAAA;AAAAC,EAAAA,wCAAA,OAAAH,YAAA,CAAA,CAAA;AACrB;AAAAI,EAAAA,wCAAA,6BACiD,EAAE,CAAA,CAAA;AAEnD;AAAAA,EAAAA,wCAAA,qBACyC,EAAE,CAAA,CAAA;AAAAA,EAAAA,wCAAA,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,gCAAuB,CAACP,SAAS,CAAC,CAAC,CAAC,CAAC,IAAIA,SAAS,CAAA;IAC7DM,EAAE,CAACE,KAAK,EAAE,CAAA;GACb,CAAA,CAAA;AAED;EAAAT,wCAAA,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,wCAAA,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,wCAAA,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,wCAAA,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/cjs/utils/scopeTab.js

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

package/cjs/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,UAAQ,GAAGC,gCAAuB,CAACH,IAAI,CAAC,CAAA;AAC9C,EAAA,IAAI,CAACE,UAAQ,CAACE,MAAM,EAAE;IAClBH,KAAK,CAACI,cAAc,EAAE,CAAA;AACtB,IAAA,OAAA;AACJ,GAAA;;AAEA;AACA,EAAA,IAAMC,aAAa,GAAGJ,UAAQ,CAACD,KAAK,CAACM,QAAQ,GAAG,CAAC,GAAGL,UAAQ,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,UAAQ,CAACD,KAAK,CAACM,QAAQ,GAAGL,UAAQ,CAACE,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;AACjE,EAAA,IAAIO,MAAM,EAAE;IACRA,MAAM,CAACC,KAAK,EAAE,CAAA;AAClB,GAAA;AACJ;;;;"}

package/cjs/utils/tabbable.js

@@ -0,0 +1,51 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+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);
+  });
+};
+
+exports.findTabbableDescendants = findTabbableDescendants;
+exports.focusSelector = focusSelector;
+exports.isFocusable = isFocusable;
+exports.isTabble = isTabble;
+exports.isVisible = isVisible;
+//# sourceMappingURL=tabbable.js.map

package/cjs/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/emotion/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/emotion/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 '@emotion/styled';
 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} />,
+};