@salutejs/plasma-new-hope 0.337.0-canary.2244.17909508967.0 → 0.337.0-canary.2250.17939562431.0

package/cjs/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -66,7 +66,7 @@ var DropdownInner = function DropdownInner(_ref) {
       id: listId,
       role: "group",
       listMaxHeight: item.listMaxHeight
-    }, item.items.map(function (innerItem, innerIndex) {
+    }, item.beforeList, item.items.map(function (innerItem, innerIndex) {
       return /*#__PURE__*/React__default.default.createElement(DropdownInner, {
         key: "".concat(innerIndex, "/").concat(currentLevel),
         item: innerItem,

package/cjs/components/Dropdown/ui/DropdownInner/DropdownInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownInner.js","sources":["../../../../../src/components/Dropdown/ui/DropdownInner/DropdownInner.tsx"],"sourcesContent":["import React, { useRef } from 'react';\nimport type { FC } from 'react';\nimport { safeUseId } from 'src/utils';\n\nimport { DropdownItem } from '../DropdownItem/DropdownItem';\nimport { Ul, ListWrapper } from '../../Dropdown.styles';\nimport { FloatingPopover } from '../../FloatingPopover';\nimport { getPlacement } from '../../utils';\n\nimport { DropdownInnerProps } from './DropdownInner.type';\n\nconst DropdownInner: FC<DropdownInnerProps> = ({\n    item,\n    currentLevel,\n    path,\n    dispatchPath,\n    index,\n    trigger,\n    listWidth,\n    portal,\n}) => {\n    const handleToggle = (opened: boolean): void => {\n        if (opened) {\n            dispatchPath({ type: 'changed_on_level', value: item.value.toString(), level: currentLevel + 1 });\n        } else {\n            dispatchPath({ type: 'cut_by_level', level: currentLevel + 1 });\n        }\n    };\n\n    const listWrapperRef = useRef<HTMLDivElement>(null);\n\n    const isCurrentListOpen = path[currentLevel + 1] === item.value.toString();\n\n    const treeId = safeUseId();\n    const listId = `${treeId}_tree_level_${currentLevel + 2}`;\n    const nextLevel = currentLevel + 1;\n\n    if (item?.items) {\n        return (\n            <FloatingPopover\n                placement={getPlacement(item?.placement || 'right')}\n                opened={isCurrentListOpen}\n                onToggle={handleToggle}\n                trigger={item.trigger || trigger}\n                target={\n                    <DropdownItem\n                        item={item}\n                        index={index}\n                        path={path}\n                        currentLevel={currentLevel}\n                        ariaControls={listId}\n                        ariaExpanded={isCurrentListOpen}\n                        ariaLevel={nextLevel}\n                        ariaLabel={item.label}\n                    />\n                }\n                isInner\n                portal={portal}\n            >\n                <ListWrapper ref={listWrapperRef} listWidth={listWidth}>\n                    <Ul id={listId} role=\"group\" listMaxHeight={item.listMaxHeight}>\n                        {item.items.map((innerItem, innerIndex) => (\n                            <DropdownInner\n                                key={`${innerIndex}/${currentLevel}`}\n                                item={innerItem}\n                                currentLevel={nextLevel}\n                                path={path}\n                                dispatchPath={dispatchPath}\n                                index={innerIndex}\n                                trigger={trigger}\n                                listWidth={listWidth}\n                                portal={listWrapperRef}\n                            />\n                        ))}\n                    </Ul>\n                </ListWrapper>\n            </FloatingPopover>\n        );\n    }\n\n    return <DropdownItem item={item} path={path} index={index} currentLevel={currentLevel} ariaLevel={nextLevel} />;\n};\n\nexport { DropdownInner };\n"],"names":["DropdownInner","_ref","item","currentLevel","path","dispatchPath","index","trigger","listWidth","portal","handleToggle","opened","type","value","toString","level","listWrapperRef","useRef","isCurrentListOpen","treeId","safeUseId","listId","concat","nextLevel","items","React","createElement","FloatingPopover","placement","getPlacement","onToggle","target","DropdownItem","ariaControls","ariaExpanded","ariaLevel","ariaLabel","label","isInner","ListWrapper","ref","Ul","id","role","listMaxHeight","map","innerItem","innerIndex","key"],"mappings":"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"}
+{"version":3,"file":"DropdownInner.js","sources":["../../../../../src/components/Dropdown/ui/DropdownInner/DropdownInner.tsx"],"sourcesContent":["import React, { useRef } from 'react';\nimport type { FC } from 'react';\nimport { safeUseId } from 'src/utils';\n\nimport { DropdownItem } from '../DropdownItem/DropdownItem';\nimport { Ul, ListWrapper } from '../../Dropdown.styles';\nimport { FloatingPopover } from '../../FloatingPopover';\nimport { getPlacement } from '../../utils';\n\nimport { DropdownInnerProps } from './DropdownInner.type';\n\nconst DropdownInner: FC<DropdownInnerProps> = ({\n    item,\n    currentLevel,\n    path,\n    dispatchPath,\n    index,\n    trigger,\n    listWidth,\n    portal,\n}) => {\n    const handleToggle = (opened: boolean): void => {\n        if (opened) {\n            dispatchPath({ type: 'changed_on_level', value: item.value.toString(), level: currentLevel + 1 });\n        } else {\n            dispatchPath({ type: 'cut_by_level', level: currentLevel + 1 });\n        }\n    };\n\n    const listWrapperRef = useRef<HTMLDivElement>(null);\n\n    const isCurrentListOpen = path[currentLevel + 1] === item.value.toString();\n\n    const treeId = safeUseId();\n    const listId = `${treeId}_tree_level_${currentLevel + 2}`;\n    const nextLevel = currentLevel + 1;\n\n    if (item?.items) {\n        return (\n            <FloatingPopover\n                placement={getPlacement(item?.placement || 'right')}\n                opened={isCurrentListOpen}\n                onToggle={handleToggle}\n                trigger={item.trigger || trigger}\n                target={\n                    <DropdownItem\n                        item={item}\n                        index={index}\n                        path={path}\n                        currentLevel={currentLevel}\n                        ariaControls={listId}\n                        ariaExpanded={isCurrentListOpen}\n                        ariaLevel={nextLevel}\n                        ariaLabel={item.label}\n                    />\n                }\n                isInner\n                portal={portal}\n            >\n                <ListWrapper ref={listWrapperRef} listWidth={listWidth}>\n                    <Ul id={listId} role=\"group\" listMaxHeight={item.listMaxHeight}>\n                        {item.beforeList}\n\n                        {item.items.map((innerItem, innerIndex) => (\n                            <DropdownInner\n                                key={`${innerIndex}/${currentLevel}`}\n                                item={innerItem}\n                                currentLevel={nextLevel}\n                                path={path}\n                                dispatchPath={dispatchPath}\n                                index={innerIndex}\n                                trigger={trigger}\n                                listWidth={listWidth}\n                                portal={listWrapperRef}\n                            />\n                        ))}\n                    </Ul>\n                </ListWrapper>\n            </FloatingPopover>\n        );\n    }\n\n    return <DropdownItem item={item} path={path} index={index} currentLevel={currentLevel} ariaLevel={nextLevel} />;\n};\n\nexport { DropdownInner };\n"],"names":["DropdownInner","_ref","item","currentLevel","path","dispatchPath","index","trigger","listWidth","portal","handleToggle","opened","type","value","toString","level","listWrapperRef","useRef","isCurrentListOpen","treeId","safeUseId","listId","concat","nextLevel","items","React","createElement","FloatingPopover","placement","getPlacement","onToggle","target","DropdownItem","ariaControls","ariaExpanded","ariaLevel","ariaLabel","label","isInner","ListWrapper","ref","Ul","id","role","listMaxHeight","beforeList","map","innerItem","innerIndex","key"],"mappings":"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"}

package/cjs/components/Modal/Modal.js

@@ -24,7 +24,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var React__default = /*#__PURE__*/_interopDefault(React);
 
 var _IconClose;
-var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "isFocusTrapped", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen", "hasBody", "hasClose", "resizable", "draggable"];
+var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen", "hasBody", "hasClose", "resizable", "draggable"];
 
 // issue #823
 var Popup = /*#__PURE__*/common.component(Popup$1.popupConfig);
@@ -45,8 +45,6 @@ var modalRoot = function modalRoot(Root) {
       _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
       closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
       withBlur = _ref.withBlur,
-      _ref$isFocusTrapped = _ref.isFocusTrapped,
-      isFocusTrapped = _ref$isFocusTrapped === void 0 ? true : _ref$isFocusTrapped,
       initialFocusRef = _ref.initialFocusRef,
       focusAfterRef = _ref.focusAfterRef,
       zIndex = _ref.zIndex,
@@ -62,7 +60,7 @@ var modalRoot = function modalRoot(Root) {
       rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
     var innerIsOpen = Boolean(isOpen || opened);
     var innerHasClose = hasClose === undefined && hasBody || hasClose;
-    var trapRef = useFocusTrap.useFocusTrap(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);
+    var trapRef = useFocusTrap.useFocusTrap(true, initialFocusRef, focusAfterRef, true);
     var popupController = PopupContext.usePopupContext();
     var innerRef = plasmaCore.useForkRef(trapRef, outerRootRef);
     var uniqId = react.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 { useForkRef } from '@salutejs/plasma-core';\nimport { safeUseId } from 'src/utils';\nimport { RootProps, component } from 'src/engines';\nimport { useFocusTrap } from 'src/hooks';\n\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { IconClose } from '../_Icon/Icons/IconClose';\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';\nimport { CloseButton, ModalBody, ModalContent, base } from './Modal.styles';\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                isFocusTrapped = true,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                resizable,\n                draggable,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\n            const trapRef = useFocusTrap(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);\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({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(Array.from(popupController.items.values())) !== 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            const overlayNode = (\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            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    draggable={draggable}\n                    resizable={resizable}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\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","_ref$isFocusTrapped","isFocusTrapped","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","opened","isOpen","hasBody","hasClose","resizable","draggable","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","Array","from","items","values","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","_IconClose","IconClose","size","color","Fragment","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 } from '@salutejs/plasma-core';\nimport { safeUseId } from 'src/utils';\nimport { RootProps, component } from 'src/engines';\nimport { useFocusTrap } from 'src/hooks';\n\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { IconClose } from '../_Icon/Icons/IconClose';\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';\nimport { CloseButton, ModalBody, ModalContent, base } from './Modal.styles';\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                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                resizable,\n                draggable,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\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({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(Array.from(popupController.items.values())) !== 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            const overlayNode = (\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            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    draggable={draggable}\n                    resizable={resizable}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\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","opened","isOpen","hasBody","hasClose","resizable","draggable","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","Array","from","items","values","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","_IconClose","IconClose","size","color","Fragment","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}

package/cjs/hooks/useFocusTrap.js

@@ -51,14 +51,13 @@ var useFocusTrap = function useFocusTrap() {
   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 enableOnFirstMount = arguments.length > 4 ? arguments[4] : undefined;
   var ref = React.useRef();
   var setRef = React.useCallback(function (node) {
     if (ref.current) {
       focusManager.teardownScopedFocus();
       focusManager.returnFocus();
     }
-    if ((active || enableOnFirstMount) && node) {
+    if (active && node) {
       focusManager.setupScopedFocus(node);
       focusManager.markForFocusAfter(focusAfterNode);
 
@@ -76,26 +75,21 @@ var useFocusTrap = function useFocusTrap() {
       return;
     }
     ref.current = null;
-  }, [active, enableOnFirstMount, firstFocusSelector]);
+  }, [active, firstFocusSelector]);
   React.useEffect(function () {
-    if (!active && !enableOnFirstMount) {
+    if (!active) {
       return;
     }
     var handleKeyDown = function handleKeyDown(event) {
       if (event.key === 'Tab' && ref.current) {
-        scopeTab.scopeTab(ref.current, event, active);
-        if (enableOnFirstMount) {
-          setTimeout(function () {
-            focusManager.teardownScopedFocus();
-          });
-        }
+        scopeTab.scopeTab(ref.current, event);
       }
     };
     document.addEventListener('keydown', handleKeyDown);
     return function () {
       document.removeEventListener('keydown', handleKeyDown);
     };
-  }, [active, enableOnFirstMount]);
+  }, [active]);
   return setRef;
 };
 

package/cjs/hooks/useFocusTrap.js.map

@@ -1 +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    enableOnFirstMount?: 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 || enableOnFirstMount) && 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, enableOnFirstMount, firstFocusSelector],\n    );\n\n    useEffect(() => {\n        if (!active && !enableOnFirstMount) {\n            return;\n        }\n\n        const handleKeyDown = (event: KeyboardEvent) => {\n            if (event.key === 'Tab' && ref.current) {\n                scopeTab(ref.current, event, active);\n\n                if (enableOnFirstMount) {\n                    setTimeout(() => {\n                        focusManager.teardownScopedFocus();\n                    });\n                }\n            }\n        };\n\n        document.addEventListener('keydown', handleKeyDown);\n        return () => {\n            document.removeEventListener('keydown', handleKeyDown);\n        };\n    }, [active, enableOnFirstMount]);\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","enableOnFirstMount","useRef","setRef","useCallback","teardownScopedFocus","returnFocus","setupScopedFocus","markForFocusAfter","setTimeout","ownerDocument","addEventListener","useEffect","handleKeyDown","event","key","scopeTab","document"],"mappings":"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"}
+{"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/utils/scopeTab.js

@@ -9,7 +9,7 @@ var tabbable = require('./tabbable.js');
  * @param node
  * @param event
  */
-var scopeTab = function scopeTab(node, event, activeFocusTrap) {
+var scopeTab = function scopeTab(node, event) {
   var tabbable$1 = tabbable.findTabbableDescendants(node);
   if (!tabbable$1.length) {
     event.preventDefault();
@@ -21,7 +21,7 @@ var scopeTab = function scopeTab(node, event, activeFocusTrap) {
   var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
 
   // если не является, то передаем обработку таба самому браузеру
-  if (!leavingFinalTabbable || !activeFocusTrap) {
+  if (!leavingFinalTabbable) {
     return;
   }
 

package/cjs/utils/scopeTab.js.map

@@ -1 +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, activeFocusTrap?: boolean) => {\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 || !activeFocusTrap) {\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","activeFocusTrap","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,EAAEC,eAAyB,EAAK;AAC5F,EAAA,IAAMC,UAAQ,GAAGC,gCAAuB,CAACJ,IAAI,CAAC,CAAA;AAC9C,EAAA,IAAI,CAACG,UAAQ,CAACE,MAAM,EAAE;IAClBJ,KAAK,CAACK,cAAc,EAAE,CAAA;AACtB,IAAA,OAAA;AACJ,GAAA;;AAEA;AACA,EAAA,IAAMC,aAAa,GAAGJ,UAAQ,CAACF,KAAK,CAACO,QAAQ,GAAG,CAAC,GAAGL,UAAQ,CAACE,MAAM,GAAG,CAAC,CAAC,CAAA;AACxE,EAAA,IAAMI,oBAAoB,GAAGF,aAAa,KAAKG,QAAQ,CAACC,aAAa,IAAIX,IAAI,KAAKU,QAAQ,CAACC,aAAa,CAAA;;AAExG;AACA,EAAA,IAAI,CAACF,oBAAoB,IAAI,CAACP,eAAe,EAAE;AAC3C,IAAA,OAAA;AACJ,GAAA;;AAEA;EACAD,KAAK,CAACK,cAAc,EAAE,CAAA;AACtB,EAAA,IAAMM,MAAM,GAAGT,UAAQ,CAACF,KAAK,CAACO,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;;;;"}
+{"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/emotion/cjs/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -101,7 +101,7 @@ var DropdownInner = function(param) {
             id: listId,
             role: "group",
             listMaxHeight: item.listMaxHeight
-        }, item.items.map(function(innerItem, innerIndex) {
+        }, item.beforeList, item.items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ _react.default.createElement(DropdownInner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
                 item: innerItem,

package/emotion/cjs/components/Modal/Modal.js

@@ -130,7 +130,7 @@ function _object_without_properties_loose(source, excluded) {
 var Popup = (0, _engines.component)(_Popup.popupConfig);
 var modalRoot = function(Root) {
     return /*#__PURE__*/ (0, _react.forwardRef)(function(_param, outerRootRef) {
-        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, _param_isFocusTrapped = _param.isFocusTrapped, isFocusTrapped = _param_isFocusTrapped === void 0 ? true : _param_isFocusTrapped, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
+        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
             "id",
             "withAnimation",
             "onClose",
@@ -139,7 +139,6 @@ var modalRoot = function(Root) {
             "closeOnEsc",
             "closeOnOverlayClick",
             "withBlur",
-            "isFocusTrapped",
             "initialFocusRef",
             "focusAfterRef",
             "zIndex",
@@ -155,7 +154,7 @@ var modalRoot = function(Root) {
         ]);
         var innerIsOpen = Boolean(isOpen || opened);
         var innerHasClose = hasClose === undefined && hasBody || hasClose;
-        var trapRef = (0, _hooks.useFocusTrap)(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);
+        var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef, true);
         var popupController = (0, _Popup.usePopupContext)();
         var innerRef = (0, _plasmacore.useForkRef)(trapRef, outerRootRef);
         var uniqId = (0, _utils.safeUseId)();

package/emotion/cjs/examples/components/Combobox/Combobox.js

@@ -1,16 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "Combobox", {
-    enumerable: true,
-    get: function() {
-        return Combobox;
-    }
-});
-var _engines = require("../../../engines");
-var _ = require("../../..");
-var _Comboboxconfig = require("./Combobox.config");
-var mergedConfig = (0, _engines.mergeConfig)(_.comboboxNewConfig, _Comboboxconfig.config);
-var ComboboxComponent = (0, _engines.component)(mergedConfig);
-var Combobox = ComboboxComponent;

package/emotion/cjs/hooks/useFocusTrap.js

@@ -47,14 +47,14 @@ var processNode = function(node, firstFocusSelector, ref) {
 };
 var focusManager = new _focusManager.FocusManager();
 var useFocusTrap = function() {
-    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0, enableOnFirstMount = arguments.length > 4 ? arguments[4] : void 0;
+    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0;
     var ref = (0, _react.useRef)();
     var setRef = (0, _react.useCallback)(function(node) {
         if (ref.current) {
             focusManager.teardownScopedFocus();
             focusManager.returnFocus();
         }
-        if ((active || enableOnFirstMount) && node) {
+        if (active && node) {
             focusManager.setupScopedFocus(node);
             focusManager.markForFocusAfter(focusAfterNode);
             // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
@@ -73,21 +73,15 @@ var useFocusTrap = function() {
         ref.current = null;
     }, [
         active,
-        enableOnFirstMount,
         firstFocusSelector
     ]);
     (0, _react.useEffect)(function() {
-        if (!active && !enableOnFirstMount) {
+        if (!active) {
             return;
         }
         var handleKeyDown = function(event) {
             if (event.key === 'Tab' && ref.current) {
-                (0, _scopeTab.scopeTab)(ref.current, event, active);
-                if (enableOnFirstMount) {
-                    setTimeout(function() {
-                        focusManager.teardownScopedFocus();
-                    });
-                }
+                (0, _scopeTab.scopeTab)(ref.current, event);
             }
         };
         document.addEventListener('keydown', handleKeyDown);
@@ -95,8 +89,7 @@ var useFocusTrap = function() {
             document.removeEventListener('keydown', handleKeyDown);
         };
     }, [
-        active,
-        enableOnFirstMount
+        active
     ]);
     return setRef;
 };

package/emotion/cjs/utils/scopeTab.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "scopeTab", {
     }
 });
 var _tabbable = require("./tabbable");
-var scopeTab = function(node, event, activeFocusTrap) {
+var scopeTab = function(node, event) {
     var tabbable = (0, _tabbable.findTabbableDescendants)(node);
     if (!tabbable.length) {
         event.preventDefault();
@@ -19,7 +19,7 @@ var scopeTab = function(node, event, activeFocusTrap) {
     var finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];
     var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
     // если не является, то передаем обработку таба самому браузеру
-    if (!leavingFinalTabbable || !activeFocusTrap) {
+    if (!leavingFinalTabbable) {
         return;
     }
     // иначе зацкливаемся

package/emotion/es/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -50,7 +50,7 @@ var DropdownInner = function(param) {
             id: listId,
             role: "group",
             listMaxHeight: item.listMaxHeight
-        }, item.items.map(function(innerItem, innerIndex) {
+        }, item.beforeList, item.items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ React.createElement(DropdownInner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
                 item: innerItem,

package/emotion/es/components/Modal/Modal.js

@@ -74,7 +74,7 @@ var Popup = component(popupConfig);
  * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.
  */ export var modalRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(_param, outerRootRef) {
-        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, _param_isFocusTrapped = _param.isFocusTrapped, isFocusTrapped = _param_isFocusTrapped === void 0 ? true : _param_isFocusTrapped, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
+        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
             "id",
             "withAnimation",
             "onClose",
@@ -83,7 +83,6 @@ var Popup = component(popupConfig);
             "closeOnEsc",
             "closeOnOverlayClick",
             "withBlur",
-            "isFocusTrapped",
             "initialFocusRef",
             "focusAfterRef",
             "zIndex",
@@ -99,7 +98,7 @@ var Popup = component(popupConfig);
         ]);
         var innerIsOpen = Boolean(isOpen || opened);
         var innerHasClose = hasClose === undefined && hasBody || hasClose;
-        var trapRef = useFocusTrap(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);
+        var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
         var popupController = usePopupContext();
         var innerRef = useForkRef(trapRef, outerRootRef);
         var uniqId = safeUseId();

package/emotion/es/examples/components/Combobox/Combobox.js

@@ -0,0 +1,7 @@
+import { component, mergeConfig } from "../../../engines";
+import { comboboxNewConfig } from "../../..";
+import { config } from "./Combobox.config";
+var mergedConfig = mergeConfig(comboboxNewConfig, config);
+var ComboboxComponent = component(mergedConfig);
+var Combobox = ComboboxComponent;
+export { Combobox };

package/emotion/es/hooks/useFocusTrap.js

@@ -39,14 +39,14 @@ var focusManager = new FocusManager();
 /**
  *  Захватывает фокус внутри DOM node.
  * */ export var useFocusTrap = function() {
-    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0, enableOnFirstMount = arguments.length > 4 ? arguments[4] : void 0;
+    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0;
     var ref = useRef();
     var setRef = useCallback(function(node) {
         if (ref.current) {
             focusManager.teardownScopedFocus();
             focusManager.returnFocus();
         }
-        if ((active || enableOnFirstMount) && node) {
+        if (active && node) {
             focusManager.setupScopedFocus(node);
             focusManager.markForFocusAfter(focusAfterNode);
             // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
@@ -65,21 +65,15 @@ var focusManager = new FocusManager();
         ref.current = null;
     }, [
         active,
-        enableOnFirstMount,
         firstFocusSelector
     ]);
     useEffect(function() {
-        if (!active && !enableOnFirstMount) {
+        if (!active) {
             return;
         }
         var handleKeyDown = function(event) {
             if (event.key === 'Tab' && ref.current) {
-                scopeTab(ref.current, event, active);
-                if (enableOnFirstMount) {
-                    setTimeout(function() {
-                        focusManager.teardownScopedFocus();
-                    });
-                }
+                scopeTab(ref.current, event);
             }
         };
         document.addEventListener('keydown', handleKeyDown);
@@ -87,8 +81,7 @@ var focusManager = new FocusManager();
             document.removeEventListener('keydown', handleKeyDown);
         };
     }, [
-        active,
-        enableOnFirstMount
+        active
     ]);
     return setRef;
 };

package/emotion/es/utils/scopeTab.js

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

package/es/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -58,7 +58,7 @@ var DropdownInner = function DropdownInner(_ref) {
       id: listId,
       role: "group",
       listMaxHeight: item.listMaxHeight
-    }, item.items.map(function (innerItem, innerIndex) {
+    }, item.beforeList, item.items.map(function (innerItem, innerIndex) {
       return /*#__PURE__*/React.createElement(DropdownInner, {
         key: "".concat(innerIndex, "/").concat(currentLevel),
         item: innerItem,

package/es/components/Dropdown/ui/DropdownInner/DropdownInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownInner.js","sources":["../../../../../src/components/Dropdown/ui/DropdownInner/DropdownInner.tsx"],"sourcesContent":["import React, { useRef } from 'react';\nimport type { FC } from 'react';\nimport { safeUseId } from 'src/utils';\n\nimport { DropdownItem } from '../DropdownItem/DropdownItem';\nimport { Ul, ListWrapper } from '../../Dropdown.styles';\nimport { FloatingPopover } from '../../FloatingPopover';\nimport { getPlacement } from '../../utils';\n\nimport { DropdownInnerProps } from './DropdownInner.type';\n\nconst DropdownInner: FC<DropdownInnerProps> = ({\n    item,\n    currentLevel,\n    path,\n    dispatchPath,\n    index,\n    trigger,\n    listWidth,\n    portal,\n}) => {\n    const handleToggle = (opened: boolean): void => {\n        if (opened) {\n            dispatchPath({ type: 'changed_on_level', value: item.value.toString(), level: currentLevel + 1 });\n        } else {\n            dispatchPath({ type: 'cut_by_level', level: currentLevel + 1 });\n        }\n    };\n\n    const listWrapperRef = useRef<HTMLDivElement>(null);\n\n    const isCurrentListOpen = path[currentLevel + 1] === item.value.toString();\n\n    const treeId = safeUseId();\n    const listId = `${treeId}_tree_level_${currentLevel + 2}`;\n    const nextLevel = currentLevel + 1;\n\n    if (item?.items) {\n        return (\n            <FloatingPopover\n                placement={getPlacement(item?.placement || 'right')}\n                opened={isCurrentListOpen}\n                onToggle={handleToggle}\n                trigger={item.trigger || trigger}\n                target={\n                    <DropdownItem\n                        item={item}\n                        index={index}\n                        path={path}\n                        currentLevel={currentLevel}\n                        ariaControls={listId}\n                        ariaExpanded={isCurrentListOpen}\n                        ariaLevel={nextLevel}\n                        ariaLabel={item.label}\n                    />\n                }\n                isInner\n                portal={portal}\n            >\n                <ListWrapper ref={listWrapperRef} listWidth={listWidth}>\n                    <Ul id={listId} role=\"group\" listMaxHeight={item.listMaxHeight}>\n                        {item.items.map((innerItem, innerIndex) => (\n                            <DropdownInner\n                                key={`${innerIndex}/${currentLevel}`}\n                                item={innerItem}\n                                currentLevel={nextLevel}\n                                path={path}\n                                dispatchPath={dispatchPath}\n                                index={innerIndex}\n                                trigger={trigger}\n                                listWidth={listWidth}\n                                portal={listWrapperRef}\n                            />\n                        ))}\n                    </Ul>\n                </ListWrapper>\n            </FloatingPopover>\n        );\n    }\n\n    return <DropdownItem item={item} path={path} index={index} currentLevel={currentLevel} ariaLevel={nextLevel} />;\n};\n\nexport { DropdownInner };\n"],"names":["DropdownInner","_ref","item","currentLevel","path","dispatchPath","index","trigger","listWidth","portal","handleToggle","opened","type","value","toString","level","listWrapperRef","useRef","isCurrentListOpen","treeId","safeUseId","listId","concat","nextLevel","items","React","createElement","FloatingPopover","placement","getPlacement","onToggle","target","DropdownItem","ariaControls","ariaExpanded","ariaLevel","ariaLabel","label","isInner","ListWrapper","ref","Ul","id","role","listMaxHeight","map","innerItem","innerIndex","key"],"mappings":";;;;;;;AAWA,IAAMA,aAAqC,GAAG,SAAxCA,aAAqCA,CAAAC,IAAA,EASrC;AAAA,EAAA,IARFC,IAAI,GAAAD,IAAA,CAAJC,IAAI;IACJC,YAAY,GAAAF,IAAA,CAAZE,YAAY;IACZC,IAAI,GAAAH,IAAA,CAAJG,IAAI;IACJC,YAAY,GAAAJ,IAAA,CAAZI,YAAY;IACZC,KAAK,GAAAL,IAAA,CAALK,KAAK;IACLC,OAAO,GAAAN,IAAA,CAAPM,OAAO;IACPC,SAAS,GAAAP,IAAA,CAATO,SAAS;IACTC,MAAM,GAAAR,IAAA,CAANQ,MAAM,CAAA;AAEN,EAAA,IAAMC,YAAY,GAAG,SAAfA,YAAYA,CAAIC,MAAe,EAAW;AAC5C,IAAA,IAAIA,MAAM,EAAE;AACRN,MAAAA,YAAY,CAAC;AAAEO,QAAAA,IAAI,EAAE,kBAAkB;AAAEC,QAAAA,KAAK,EAAEX,IAAI,CAACW,KAAK,CAACC,QAAQ,EAAE;QAAEC,KAAK,EAAEZ,YAAY,GAAG,CAAA;AAAE,OAAC,CAAC,CAAA;AACrG,KAAC,MAAM;AACHE,MAAAA,YAAY,CAAC;AAAEO,QAAAA,IAAI,EAAE,cAAc;QAAEG,KAAK,EAAEZ,YAAY,GAAG,CAAA;AAAE,OAAC,CAAC,CAAA;AACnE,KAAA;GACH,CAAA;AAED,EAAA,IAAMa,cAAc,GAAGC,MAAM,CAAiB,IAAI,CAAC,CAAA;AAEnD,EAAA,IAAMC,iBAAiB,GAAGd,IAAI,CAACD,YAAY,GAAG,CAAC,CAAC,KAAKD,IAAI,CAACW,KAAK,CAACC,QAAQ,EAAE,CAAA;AAE1E,EAAA,IAAMK,MAAM,GAAGC,SAAS,EAAE,CAAA;EAC1B,IAAMC,MAAM,GAAAC,EAAAA,CAAAA,MAAA,CAAMH,MAAM,EAAAG,cAAAA,CAAAA,CAAAA,MAAA,CAAenB,YAAY,GAAG,CAAC,CAAE,CAAA;AACzD,EAAA,IAAMoB,SAAS,GAAGpB,YAAY,GAAG,CAAC,CAAA;AAElC,EAAA,IAAID,IAAI,KAAJA,IAAAA,IAAAA,IAAI,eAAJA,IAAI,CAAEsB,KAAK,EAAE;AACb,IAAA,oBACIC,KAAA,CAAAC,aAAA,CAACC,eAAe,EAAA;AACZC,MAAAA,SAAS,EAAEC,YAAY,CAAC,CAAA3B,IAAI,KAAA,IAAA,IAAJA,IAAI,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAJA,IAAI,CAAE0B,SAAS,KAAI,OAAO,CAAE;AACpDjB,MAAAA,MAAM,EAAEO,iBAAkB;AAC1BY,MAAAA,QAAQ,EAAEpB,YAAa;AACvBH,MAAAA,OAAO,EAAEL,IAAI,CAACK,OAAO,IAAIA,OAAQ;AACjCwB,MAAAA,MAAM,eACFN,KAAA,CAAAC,aAAA,CAACM,YAAY,EAAA;AACT9B,QAAAA,IAAI,EAAEA,IAAK;AACXI,QAAAA,KAAK,EAAEA,KAAM;AACbF,QAAAA,IAAI,EAAEA,IAAK;AACXD,QAAAA,YAAY,EAAEA,YAAa;AAC3B8B,QAAAA,YAAY,EAAEZ,MAAO;AACrBa,QAAAA,YAAY,EAAEhB,iBAAkB;AAChCiB,QAAAA,SAAS,EAAEZ,SAAU;QACrBa,SAAS,EAAElC,IAAI,CAACmC,KAAAA;AAAM,OACzB,CACJ;MACDC,OAAO,EAAA,IAAA;AACP7B,MAAAA,MAAM,EAAEA,MAAAA;AAAO,KAAA,eAEfgB,KAAA,CAAAC,aAAA,CAACa,WAAW,EAAA;AAACC,MAAAA,GAAG,EAAExB,cAAe;AAACR,MAAAA,SAAS,EAAEA,SAAAA;AAAU,KAAA,eACnDiB,KAAA,CAAAC,aAAA,CAACe,EAAE,EAAA;AAACC,MAAAA,EAAE,EAAErB,MAAO;AAACsB,MAAAA,IAAI,EAAC,OAAO;MAACC,aAAa,EAAE1C,IAAI,CAAC0C,aAAAA;KAC5C1C,EAAAA,IAAI,CAACsB,KAAK,CAACqB,GAAG,CAAC,UAACC,SAAS,EAAEC,UAAU,EAAA;AAAA,MAAA,oBAClCtB,KAAA,CAAAC,aAAA,CAAC1B,aAAa,EAAA;QACVgD,GAAG,EAAA,EAAA,CAAA1B,MAAA,CAAKyB,UAAU,OAAAzB,MAAA,CAAInB,YAAY,CAAG;AACrCD,QAAAA,IAAI,EAAE4C,SAAU;AAChB3C,QAAAA,YAAY,EAAEoB,SAAU;AACxBnB,QAAAA,IAAI,EAAEA,IAAK;AACXC,QAAAA,YAAY,EAAEA,YAAa;AAC3BC,QAAAA,KAAK,EAAEyC,UAAW;AAClBxC,QAAAA,OAAO,EAAEA,OAAQ;AACjBC,QAAAA,SAAS,EAAEA,SAAU;AACrBC,QAAAA,MAAM,EAAEO,cAAAA;AAAe,OAC1B,CAAC,CAAA;KACL,CACD,CACK,CACA,CAAC,CAAA;AAE1B,GAAA;AAEA,EAAA,oBAAOS,KAAA,CAAAC,aAAA,CAACM,YAAY,EAAA;AAAC9B,IAAAA,IAAI,EAAEA,IAAK;AAACE,IAAAA,IAAI,EAAEA,IAAK;AAACE,IAAAA,KAAK,EAAEA,KAAM;AAACH,IAAAA,YAAY,EAAEA,YAAa;AAACgC,IAAAA,SAAS,EAAEZ,SAAAA;AAAU,GAAE,CAAC,CAAA;AACnH;;;;"}
+{"version":3,"file":"DropdownInner.js","sources":["../../../../../src/components/Dropdown/ui/DropdownInner/DropdownInner.tsx"],"sourcesContent":["import React, { useRef } from 'react';\nimport type { FC } from 'react';\nimport { safeUseId } from 'src/utils';\n\nimport { DropdownItem } from '../DropdownItem/DropdownItem';\nimport { Ul, ListWrapper } from '../../Dropdown.styles';\nimport { FloatingPopover } from '../../FloatingPopover';\nimport { getPlacement } from '../../utils';\n\nimport { DropdownInnerProps } from './DropdownInner.type';\n\nconst DropdownInner: FC<DropdownInnerProps> = ({\n    item,\n    currentLevel,\n    path,\n    dispatchPath,\n    index,\n    trigger,\n    listWidth,\n    portal,\n}) => {\n    const handleToggle = (opened: boolean): void => {\n        if (opened) {\n            dispatchPath({ type: 'changed_on_level', value: item.value.toString(), level: currentLevel + 1 });\n        } else {\n            dispatchPath({ type: 'cut_by_level', level: currentLevel + 1 });\n        }\n    };\n\n    const listWrapperRef = useRef<HTMLDivElement>(null);\n\n    const isCurrentListOpen = path[currentLevel + 1] === item.value.toString();\n\n    const treeId = safeUseId();\n    const listId = `${treeId}_tree_level_${currentLevel + 2}`;\n    const nextLevel = currentLevel + 1;\n\n    if (item?.items) {\n        return (\n            <FloatingPopover\n                placement={getPlacement(item?.placement || 'right')}\n                opened={isCurrentListOpen}\n                onToggle={handleToggle}\n                trigger={item.trigger || trigger}\n                target={\n                    <DropdownItem\n                        item={item}\n                        index={index}\n                        path={path}\n                        currentLevel={currentLevel}\n                        ariaControls={listId}\n                        ariaExpanded={isCurrentListOpen}\n                        ariaLevel={nextLevel}\n                        ariaLabel={item.label}\n                    />\n                }\n                isInner\n                portal={portal}\n            >\n                <ListWrapper ref={listWrapperRef} listWidth={listWidth}>\n                    <Ul id={listId} role=\"group\" listMaxHeight={item.listMaxHeight}>\n                        {item.beforeList}\n\n                        {item.items.map((innerItem, innerIndex) => (\n                            <DropdownInner\n                                key={`${innerIndex}/${currentLevel}`}\n                                item={innerItem}\n                                currentLevel={nextLevel}\n                                path={path}\n                                dispatchPath={dispatchPath}\n                                index={innerIndex}\n                                trigger={trigger}\n                                listWidth={listWidth}\n                                portal={listWrapperRef}\n                            />\n                        ))}\n                    </Ul>\n                </ListWrapper>\n            </FloatingPopover>\n        );\n    }\n\n    return <DropdownItem item={item} path={path} index={index} currentLevel={currentLevel} ariaLevel={nextLevel} />;\n};\n\nexport { DropdownInner };\n"],"names":["DropdownInner","_ref","item","currentLevel","path","dispatchPath","index","trigger","listWidth","portal","handleToggle","opened","type","value","toString","level","listWrapperRef","useRef","isCurrentListOpen","treeId","safeUseId","listId","concat","nextLevel","items","React","createElement","FloatingPopover","placement","getPlacement","onToggle","target","DropdownItem","ariaControls","ariaExpanded","ariaLevel","ariaLabel","label","isInner","ListWrapper","ref","Ul","id","role","listMaxHeight","beforeList","map","innerItem","innerIndex","key"],"mappings":"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"}

package/es/components/Modal/Modal.js

@@ -16,7 +16,7 @@ import { popupConfig } from '../Popup/Popup.js';
 import { Overlay } from '../Overlay/Overlay.js';
 
 var _IconClose;
-var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "isFocusTrapped", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen", "hasBody", "hasClose", "resizable", "draggable"];
+var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "opened", "isOpen", "hasBody", "hasClose", "resizable", "draggable"];
 
 // issue #823
 var Popup = /*#__PURE__*/component(popupConfig);
@@ -37,8 +37,6 @@ var modalRoot = function modalRoot(Root) {
       _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
       closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
       withBlur = _ref.withBlur,
-      _ref$isFocusTrapped = _ref.isFocusTrapped,
-      isFocusTrapped = _ref$isFocusTrapped === void 0 ? true : _ref$isFocusTrapped,
       initialFocusRef = _ref.initialFocusRef,
       focusAfterRef = _ref.focusAfterRef,
       zIndex = _ref.zIndex,
@@ -54,7 +52,7 @@ var modalRoot = function modalRoot(Root) {
       rest = _objectWithoutProperties(_ref, _excluded);
     var innerIsOpen = Boolean(isOpen || opened);
     var innerHasClose = hasClose === undefined && hasBody || hasClose;
-    var trapRef = useFocusTrap(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);
+    var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
     var popupController = usePopupContext();
     var innerRef = useForkRef(trapRef, outerRootRef);
     var uniqId = safeUseId();

package/es/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 { useForkRef } from '@salutejs/plasma-core';\nimport { safeUseId } from 'src/utils';\nimport { RootProps, component } from 'src/engines';\nimport { useFocusTrap } from 'src/hooks';\n\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { IconClose } from '../_Icon/Icons/IconClose';\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';\nimport { CloseButton, ModalBody, ModalContent, base } from './Modal.styles';\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                isFocusTrapped = true,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                resizable,\n                draggable,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\n            const trapRef = useFocusTrap(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);\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({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(Array.from(popupController.items.values())) !== 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            const overlayNode = (\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            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    draggable={draggable}\n                    resizable={resizable}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\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","_ref$isFocusTrapped","isFocusTrapped","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","opened","isOpen","hasBody","hasClose","resizable","draggable","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","Array","from","items","values","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","_IconClose","IconClose","size","color","Fragment","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 } from '@salutejs/plasma-core';\nimport { safeUseId } from 'src/utils';\nimport { RootProps, component } from 'src/engines';\nimport { useFocusTrap } from 'src/hooks';\n\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { IconClose } from '../_Icon/Icons/IconClose';\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';\nimport { CloseButton, ModalBody, ModalContent, base } from './Modal.styles';\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                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                resizable,\n                draggable,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\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({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(Array.from(popupController.items.values())) !== 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            const overlayNode = (\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            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    draggable={draggable}\n                    resizable={resizable}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\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","opened","isOpen","hasBody","hasClose","resizable","draggable","rest","_objectWithoutProperties","_excluded","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","Array","from","items","values","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","_IconClose","IconClose","size","color","Fragment","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}

package/es/hooks/useFocusTrap.js

@@ -47,14 +47,13 @@ var useFocusTrap = function useFocusTrap() {
   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 enableOnFirstMount = arguments.length > 4 ? arguments[4] : undefined;
   var ref = useRef();
   var setRef = useCallback(function (node) {
     if (ref.current) {
       focusManager.teardownScopedFocus();
       focusManager.returnFocus();
     }
-    if ((active || enableOnFirstMount) && node) {
+    if (active && node) {
       focusManager.setupScopedFocus(node);
       focusManager.markForFocusAfter(focusAfterNode);
 
@@ -72,26 +71,21 @@ var useFocusTrap = function useFocusTrap() {
       return;
     }
     ref.current = null;
-  }, [active, enableOnFirstMount, firstFocusSelector]);
+  }, [active, firstFocusSelector]);
   useEffect(function () {
-    if (!active && !enableOnFirstMount) {
+    if (!active) {
       return;
     }
     var handleKeyDown = function handleKeyDown(event) {
       if (event.key === 'Tab' && ref.current) {
-        scopeTab(ref.current, event, active);
-        if (enableOnFirstMount) {
-          setTimeout(function () {
-            focusManager.teardownScopedFocus();
-          });
-        }
+        scopeTab(ref.current, event);
       }
     };
     document.addEventListener('keydown', handleKeyDown);
     return function () {
       document.removeEventListener('keydown', handleKeyDown);
     };
-  }, [active, enableOnFirstMount]);
+  }, [active]);
   return setRef;
 };
 

package/es/hooks/useFocusTrap.js.map

@@ -1 +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    enableOnFirstMount?: 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 || enableOnFirstMount) && 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, enableOnFirstMount, firstFocusSelector],\n    );\n\n    useEffect(() => {\n        if (!active && !enableOnFirstMount) {\n            return;\n        }\n\n        const handleKeyDown = (event: KeyboardEvent) => {\n            if (event.key === 'Tab' && ref.current) {\n                scopeTab(ref.current, event, active);\n\n                if (enableOnFirstMount) {\n                    setTimeout(() => {\n                        focusManager.teardownScopedFocus();\n                    });\n                }\n            }\n        };\n\n        document.addEventListener('keydown', handleKeyDown);\n        return () => {\n            document.removeEventListener('keydown', handleKeyDown);\n        };\n    }, [active, enableOnFirstMount]);\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","enableOnFirstMount","useRef","setRef","useCallback","teardownScopedFocus","returnFocus","setupScopedFocus","markForFocusAfter","setTimeout","ownerDocument","addEventListener","useEffect","handleKeyDown","event","key","scopeTab","document"],"mappings":"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"}
+{"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/es/utils/scopeTab.js

@@ -5,7 +5,7 @@ import { findTabbableDescendants } from './tabbable.js';
  * @param node
  * @param event
  */
-var scopeTab = function scopeTab(node, event, activeFocusTrap) {
+var scopeTab = function scopeTab(node, event) {
   var tabbable = findTabbableDescendants(node);
   if (!tabbable.length) {
     event.preventDefault();
@@ -17,7 +17,7 @@ var scopeTab = function scopeTab(node, event, activeFocusTrap) {
   var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
 
   // если не является, то передаем обработку таба самому браузеру
-  if (!leavingFinalTabbable || !activeFocusTrap) {
+  if (!leavingFinalTabbable) {
     return;
   }
 

package/es/utils/scopeTab.js.map

@@ -1 +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, activeFocusTrap?: boolean) => {\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 || !activeFocusTrap) {\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","activeFocusTrap","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,EAAEC,eAAyB,EAAK;AAC5F,EAAA,IAAMC,QAAQ,GAAGC,uBAAuB,CAACJ,IAAI,CAAC,CAAA;AAC9C,EAAA,IAAI,CAACG,QAAQ,CAACE,MAAM,EAAE;IAClBJ,KAAK,CAACK,cAAc,EAAE,CAAA;AACtB,IAAA,OAAA;AACJ,GAAA;;AAEA;AACA,EAAA,IAAMC,aAAa,GAAGJ,QAAQ,CAACF,KAAK,CAACO,QAAQ,GAAG,CAAC,GAAGL,QAAQ,CAACE,MAAM,GAAG,CAAC,CAAC,CAAA;AACxE,EAAA,IAAMI,oBAAoB,GAAGF,aAAa,KAAKG,QAAQ,CAACC,aAAa,IAAIX,IAAI,KAAKU,QAAQ,CAACC,aAAa,CAAA;;AAExG;AACA,EAAA,IAAI,CAACF,oBAAoB,IAAI,CAACP,eAAe,EAAE;AAC3C,IAAA,OAAA;AACJ,GAAA;;AAEA;EACAD,KAAK,CAACK,cAAc,EAAE,CAAA;AACtB,EAAA,IAAMM,MAAM,GAAGT,QAAQ,CAACF,KAAK,CAACO,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;;;;"}
+{"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-new-hope",
-  "version": "0.337.0-canary.2244.17909508967.0",
+  "version": "0.337.0-canary.2250.17939562431.0",
   "description": "Salute Design System blueprint",
   "main": "cjs/index.js",
   "module": "es/index.js",
@@ -137,5 +137,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "67629303b09ab44c3af1c217ac9abb7f2790858c"
+  "gitHead": "1903d7531f4193da486df1b8e92490cb1464ebd0"
 }

package/styled-components/cjs/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -101,7 +101,7 @@ var DropdownInner = function(param) {
             id: listId,
             role: "group",
             listMaxHeight: item.listMaxHeight
-        }, item.items.map(function(innerItem, innerIndex) {
+        }, item.beforeList, item.items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ _react.default.createElement(DropdownInner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
                 item: innerItem,

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

@@ -130,7 +130,7 @@ function _object_without_properties_loose(source, excluded) {
 var Popup = (0, _engines.component)(_Popup.popupConfig);
 var modalRoot = function(Root) {
     return /*#__PURE__*/ (0, _react.forwardRef)(function(_param, outerRootRef) {
-        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, _param_isFocusTrapped = _param.isFocusTrapped, isFocusTrapped = _param_isFocusTrapped === void 0 ? true : _param_isFocusTrapped, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
+        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
             "id",
             "withAnimation",
             "onClose",
@@ -139,7 +139,6 @@ var modalRoot = function(Root) {
             "closeOnEsc",
             "closeOnOverlayClick",
             "withBlur",
-            "isFocusTrapped",
             "initialFocusRef",
             "focusAfterRef",
             "zIndex",
@@ -155,7 +154,7 @@ var modalRoot = function(Root) {
         ]);
         var innerIsOpen = Boolean(isOpen || opened);
         var innerHasClose = hasClose === undefined && hasBody || hasClose;
-        var trapRef = (0, _hooks.useFocusTrap)(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);
+        var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef, true);
         var popupController = (0, _Popup.usePopupContext)();
         var innerRef = (0, _plasmacore.useForkRef)(trapRef, outerRootRef);
         var uniqId = (0, _utils.safeUseId)();

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

@@ -47,14 +47,14 @@ var processNode = function(node, firstFocusSelector, ref) {
 };
 var focusManager = new _focusManager.FocusManager();
 var useFocusTrap = function() {
-    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0, enableOnFirstMount = arguments.length > 4 ? arguments[4] : void 0;
+    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0;
     var ref = (0, _react.useRef)();
     var setRef = (0, _react.useCallback)(function(node) {
         if (ref.current) {
             focusManager.teardownScopedFocus();
             focusManager.returnFocus();
         }
-        if ((active || enableOnFirstMount) && node) {
+        if (active && node) {
             focusManager.setupScopedFocus(node);
             focusManager.markForFocusAfter(focusAfterNode);
             // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
@@ -73,21 +73,15 @@ var useFocusTrap = function() {
         ref.current = null;
     }, [
         active,
-        enableOnFirstMount,
         firstFocusSelector
     ]);
     (0, _react.useEffect)(function() {
-        if (!active && !enableOnFirstMount) {
+        if (!active) {
             return;
         }
         var handleKeyDown = function(event) {
             if (event.key === 'Tab' && ref.current) {
-                (0, _scopeTab.scopeTab)(ref.current, event, active);
-                if (enableOnFirstMount) {
-                    setTimeout(function() {
-                        focusManager.teardownScopedFocus();
-                    });
-                }
+                (0, _scopeTab.scopeTab)(ref.current, event);
             }
         };
         document.addEventListener('keydown', handleKeyDown);
@@ -95,8 +89,7 @@ var useFocusTrap = function() {
             document.removeEventListener('keydown', handleKeyDown);
         };
     }, [
-        active,
-        enableOnFirstMount
+        active
     ]);
     return setRef;
 };

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

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "scopeTab", {
     }
 });
 var _tabbable = require("./tabbable");
-var scopeTab = function(node, event, activeFocusTrap) {
+var scopeTab = function(node, event) {
     var tabbable = (0, _tabbable.findTabbableDescendants)(node);
     if (!tabbable.length) {
         event.preventDefault();
@@ -19,7 +19,7 @@ var scopeTab = function(node, event, activeFocusTrap) {
     var finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];
     var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
     // если не является, то передаем обработку таба самому браузеру
-    if (!leavingFinalTabbable || !activeFocusTrap) {
+    if (!leavingFinalTabbable) {
         return;
     }
     // иначе зацкливаемся

package/styled-components/es/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -50,7 +50,7 @@ var DropdownInner = function(param) {
             id: listId,
             role: "group",
             listMaxHeight: item.listMaxHeight
-        }, item.items.map(function(innerItem, innerIndex) {
+        }, item.beforeList, item.items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ React.createElement(DropdownInner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
                 item: innerItem,

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

@@ -74,7 +74,7 @@ var Popup = component(popupConfig);
  * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.
  */ export var modalRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(_param, outerRootRef) {
-        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, _param_isFocusTrapped = _param.isFocusTrapped, isFocusTrapped = _param_isFocusTrapped === void 0 ? true : _param_isFocusTrapped, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
+        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
             "id",
             "withAnimation",
             "onClose",
@@ -83,7 +83,6 @@ var Popup = component(popupConfig);
             "closeOnEsc",
             "closeOnOverlayClick",
             "withBlur",
-            "isFocusTrapped",
             "initialFocusRef",
             "focusAfterRef",
             "zIndex",
@@ -99,7 +98,7 @@ var Popup = component(popupConfig);
         ]);
         var innerIsOpen = Boolean(isOpen || opened);
         var innerHasClose = hasClose === undefined && hasBody || hasClose;
-        var trapRef = useFocusTrap(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);
+        var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
         var popupController = usePopupContext();
         var innerRef = useForkRef(trapRef, outerRootRef);
         var uniqId = safeUseId();

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

@@ -39,14 +39,14 @@ var focusManager = new FocusManager();
 /**
  *  Захватывает фокус внутри DOM node.
  * */ export var useFocusTrap = function() {
-    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0, enableOnFirstMount = arguments.length > 4 ? arguments[4] : void 0;
+    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0;
     var ref = useRef();
     var setRef = useCallback(function(node) {
         if (ref.current) {
             focusManager.teardownScopedFocus();
             focusManager.returnFocus();
         }
-        if ((active || enableOnFirstMount) && node) {
+        if (active && node) {
             focusManager.setupScopedFocus(node);
             focusManager.markForFocusAfter(focusAfterNode);
             // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
@@ -65,21 +65,15 @@ var focusManager = new FocusManager();
         ref.current = null;
     }, [
         active,
-        enableOnFirstMount,
         firstFocusSelector
     ]);
     useEffect(function() {
-        if (!active && !enableOnFirstMount) {
+        if (!active) {
             return;
         }
         var handleKeyDown = function(event) {
             if (event.key === 'Tab' && ref.current) {
-                scopeTab(ref.current, event, active);
-                if (enableOnFirstMount) {
-                    setTimeout(function() {
-                        focusManager.teardownScopedFocus();
-                    });
-                }
+                scopeTab(ref.current, event);
             }
         };
         document.addEventListener('keydown', handleKeyDown);
@@ -87,8 +81,7 @@ var focusManager = new FocusManager();
             document.removeEventListener('keydown', handleKeyDown);
         };
     }, [
-        active,
-        enableOnFirstMount
+        active
     ]);
     return setRef;
 };

package/styled-components/es/utils/scopeTab.js

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

package/types/components/Dropdown/ui/DropdownInner/DropdownInner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownInner.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/ui/DropdownInner/DropdownInner.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAQhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,QAAA,MAAM,aAAa,EAAE,EAAE,CAAC,kBAAkB,CAsEzC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"DropdownInner.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/ui/DropdownInner/DropdownInner.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAQhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,QAAA,MAAM,aAAa,EAAE,EAAE,CAAC,kBAAkB,CAwEzC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/types/components/Dropdown/ui/DropdownItem/DropdownItem.type.d.ts

@@ -18,6 +18,11 @@ export type DropdownItemOption = {
      * Список дочерних items
      */
     items?: Array<DropdownItemOption>;
+    /**
+     * Ячейка для контента в начале выпадающего списка.
+     * Применяется только к при наличии дочерних элементов `items`
+     */
+    beforeList?: ReactNode;
     /**
      * Item не активен
      */

package/types/components/Dropdown/ui/DropdownItem/DropdownItem.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownItem.type.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/ui/DropdownItem/DropdownItem.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE/E,MAAM,MAAM,kBAAkB,GAAG;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAExC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,WAAW,iBAAkB,SAAQ,cAAc,CAAC,aAAa,CAAC;IACpE,IAAI,EAAE,kBAAkB,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;CAClD"}
+{"version":3,"file":"DropdownItem.type.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/ui/DropdownItem/DropdownItem.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE/E,MAAM,MAAM,kBAAkB,GAAG;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAClC;;;OAGG;IACH,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAExC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,WAAW,iBAAkB,SAAQ,cAAc,CAAC,aAAa,CAAC;IACpE,IAAI,EAAE,kBAAkB,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;CAClD"}

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

@@ -1 +1 @@
-{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAa,MAAM,aAAa,CAAC;AASnD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAS3C;;;GAGG;AACH,eAAO,MAAM,SAAS,SAAU,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,sFAkHhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBApHQ,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC;;;;;;;;;;CAiIpE,CAAC"}
+{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAa,MAAM,aAAa,CAAC;AASnD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAS3C;;;GAGG;AACH,eAAO,MAAM,SAAS,SAAU,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,sFAiHhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBAnHQ,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC;;;;;;;;;;CAgIpE,CAAC"}

package/types/components/Modal/Modal.types.d.ts

@@ -33,11 +33,6 @@ export interface CommonModalProps extends PopupProps {
      * Обработчик клика при нажатии вне области модального окна(если не передан, то при нажатии используется onClose).
      */
     onOverlayClick?: (event: React.MouseEvent<HTMLDivElement>) => void;
-    /**
-     * Фокус элементов будет происходить только внутри модального окна
-     * @default true
-     */
-    isFocusTrapped?: boolean;
     /**
      * Первый элемент для фокуса внутри модального окна.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"Modal.types.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEjF,MAAM,MAAM,cAAc,GACpB;IACI;;OAEG;IACH,OAAO,EAAE,IAAI,CAAC;IACd;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,GACD;IACI,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,CAAC;CACpB,CAAC;AAER,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAChD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC;IACnE;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;OAEG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC/C;;;OAGG;IACH,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC7C;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAE3D,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAEpH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,QAAQ,CAAC,GACjE,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,qBAAqB,GAAG,gBAAgB,GAAG,SAAS,CAAC,CAAC;AAExF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,GAAG,WAAW,GAAG,QAAQ,CAAC,GAC1E,IAAI,CAAC,UAAU,EAAE,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC,CAAC"}
+{"version":3,"file":"Modal.types.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/Modal.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEjF,MAAM,MAAM,cAAc,GACpB;IACI;;OAEG;IACH,OAAO,EAAE,IAAI,CAAC;IACd;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,GACD;IACI,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,CAAC;CACpB,CAAC;AAER,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAChD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC;IACnE;;OAEG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC/C;;;OAGG;IACH,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC7C;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAE3D,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAEpH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,QAAQ,CAAC,GACjE,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,qBAAqB,GAAG,gBAAgB,GAAG,SAAS,CAAC,CAAC;AAExF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,GAAG,WAAW,GAAG,QAAQ,CAAC,GAC1E,IAAI,CAAC,UAAU,EAAE,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC,CAAC"}

package/types/hooks/useFocusTrap.d.ts

@@ -1,5 +1,5 @@
 /**
  *  Захватывает фокус внутри DOM node.
  * */
-export declare const useFocusTrap: (active?: boolean, firstFocusSelector?: string | React.RefObject<HTMLElement>, focusAfterNode?: React.RefObject<HTMLElement>, focusAfterAnimation?: boolean, enableOnFirstMount?: boolean) => ((instance: HTMLElement | null) => void);
+export declare const useFocusTrap: (active?: boolean, firstFocusSelector?: string | React.RefObject<HTMLElement>, focusAfterNode?: React.RefObject<HTMLElement>, focusAfterAnimation?: boolean) => ((instance: HTMLElement | null) => void);
 //# sourceMappingURL=useFocusTrap.d.ts.map

package/types/hooks/useFocusTrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFocusTrap.d.ts","sourceRoot":"","sources":["../../src/hooks/useFocusTrap.ts"],"names":[],"mappings":"AAoDA;;KAEK;AACL,eAAO,MAAM,YAAY,0CAEA,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,mBACzC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,wBACvB,OAAO,uBACR,OAAO,KAC7B,CAAC,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CA0DzC,CAAC"}
+{"version":3,"file":"useFocusTrap.d.ts","sourceRoot":"","sources":["../../src/hooks/useFocusTrap.ts"],"names":[],"mappings":"AAoDA;;KAEK;AACL,eAAO,MAAM,YAAY,0CAEA,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,mBACzC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,wBACvB,OAAO,KAC9B,CAAC,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAoDzC,CAAC"}

package/types/utils/scopeTab.d.ts

@@ -3,5 +3,5 @@
  * @param node
  * @param event
  */
-export declare const scopeTab: (node: HTMLElement, event: KeyboardEvent, activeFocusTrap?: boolean) => void;
+export declare const scopeTab: (node: HTMLElement, event: KeyboardEvent) => void;
 //# sourceMappingURL=scopeTab.d.ts.map

package/types/utils/scopeTab.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scopeTab.d.ts","sourceRoot":"","sources":["../../src/utils/scopeTab.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,WAAW,SAAS,aAAa,oBAAoB,OAAO,SAsB1F,CAAC"}
+{"version":3,"file":"scopeTab.d.ts","sourceRoot":"","sources":["../../src/utils/scopeTab.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,WAAW,SAAS,aAAa,SAsB/D,CAAC"}