@salutejs/plasma-new-hope 0.118.0-dev.0 → 0.118.1-canary.1345.10282607319.0
Sign up to get free protection for your applications and to get access to all the features.
- package/cjs/components/Modal/Modal.js +3 -1
- package/cjs/components/Modal/Modal.js.map +1 -1
- package/cjs/hooks/useFocusTrap.js +97 -0
- package/cjs/hooks/useFocusTrap.js.map +1 -0
- package/cjs/index.js +2 -0
- package/cjs/index.js.map +1 -1
- package/cjs/utils/focusManager.js +56 -0
- package/cjs/utils/focusManager.js.map +1 -0
- package/cjs/utils/scopeTab.js +37 -0
- package/cjs/utils/scopeTab.js.map +1 -0
- package/cjs/utils/tabbable.js +51 -0
- package/cjs/utils/tabbable.js.map +1 -0
- package/emotion/cjs/components/Modal/Modal.js +4 -3
- package/emotion/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
- package/emotion/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
- package/emotion/cjs/hooks/index.js +7 -0
- package/emotion/cjs/hooks/useFocusTrap.js +95 -0
- package/emotion/cjs/utils/focusManager.js +60 -0
- package/emotion/cjs/utils/scopeTab.js +35 -0
- package/emotion/cjs/utils/tabbable.js +46 -0
- package/emotion/cjs/utils/useFocusTrap.js +95 -0
- package/emotion/es/components/Modal/Modal.js +3 -2
- package/emotion/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
- package/emotion/es/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
- package/emotion/es/hooks/index.js +1 -0
- package/emotion/es/hooks/useFocusTrap.js +90 -0
- package/emotion/es/utils/focusManager.js +55 -0
- package/emotion/es/utils/scopeTab.js +30 -0
- package/emotion/es/utils/tabbable.js +40 -0
- package/emotion/es/utils/useFocusTrap.js +90 -0
- package/es/components/Modal/Modal.js +4 -2
- package/es/components/Modal/Modal.js.map +1 -1
- package/es/hooks/useFocusTrap.js +93 -0
- package/es/hooks/useFocusTrap.js.map +1 -0
- package/es/index.js +1 -0
- package/es/index.js.map +1 -1
- package/es/utils/focusManager.js +52 -0
- package/es/utils/focusManager.js.map +1 -0
- package/es/utils/scopeTab.js +33 -0
- package/es/utils/scopeTab.js.map +1 -0
- package/es/utils/tabbable.js +43 -0
- package/es/utils/tabbable.js.map +1 -0
- package/package.json +4 -4
- package/styled-components/cjs/components/Modal/Modal.js +4 -3
- package/styled-components/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
- package/styled-components/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
- package/styled-components/cjs/hooks/index.js +7 -0
- package/styled-components/cjs/hooks/useFocusTrap.js +95 -0
- package/styled-components/cjs/utils/focusManager.js +60 -0
- package/styled-components/cjs/utils/scopeTab.js +35 -0
- package/styled-components/cjs/utils/tabbable.js +46 -0
- package/styled-components/cjs/utils/useFocusTrap.js +95 -0
- package/styled-components/es/components/Modal/Modal.js +3 -2
- package/styled-components/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
- package/styled-components/es/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
- package/styled-components/es/hooks/index.js +1 -0
- package/styled-components/es/hooks/useFocusTrap.js +90 -0
- package/styled-components/es/utils/focusManager.js +55 -0
- package/styled-components/es/utils/scopeTab.js +30 -0
- package/styled-components/es/utils/tabbable.js +40 -0
- package/styled-components/es/utils/useFocusTrap.js +90 -0
- package/types/components/Modal/Modal.d.ts.map +1 -1
- package/types/hooks/index.d.ts +1 -0
- package/types/hooks/index.d.ts.map +1 -1
- package/types/hooks/useFocusTrap.d.ts +6 -0
- package/types/hooks/useFocusTrap.d.ts.map +1 -0
- package/types/utils/focusManager.d.ts +15 -0
- package/types/utils/focusManager.d.ts.map +1 -0
- package/types/utils/scopeTab.d.ts +7 -0
- package/types/utils/scopeTab.d.ts.map +1 -0
- package/types/utils/tabbable.d.ts +6 -0
- package/types/utils/tabbable.d.ts.map +1 -0
- package/types/utils/useFocusTrap.d.ts +6 -0
- package/types/utils/useFocusTrap.d.ts.map +1 -0
@@ -11,6 +11,8 @@ var PopupContext = require('../Popup/PopupContext.js');
|
|
11
11
|
var Popup$1 = require('../Popup/Popup.js');
|
12
12
|
var Overlay = require('../Overlay/Overlay.js');
|
13
13
|
var index = require('../Popup/utils/index.js');
|
14
|
+
var useFocusTrap = require('../../hooks/useFocusTrap.js');
|
15
|
+
require('../../utils/react.js');
|
14
16
|
var Modal_tokens = require('./Modal.tokens.js');
|
15
17
|
var useModal = require('./hooks/useModal.js');
|
16
18
|
var base = require('./variations/_view/base.js');
|
@@ -45,7 +47,7 @@ var modalRoot = function modalRoot(Root) {
|
|
45
47
|
view = _ref.view,
|
46
48
|
isOpen = _ref.isOpen,
|
47
49
|
rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
|
48
|
-
var trapRef =
|
50
|
+
var trapRef = useFocusTrap.useFocusTrap(true, initialFocusRef, focusAfterRef, true);
|
49
51
|
var popupController = PopupContext.usePopupContext();
|
50
52
|
var innerRef = plasmaCore.useForkRef(trapRef, outerRootRef);
|
51
53
|
var uniqId = plasmaCore.safeUseId();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport {
|
1
|
+
{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { useFocusTrap } from '../../hooks';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n forwardRef<HTMLDivElement, ModalProps>(\n (\n {\n id,\n withAnimation,\n onClose,\n onOverlayClick,\n onEscKeyDown,\n closeOnEsc = true,\n closeOnOverlayClick = true,\n withBlur,\n initialFocusRef,\n focusAfterRef,\n zIndex,\n popupInfo,\n children,\n view,\n isOpen,\n ...rest\n },\n outerRootRef,\n ) => {\n const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);\n const popupController = usePopupContext();\n\n const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n const uniqId = safeUseId();\n const innerId = id || uniqId;\n const overlayBackgroundToken = withBlur\n ? `var(${tokens.modalOverlayWithBlurColor})`\n : `var(${tokens.modalOverlayColor})`;\n\n const { modalInfo } = useModal({ id: innerId, isOpen, closeOnEsc, onEscKeyDown, onClose, popupInfo });\n const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n innerId,\n popupController.items,\n ]);\n\n const onModalOverlayKeyDown = useCallback(\n (event: React.MouseEvent<HTMLDivElement>) => {\n if (onOverlayClick) {\n onOverlayClick(event);\n return;\n }\n\n if (onClose) {\n onClose();\n }\n },\n [closeOnOverlayClick, onOverlayClick, onClose],\n );\n\n return (\n <Popup\n id={innerId}\n isOpen={isOpen}\n ref={innerRef}\n popupInfo={modalInfo}\n withAnimation={withAnimation}\n zIndex={zIndex}\n overlay={\n <Root view={view}>\n <Overlay\n className={classes.overlay}\n zIndex={zIndex || DEFAULT_Z_INDEX}\n backgroundColorProperty={overlayBackgroundToken}\n withBlur={withBlur}\n transparent={transparent}\n isClickable={closeOnOverlayClick}\n onOverlayClick={onModalOverlayKeyDown}\n />\n </Root>\n }\n {...rest}\n >\n {children}\n </Popup>\n );\n },\n );\n\nexport const modalConfig = {\n name: 'Modal',\n tag: 'div',\n layout: modalRoot,\n base: '',\n variations: {\n view: {\n css: viewCSS,\n },\n },\n defaults: {\n view: 'default',\n },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","isOpen","rest","_objectWithoutProperties","_excluded","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","React","createElement","_extends","ref","overlay","Overlay","className","classes","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}
|
@@ -0,0 +1,97 @@
|
|
1
|
+
'use strict';
|
2
|
+
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
4
|
+
|
5
|
+
var React = require('react');
|
6
|
+
var focusManager$1 = require('../utils/focusManager.js');
|
7
|
+
var tabbable = require('../utils/tabbable.js');
|
8
|
+
var scopeTab = require('../utils/scopeTab.js');
|
9
|
+
|
10
|
+
// Находим элемент для фокуса
|
11
|
+
var getFocusElement = function getFocusElement(node, firstFocusSelector) {
|
12
|
+
var focusElement = null;
|
13
|
+
if (firstFocusSelector) {
|
14
|
+
if (typeof firstFocusSelector === 'string') {
|
15
|
+
focusElement = node.querySelector(firstFocusSelector);
|
16
|
+
} else if (firstFocusSelector.current) {
|
17
|
+
focusElement = firstFocusSelector.current;
|
18
|
+
}
|
19
|
+
}
|
20
|
+
if (!focusElement) {
|
21
|
+
var children = Array.from(node.querySelectorAll(tabbable.focusSelector));
|
22
|
+
focusElement = children.find(function (el) {
|
23
|
+
return tabbable.isTabble(el);
|
24
|
+
}) || null;
|
25
|
+
}
|
26
|
+
|
27
|
+
// Если ничего не нашлось, то может ли сама нода быть под фокусом
|
28
|
+
if (!focusElement && tabbable.isFocusable(node)) {
|
29
|
+
focusElement = node;
|
30
|
+
}
|
31
|
+
return focusElement;
|
32
|
+
};
|
33
|
+
var processNode = function processNode(node, firstFocusSelector, ref) {
|
34
|
+
if (ref !== null && ref !== void 0 && ref.current) {
|
35
|
+
ref.current.removeEventListener('animationend', function () {
|
36
|
+
processNode(node, firstFocusSelector, ref);
|
37
|
+
});
|
38
|
+
}
|
39
|
+
var focusElement = getFocusElement(node, firstFocusSelector);
|
40
|
+
if (focusElement) {
|
41
|
+
focusElement.focus();
|
42
|
+
}
|
43
|
+
};
|
44
|
+
var focusManager = /*#__PURE__*/new focusManager$1.FocusManager();
|
45
|
+
|
46
|
+
/**
|
47
|
+
* Захватывает фокус внутри DOM node.
|
48
|
+
* */
|
49
|
+
var useFocusTrap = function useFocusTrap() {
|
50
|
+
var active = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
|
51
|
+
var firstFocusSelector = arguments.length > 1 ? arguments[1] : undefined;
|
52
|
+
var focusAfterNode = arguments.length > 2 ? arguments[2] : undefined;
|
53
|
+
var focusAfterAnimation = arguments.length > 3 ? arguments[3] : undefined;
|
54
|
+
var ref = React.useRef();
|
55
|
+
var setRef = React.useCallback(function (node) {
|
56
|
+
if (ref.current) {
|
57
|
+
focusManager.teardownScopedFocus();
|
58
|
+
focusManager.returnFocus();
|
59
|
+
}
|
60
|
+
if (active && node) {
|
61
|
+
focusManager.setupScopedFocus(node);
|
62
|
+
focusManager.markForFocusAfter(focusAfterNode);
|
63
|
+
|
64
|
+
// Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
|
65
|
+
setTimeout(function () {
|
66
|
+
if (ref !== null && ref !== void 0 && ref.current && node.ownerDocument && focusAfterAnimation) {
|
67
|
+
ref.current.addEventListener('animationend', function () {
|
68
|
+
processNode(node, firstFocusSelector, ref);
|
69
|
+
});
|
70
|
+
} else if (node.ownerDocument) {
|
71
|
+
processNode(node, firstFocusSelector);
|
72
|
+
}
|
73
|
+
});
|
74
|
+
ref.current = node;
|
75
|
+
return;
|
76
|
+
}
|
77
|
+
ref.current = null;
|
78
|
+
}, [active, firstFocusSelector]);
|
79
|
+
React.useEffect(function () {
|
80
|
+
if (!active) {
|
81
|
+
return;
|
82
|
+
}
|
83
|
+
var handleKeyDown = function handleKeyDown(event) {
|
84
|
+
if (event.key === 'Tab' && ref.current) {
|
85
|
+
scopeTab.scopeTab(ref.current, event);
|
86
|
+
}
|
87
|
+
};
|
88
|
+
document.addEventListener('keydown', handleKeyDown);
|
89
|
+
return function () {
|
90
|
+
document.removeEventListener('keydown', handleKeyDown);
|
91
|
+
};
|
92
|
+
}, [active]);
|
93
|
+
return setRef;
|
94
|
+
};
|
95
|
+
|
96
|
+
exports.useFocusTrap = useFocusTrap;
|
97
|
+
//# sourceMappingURL=useFocusTrap.js.map
|
@@ -0,0 +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): ((instance: HTMLElement | null) => void) => {\n const ref = useRef<HTMLElement | null>();\n\n const setRef = useCallback(\n (node: HTMLElement | null) => {\n if (ref.current) {\n focusManager.teardownScopedFocus();\n focusManager.returnFocus();\n }\n\n if (active && node) {\n focusManager.setupScopedFocus(node);\n focusManager.markForFocusAfter(focusAfterNode);\n\n // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.\n setTimeout(() => {\n if (ref?.current && node.ownerDocument && focusAfterAnimation) {\n ref.current.addEventListener('animationend', () => {\n processNode(node, firstFocusSelector, ref);\n });\n } else if (node.ownerDocument) {\n processNode(node, firstFocusSelector);\n }\n });\n\n ref.current = node;\n return;\n }\n\n ref.current = null;\n },\n [active, firstFocusSelector],\n );\n\n useEffect(() => {\n if (!active) {\n return;\n }\n\n const handleKeyDown = (event: KeyboardEvent) => {\n if (event.key === 'Tab' && ref.current) {\n scopeTab(ref.current, event);\n }\n };\n\n document.addEventListener('keydown', handleKeyDown);\n return () => {\n document.removeEventListener('keydown', handleKeyDown);\n };\n }, [active]);\n\n return setRef;\n};\n"],"names":["getFocusElement","node","firstFocusSelector","focusElement","querySelector","current","children","Array","from","querySelectorAll","focusSelector","find","el","isTabble","isFocusable","processNode","ref","removeEventListener","focus","focusManager","FocusManager","useFocusTrap","active","arguments","length","undefined","focusAfterNode","focusAfterAnimation","useRef","setRef","useCallback","teardownScopedFocus","returnFocus","setupScopedFocus","markForFocusAfter","setTimeout","ownerDocument","addEventListener","useEffect","handleKeyDown","event","key","scopeTab","document"],"mappings":"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"}
|
package/cjs/index.js
CHANGED
@@ -15,6 +15,7 @@ var applySkeletonGradient = require('./mixins/applySkeletonGradient.js');
|
|
15
15
|
var applyDisabled = require('./mixins/applyDisabled.js');
|
16
16
|
var index = require('./engines/index.js');
|
17
17
|
var useUniqId = require('./hooks/useUniqId.js');
|
18
|
+
var useFocusTrap = require('./hooks/useFocusTrap.js');
|
18
19
|
var usePreviousValue = require('./hooks/usePreviousValue.js');
|
19
20
|
var useForceUpdate = require('./hooks/useForceUpdate.js');
|
20
21
|
var useDidMountEffect = require('./hooks/useDidMountEffect.js');
|
@@ -269,6 +270,7 @@ exports.getSkeletonColor = applySkeletonGradient.getSkeletonColor;
|
|
269
270
|
exports.applyDisabled = applyDisabled.applyDisabled;
|
270
271
|
exports.css = index.css;
|
271
272
|
exports.useUniqId = useUniqId.useUniqId;
|
273
|
+
exports.useFocusTrap = useFocusTrap.useFocusTrap;
|
272
274
|
exports.usePreviousValue = usePreviousValue.usePreviousValue;
|
273
275
|
exports.useForceUpdate = useForceUpdate.useForceUpdate;
|
274
276
|
exports.useDidMountEffect = useDidMountEffect.useDidMountEffect;
|
package/cjs/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
@@ -0,0 +1,56 @@
|
|
1
|
+
'use strict';
|
2
|
+
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
4
|
+
|
5
|
+
var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.js');
|
6
|
+
var tabbable = require('./tabbable.js');
|
7
|
+
|
8
|
+
/**
|
9
|
+
* Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.
|
10
|
+
* Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.
|
11
|
+
* */
|
12
|
+
var FocusManager = /*#__PURE__*/_rollupPluginBabelHelpers.createClass(function FocusManager() {
|
13
|
+
var _this = this;
|
14
|
+
_rollupPluginBabelHelpers.classCallCheck(this, FocusManager);
|
15
|
+
// массив с элементами, которые нужно зафокусить после анмаунта
|
16
|
+
_rollupPluginBabelHelpers.defineProperty(this, "focusAfterElements", []);
|
17
|
+
// массив с trap нодами
|
18
|
+
_rollupPluginBabelHelpers.defineProperty(this, "focusNodes", []);
|
19
|
+
_rollupPluginBabelHelpers.defineProperty(this, "handleFocus", function () {
|
20
|
+
// Фокус всегда должен находиться внутри необходимой ноды
|
21
|
+
var focusNode = _this.focusNodes[_this.focusNodes.length - 1];
|
22
|
+
if (!focusNode || focusNode.contains(document.activeElement)) {
|
23
|
+
return;
|
24
|
+
}
|
25
|
+
|
26
|
+
// Выделяем первый tabbable элемент
|
27
|
+
var el = tabbable.findTabbableDescendants(focusNode)[0] || focusNode;
|
28
|
+
el.focus();
|
29
|
+
});
|
30
|
+
// добавление на фокус после анмаунта
|
31
|
+
_rollupPluginBabelHelpers.defineProperty(this, "markForFocusAfter", function (focusAfterNode) {
|
32
|
+
var node = focusAfterNode && focusAfterNode.current ? focusAfterNode.current : document.activeElement;
|
33
|
+
_this.focusAfterElements.push(node);
|
34
|
+
});
|
35
|
+
// фокус на необходимый элемент
|
36
|
+
_rollupPluginBabelHelpers.defineProperty(this, "returnFocus", function () {
|
37
|
+
var _this$focusAfterEleme;
|
38
|
+
var toFocus = (_this$focusAfterEleme = _this.focusAfterElements.pop()) !== null && _this$focusAfterEleme !== void 0 ? _this$focusAfterEleme : null;
|
39
|
+
if (toFocus) {
|
40
|
+
toFocus.focus();
|
41
|
+
}
|
42
|
+
});
|
43
|
+
// при маунте ноды
|
44
|
+
_rollupPluginBabelHelpers.defineProperty(this, "setupScopedFocus", function (element) {
|
45
|
+
_this.focusNodes.push(element);
|
46
|
+
document.addEventListener('focusin', _this.handleFocus, true);
|
47
|
+
});
|
48
|
+
// при анмаунте
|
49
|
+
_rollupPluginBabelHelpers.defineProperty(this, "teardownScopedFocus", function () {
|
50
|
+
_this.focusNodes.pop();
|
51
|
+
document.removeEventListener('focusin', _this.handleFocus);
|
52
|
+
});
|
53
|
+
});
|
54
|
+
|
55
|
+
exports.FocusManager = FocusManager;
|
56
|
+
//# sourceMappingURL=focusManager.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"focusManager.js","sources":["../../src/utils/focusManager.ts"],"sourcesContent":["import { findTabbableDescendants } from './tabbable';\n\n/**\n * Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.\n * Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.\n * */\nexport class FocusManager {\n // массив с элементами, которые нужно зафокусить после анмаунта\n private focusAfterElements: Array<HTMLElement> = [];\n\n // массив с trap нодами\n private focusNodes: Array<HTMLElement> = [];\n\n private handleFocus = () => {\n // Фокус всегда должен находиться внутри необходимой ноды\n const focusNode = this.focusNodes[this.focusNodes.length - 1];\n\n if (!focusNode || focusNode.contains(document.activeElement)) {\n return;\n }\n\n // Выделяем первый tabbable элемент\n const el = findTabbableDescendants(focusNode)[0] || focusNode;\n el.focus();\n };\n\n // добавление на фокус после анмаунта\n public markForFocusAfter = (focusAfterNode?: React.RefObject<HTMLElement>) => {\n const node =\n focusAfterNode && focusAfterNode.current ? focusAfterNode.current : (document.activeElement as HTMLElement);\n this.focusAfterElements.push(node);\n };\n\n // фокус на необходимый элемент\n public returnFocus = () => {\n const toFocus = this.focusAfterElements.pop() ?? null;\n if (toFocus) {\n toFocus.focus();\n }\n };\n\n // при маунте ноды\n public setupScopedFocus = (element: HTMLElement) => {\n this.focusNodes.push(element);\n document.addEventListener('focusin', this.handleFocus, true);\n };\n\n // при анмаунте\n public teardownScopedFocus = () => {\n this.focusNodes.pop();\n document.removeEventListener('focusin', this.handleFocus);\n };\n}\n"],"names":["FocusManager","_createClass","_this","_classCallCheck","_defineProperty","focusNode","focusNodes","length","contains","document","activeElement","el","findTabbableDescendants","focus","focusAfterNode","node","current","focusAfterElements","push","_this$focusAfterEleme","toFocus","pop","element","addEventListener","handleFocus","removeEventListener"],"mappings":";;;;;;;AAEA;AACA;AACA;AACA;AACA,IAAaA,YAAY,gBAAAC,qCAAA,CAAA,SAAAD,YAAA,GAAA;AAAA,EAAA,IAAAE,KAAA,GAAA,IAAA,CAAA;AAAAC,EAAAA,wCAAA,OAAAH,YAAA,CAAA,CAAA;AACrB;AAAAI,EAAAA,wCAAA,6BACiD,EAAE,CAAA,CAAA;AAEnD;AAAAA,EAAAA,wCAAA,qBACyC,EAAE,CAAA,CAAA;AAAAA,EAAAA,wCAAA,sBAErB,YAAM;AACxB;AACA,IAAA,IAAMC,SAAS,GAAGH,KAAI,CAACI,UAAU,CAACJ,KAAI,CAACI,UAAU,CAACC,MAAM,GAAG,CAAC,CAAC,CAAA;IAE7D,IAAI,CAACF,SAAS,IAAIA,SAAS,CAACG,QAAQ,CAACC,QAAQ,CAACC,aAAa,CAAC,EAAE;AAC1D,MAAA,OAAA;AACJ,KAAA;;AAEA;IACA,IAAMC,EAAE,GAAGC,gCAAuB,CAACP,SAAS,CAAC,CAAC,CAAC,CAAC,IAAIA,SAAS,CAAA;IAC7DM,EAAE,CAACE,KAAK,EAAE,CAAA;GACb,CAAA,CAAA;AAED;EAAAT,wCAAA,CAAA,IAAA,EAAA,mBAAA,EAC2B,UAACU,cAA6C,EAAK;AAC1E,IAAA,IAAMC,IAAI,GACND,cAAc,IAAIA,cAAc,CAACE,OAAO,GAAGF,cAAc,CAACE,OAAO,GAAIP,QAAQ,CAACC,aAA6B,CAAA;AAC/GR,IAAAA,KAAI,CAACe,kBAAkB,CAACC,IAAI,CAACH,IAAI,CAAC,CAAA;GACrC,CAAA,CAAA;AAED;AAAAX,EAAAA,wCAAA,sBACqB,YAAM;AAAA,IAAA,IAAAe,qBAAA,CAAA;AACvB,IAAA,IAAMC,OAAO,GAAAD,CAAAA,qBAAA,GAAGjB,KAAI,CAACe,kBAAkB,CAACI,GAAG,EAAE,MAAAF,IAAAA,IAAAA,qBAAA,KAAAA,KAAAA,CAAAA,GAAAA,qBAAA,GAAI,IAAI,CAAA;AACrD,IAAA,IAAIC,OAAO,EAAE;MACTA,OAAO,CAACP,KAAK,EAAE,CAAA;AACnB,KAAA;GACH,CAAA,CAAA;AAED;EAAAT,wCAAA,CAAA,IAAA,EAAA,kBAAA,EAC0B,UAACkB,OAAoB,EAAK;AAChDpB,IAAAA,KAAI,CAACI,UAAU,CAACY,IAAI,CAACI,OAAO,CAAC,CAAA;IAC7Bb,QAAQ,CAACc,gBAAgB,CAAC,SAAS,EAAErB,KAAI,CAACsB,WAAW,EAAE,IAAI,CAAC,CAAA;GAC/D,CAAA,CAAA;AAED;AAAApB,EAAAA,wCAAA,8BAC6B,YAAM;AAC/BF,IAAAA,KAAI,CAACI,UAAU,CAACe,GAAG,EAAE,CAAA;IACrBZ,QAAQ,CAACgB,mBAAmB,CAAC,SAAS,EAAEvB,KAAI,CAACsB,WAAW,CAAC,CAAA;GAC5D,CAAA,CAAA;AAAA,CAAA;;;;"}
|
@@ -0,0 +1,37 @@
|
|
1
|
+
'use strict';
|
2
|
+
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
4
|
+
|
5
|
+
var tabbable = require('./tabbable.js');
|
6
|
+
|
7
|
+
/**
|
8
|
+
* Управлление фокусом лишь внутри ноды через tab
|
9
|
+
* @param node
|
10
|
+
* @param event
|
11
|
+
*/
|
12
|
+
var scopeTab = function scopeTab(node, event) {
|
13
|
+
var tabbable$1 = tabbable.findTabbableDescendants(node);
|
14
|
+
if (!tabbable$1.length) {
|
15
|
+
event.preventDefault();
|
16
|
+
return;
|
17
|
+
}
|
18
|
+
|
19
|
+
// смотрим, является ли элемент крайним - первый или последним
|
20
|
+
var finalTabbable = tabbable$1[event.shiftKey ? 0 : tabbable$1.length - 1];
|
21
|
+
var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
|
22
|
+
|
23
|
+
// если не является, то передаем обработку таба самому браузеру
|
24
|
+
if (!leavingFinalTabbable) {
|
25
|
+
return;
|
26
|
+
}
|
27
|
+
|
28
|
+
// иначе зацкливаемся
|
29
|
+
event.preventDefault();
|
30
|
+
var target = tabbable$1[event.shiftKey ? tabbable$1.length - 1 : 0];
|
31
|
+
if (target) {
|
32
|
+
target.focus();
|
33
|
+
}
|
34
|
+
};
|
35
|
+
|
36
|
+
exports.scopeTab = scopeTab;
|
37
|
+
//# sourceMappingURL=scopeTab.js.map
|
@@ -0,0 +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) => {\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;;;;"}
|
@@ -0,0 +1,51 @@
|
|
1
|
+
'use strict';
|
2
|
+
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
4
|
+
|
5
|
+
var tabbableNode = /input|select|textarea|button|object/;
|
6
|
+
var focusSelector = /*#__PURE__*/['input', 'select', 'textarea', 'a', 'button', 'object', '[tabindex]', 'audio[controls]', 'video[controls]', '[contenteditable]:not([contenteditable="false"])'].join(',');
|
7
|
+
var isHidden = function isHidden(el) {
|
8
|
+
return el.offsetWidth <= 0 && el.offsetHeight <= 0 || el.style.display === 'none' || el.style.visibility === 'hidden' || el.style.opacity === '0';
|
9
|
+
};
|
10
|
+
var isVisible = function isVisible(element, parentContainer) {
|
11
|
+
var parentElement = element;
|
12
|
+
while (parentElement) {
|
13
|
+
if (parentElement === parentContainer || parentElement === document.body) {
|
14
|
+
break;
|
15
|
+
}
|
16
|
+
if (isHidden(parentElement)) {
|
17
|
+
return false;
|
18
|
+
}
|
19
|
+
parentElement = parentElement.parentNode;
|
20
|
+
}
|
21
|
+
return true;
|
22
|
+
};
|
23
|
+
var getElementTabIndex = function getElementTabIndex(element) {
|
24
|
+
var tabIndex = element.getAttribute('tabindex');
|
25
|
+
return tabIndex === null ? NaN : parseInt(tabIndex, 10);
|
26
|
+
};
|
27
|
+
var isFocusable = function isFocusable(element, parentContainer) {
|
28
|
+
var nodeName = element.nodeName.toLowerCase();
|
29
|
+
var isTabIndexNotNaN = !Number.isNaN(getElementTabIndex(element));
|
30
|
+
var res = tabbableNode.test(nodeName) && !element.disabled || (element instanceof HTMLAnchorElement ? element.href || isTabIndexNotNaN : isTabIndexNotNaN);
|
31
|
+
return Boolean(res) && isVisible(element, parentContainer);
|
32
|
+
};
|
33
|
+
var isTabble = function isTabble(element, parentContainer) {
|
34
|
+
var tabIndex = getElementTabIndex(element);
|
35
|
+
var isTabIndexNaN = Number.isNaN(tabIndex);
|
36
|
+
return (isTabIndexNaN || tabIndex >= 0) && isFocusable(element, parentContainer);
|
37
|
+
};
|
38
|
+
|
39
|
+
// Все элементы внутри данной ноды, до которых можно добраться табом
|
40
|
+
var findTabbableDescendants = function findTabbableDescendants(element) {
|
41
|
+
return Array.from(element.querySelectorAll(focusSelector)).filter(function (el) {
|
42
|
+
return isTabble(el, element);
|
43
|
+
});
|
44
|
+
};
|
45
|
+
|
46
|
+
exports.findTabbableDescendants = findTabbableDescendants;
|
47
|
+
exports.focusSelector = focusSelector;
|
48
|
+
exports.isFocusable = isFocusable;
|
49
|
+
exports.isTabble = isTabble;
|
50
|
+
exports.isVisible = isVisible;
|
51
|
+
//# sourceMappingURL=tabbable.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"tabbable.js","sources":["../../src/utils/tabbable.ts"],"sourcesContent":["const tabbableNode = /input|select|textarea|button|object/;\n\nexport const focusSelector = [\n 'input',\n 'select',\n 'textarea',\n 'a',\n 'button',\n 'object',\n '[tabindex]',\n 'audio[controls]',\n 'video[controls]',\n '[contenteditable]:not([contenteditable=\"false\"])',\n].join(',');\n\nconst isHidden = (el: HTMLElement) => {\n return (\n (el.offsetWidth <= 0 && el.offsetHeight <= 0) ||\n el.style.display === 'none' ||\n el.style.visibility === 'hidden' ||\n el.style.opacity === '0'\n );\n};\n\nexport const isVisible = (element: HTMLElement, parentContainer?: HTMLElement): boolean => {\n let parentElement: HTMLElement = element;\n\n while (parentElement) {\n if (parentElement === parentContainer || parentElement === document.body) {\n break;\n }\n\n if (isHidden(parentElement)) {\n return false;\n }\n\n parentElement = parentElement.parentNode as HTMLElement;\n }\n\n return true;\n};\n\nconst getElementTabIndex = (element: HTMLElement): number => {\n const tabIndex = element.getAttribute('tabindex');\n\n return tabIndex === null ? NaN : parseInt(tabIndex as string, 10);\n};\n\nexport const isFocusable = (element: HTMLElement, parentContainer?: HTMLElement): boolean => {\n const nodeName = element.nodeName.toLowerCase();\n const isTabIndexNotNaN = !Number.isNaN(getElementTabIndex(element));\n const res =\n (tabbableNode.test(nodeName) && !(element as HTMLSelectElement).disabled) ||\n (element instanceof HTMLAnchorElement ? element.href || isTabIndexNotNaN : isTabIndexNotNaN);\n\n return Boolean(res) && isVisible(element, parentContainer);\n};\n\nexport const isTabble = (element: HTMLElement, parentContainer?: HTMLElement): boolean => {\n const tabIndex = getElementTabIndex(element);\n const isTabIndexNaN = Number.isNaN(tabIndex);\n return (isTabIndexNaN || tabIndex >= 0) && isFocusable(element, parentContainer);\n};\n\n// Все элементы внутри данной ноды, до которых можно добраться табом\nexport const findTabbableDescendants = (element: HTMLElement): Array<HTMLElement> => {\n return Array.from(element.querySelectorAll<HTMLElement>(focusSelector)).filter((el) => isTabble(el, element));\n};\n"],"names":["tabbableNode","focusSelector","join","isHidden","el","offsetWidth","offsetHeight","style","display","visibility","opacity","isVisible","element","parentContainer","parentElement","document","body","parentNode","getElementTabIndex","tabIndex","getAttribute","NaN","parseInt","isFocusable","nodeName","toLowerCase","isTabIndexNotNaN","Number","isNaN","res","test","disabled","HTMLAnchorElement","href","Boolean","isTabble","isTabIndexNaN","findTabbableDescendants","Array","from","querySelectorAll","filter"],"mappings":"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"}
|
@@ -11,8 +11,9 @@ var _engines = /*#__PURE__*/require("../../engines");
|
|
11
11
|
var _Popup = /*#__PURE__*/require("../Popup");
|
12
12
|
var _Overlay = /*#__PURE__*/require("../Overlay");
|
13
13
|
var _utils = /*#__PURE__*/require("../Popup/utils");
|
14
|
+
var _hooks = /*#__PURE__*/require("../../hooks");
|
14
15
|
var _Modal = /*#__PURE__*/require("./Modal.tokens");
|
15
|
-
var
|
16
|
+
var _hooks2 = /*#__PURE__*/require("./hooks");
|
16
17
|
var _base = /*#__PURE__*/require("./variations/_view/base");
|
17
18
|
var _ModalContext = /*#__PURE__*/require("./ModalContext");
|
18
19
|
var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "isOpen"];
|
@@ -48,13 +49,13 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
|
|
48
49
|
view = _ref.view,
|
49
50
|
isOpen = _ref.isOpen,
|
50
51
|
rest = _objectWithoutProperties(_ref, _excluded);
|
51
|
-
var trapRef = (0,
|
52
|
+
var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef, true);
|
52
53
|
var popupController = (0, _Popup.usePopupContext)();
|
53
54
|
var innerRef = (0, _plasmaCore.useForkRef)(trapRef, outerRootRef);
|
54
55
|
var uniqId = (0, _plasmaCore.safeUseId)();
|
55
56
|
var innerId = id || uniqId;
|
56
57
|
var overlayBackgroundToken = withBlur ? "var(".concat(_Modal.tokens.modalOverlayWithBlurColor, ")") : "var(".concat(_Modal.tokens.modalOverlayColor, ")");
|
57
|
-
var _useModal = (0,
|
58
|
+
var _useModal = (0, _hooks2.useModal)({
|
58
59
|
id: innerId,
|
59
60
|
isOpen: isOpen,
|
60
61
|
closeOnEsc: closeOnEsc,
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import React, { useState } from 'react';
|
1
|
+
import React, { useCallback, useRef, useState } from 'react';
|
2
2
|
import styled from '@emotion/styled';
|
3
3
|
import type { ComponentProps } from 'react';
|
4
4
|
import type { StoryObj, Meta } from '@storybook/react';
|
@@ -6,6 +6,7 @@ import { SSRProvider } from '@salutejs/plasma-core';
|
|
6
6
|
|
7
7
|
import { PopupProvider, popupClasses } from '../Popup/Popup';
|
8
8
|
import { Button } from '../Button/Button';
|
9
|
+
import { TextField } from '../TextField/TextField';
|
9
10
|
import { WithTheme } from '../../../_helpers';
|
10
11
|
|
11
12
|
import { Modal, modalClasses } from './Modal';
|
@@ -206,3 +207,114 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
206
207
|
},
|
207
208
|
render: (args) => <StoryModalDemo {...args} />,
|
208
209
|
};
|
210
|
+
|
211
|
+
const StyledModalAnimation = styled(Modal)`
|
212
|
+
/* stylelint-disable */
|
213
|
+
&& .${popupClasses.root} {
|
214
|
+
animation: fadeIn 1s forwards;
|
215
|
+
}
|
216
|
+
|
217
|
+
&&.${popupClasses.endAnimation} .${popupClasses.root} {
|
218
|
+
animation: fadeOut 1s forwards;
|
219
|
+
}
|
220
|
+
|
221
|
+
&& .${modalClasses.overlay} {
|
222
|
+
animation: overlayFadeIn 1s forwards;
|
223
|
+
}
|
224
|
+
|
225
|
+
&&.${popupClasses.endAnimation} .${modalClasses.overlay} {
|
226
|
+
animation: overlayFadeOut 1s forwards;
|
227
|
+
}
|
228
|
+
/* stylelint-enable */
|
229
|
+
|
230
|
+
@keyframes overlayFadeIn {
|
231
|
+
from {
|
232
|
+
opacity: 0;
|
233
|
+
}
|
234
|
+
|
235
|
+
to {
|
236
|
+
opacity: 1;
|
237
|
+
}
|
238
|
+
}
|
239
|
+
|
240
|
+
@keyframes overlayFadeOut {
|
241
|
+
from {
|
242
|
+
opacity: 1;
|
243
|
+
}
|
244
|
+
|
245
|
+
to {
|
246
|
+
opacity: 0;
|
247
|
+
}
|
248
|
+
}
|
249
|
+
|
250
|
+
@keyframes fadeIn {
|
251
|
+
from {
|
252
|
+
opacity: 0;
|
253
|
+
transform: translate(-50%, 100%);
|
254
|
+
}
|
255
|
+
|
256
|
+
to {
|
257
|
+
opacity: 1;
|
258
|
+
transform: translate(-50%, -50%);
|
259
|
+
}
|
260
|
+
}
|
261
|
+
|
262
|
+
@keyframes fadeOut {
|
263
|
+
from {
|
264
|
+
opacity: 1;
|
265
|
+
transform: translate(-50%, -50%);
|
266
|
+
}
|
267
|
+
|
268
|
+
to {
|
269
|
+
opacity: 0;
|
270
|
+
transform: translate(-50%, 100%);
|
271
|
+
}
|
272
|
+
}
|
273
|
+
`;
|
274
|
+
|
275
|
+
const StoryModalAnimationDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
|
276
|
+
const ref = useRef(null);
|
277
|
+
const [isOpen, setIsOpen] = useState(false);
|
278
|
+
|
279
|
+
const close = useCallback(() => {
|
280
|
+
setIsOpen(false);
|
281
|
+
}, []);
|
282
|
+
|
283
|
+
return (
|
284
|
+
<SSRProvider>
|
285
|
+
<PopupProvider>
|
286
|
+
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
287
|
+
<StyledModalAnimation
|
288
|
+
id="modal"
|
289
|
+
frame="theme-root"
|
290
|
+
withAnimation
|
291
|
+
onClose={() => setIsOpen(false)}
|
292
|
+
isOpen={isOpen}
|
293
|
+
placement={placement}
|
294
|
+
offset={[offsetX, offsetY]}
|
295
|
+
initialFocusRef={ref}
|
296
|
+
{...rest}
|
297
|
+
>
|
298
|
+
<Content>
|
299
|
+
<TextField value="Text" onChange={() => {}} />
|
300
|
+
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
301
|
+
<Button text="Закрыть" onClick={close} />
|
302
|
+
</Content>
|
303
|
+
</StyledModalAnimation>
|
304
|
+
</PopupProvider>
|
305
|
+
</SSRProvider>
|
306
|
+
);
|
307
|
+
};
|
308
|
+
|
309
|
+
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
310
|
+
args: {
|
311
|
+
placement: 'bottom',
|
312
|
+
withAnimation: true,
|
313
|
+
withBlur: false,
|
314
|
+
closeOnEsc: true,
|
315
|
+
closeOnOverlayClick: true,
|
316
|
+
offsetX: 0,
|
317
|
+
offsetY: 0,
|
318
|
+
},
|
319
|
+
render: (args) => <StoryModalAnimationDemo {...args} />,
|
320
|
+
};
|