@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.
Files changed (74) hide show
  1. package/cjs/components/Modal/Modal.js +3 -1
  2. package/cjs/components/Modal/Modal.js.map +1 -1
  3. package/cjs/hooks/useFocusTrap.js +97 -0
  4. package/cjs/hooks/useFocusTrap.js.map +1 -0
  5. package/cjs/index.js +2 -0
  6. package/cjs/index.js.map +1 -1
  7. package/cjs/utils/focusManager.js +56 -0
  8. package/cjs/utils/focusManager.js.map +1 -0
  9. package/cjs/utils/scopeTab.js +37 -0
  10. package/cjs/utils/scopeTab.js.map +1 -0
  11. package/cjs/utils/tabbable.js +51 -0
  12. package/cjs/utils/tabbable.js.map +1 -0
  13. package/emotion/cjs/components/Modal/Modal.js +4 -3
  14. package/emotion/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  15. package/emotion/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  16. package/emotion/cjs/hooks/index.js +7 -0
  17. package/emotion/cjs/hooks/useFocusTrap.js +95 -0
  18. package/emotion/cjs/utils/focusManager.js +60 -0
  19. package/emotion/cjs/utils/scopeTab.js +35 -0
  20. package/emotion/cjs/utils/tabbable.js +46 -0
  21. package/emotion/cjs/utils/useFocusTrap.js +95 -0
  22. package/emotion/es/components/Modal/Modal.js +3 -2
  23. package/emotion/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  24. package/emotion/es/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  25. package/emotion/es/hooks/index.js +1 -0
  26. package/emotion/es/hooks/useFocusTrap.js +90 -0
  27. package/emotion/es/utils/focusManager.js +55 -0
  28. package/emotion/es/utils/scopeTab.js +30 -0
  29. package/emotion/es/utils/tabbable.js +40 -0
  30. package/emotion/es/utils/useFocusTrap.js +90 -0
  31. package/es/components/Modal/Modal.js +4 -2
  32. package/es/components/Modal/Modal.js.map +1 -1
  33. package/es/hooks/useFocusTrap.js +93 -0
  34. package/es/hooks/useFocusTrap.js.map +1 -0
  35. package/es/index.js +1 -0
  36. package/es/index.js.map +1 -1
  37. package/es/utils/focusManager.js +52 -0
  38. package/es/utils/focusManager.js.map +1 -0
  39. package/es/utils/scopeTab.js +33 -0
  40. package/es/utils/scopeTab.js.map +1 -0
  41. package/es/utils/tabbable.js +43 -0
  42. package/es/utils/tabbable.js.map +1 -0
  43. package/package.json +4 -4
  44. package/styled-components/cjs/components/Modal/Modal.js +4 -3
  45. package/styled-components/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  46. package/styled-components/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  47. package/styled-components/cjs/hooks/index.js +7 -0
  48. package/styled-components/cjs/hooks/useFocusTrap.js +95 -0
  49. package/styled-components/cjs/utils/focusManager.js +60 -0
  50. package/styled-components/cjs/utils/scopeTab.js +35 -0
  51. package/styled-components/cjs/utils/tabbable.js +46 -0
  52. package/styled-components/cjs/utils/useFocusTrap.js +95 -0
  53. package/styled-components/es/components/Modal/Modal.js +3 -2
  54. package/styled-components/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  55. package/styled-components/es/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  56. package/styled-components/es/hooks/index.js +1 -0
  57. package/styled-components/es/hooks/useFocusTrap.js +90 -0
  58. package/styled-components/es/utils/focusManager.js +55 -0
  59. package/styled-components/es/utils/scopeTab.js +30 -0
  60. package/styled-components/es/utils/tabbable.js +40 -0
  61. package/styled-components/es/utils/useFocusTrap.js +90 -0
  62. package/types/components/Modal/Modal.d.ts.map +1 -1
  63. package/types/hooks/index.d.ts +1 -0
  64. package/types/hooks/index.d.ts.map +1 -1
  65. package/types/hooks/useFocusTrap.d.ts +6 -0
  66. package/types/hooks/useFocusTrap.d.ts.map +1 -0
  67. package/types/utils/focusManager.d.ts +15 -0
  68. package/types/utils/focusManager.d.ts.map +1 -0
  69. package/types/utils/scopeTab.d.ts +7 -0
  70. package/types/utils/scopeTab.d.ts.map +1 -0
  71. package/types/utils/tabbable.d.ts +6 -0
  72. package/types/utils/tabbable.d.ts.map +1 -0
  73. package/types/utils/useFocusTrap.d.ts +6 -0
  74. package/types/utils/useFocusTrap.d.ts.map +1 -0
@@ -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
+ };
@@ -1,4 +1,5 @@
1
1
  export { useUniqId } from './useUniqId';
2
+ export { useFocusTrap } from './useFocusTrap';
2
3
  export { usePreviousValue } from './usePreviousValue';
3
4
  export { useForceUpdate } from './useForceUpdate';
4
5
  export { useDidMountEffect } from './useDidMountEffect';
@@ -0,0 +1,90 @@
1
+ import { useCallback, useEffect, useRef } from 'react';
2
+ import { FocusManager } from '../utils/focusManager';
3
+ import { focusSelector, isFocusable, isTabble } from '../utils/tabbable';
4
+ import { scopeTab } from '../utils/scopeTab';
5
+
6
+ // Находим элемент для фокуса
7
+ var getFocusElement = function getFocusElement(node, firstFocusSelector) {
8
+ var focusElement = null;
9
+ if (firstFocusSelector) {
10
+ if (typeof firstFocusSelector === 'string') {
11
+ focusElement = node.querySelector(firstFocusSelector);
12
+ } else if (firstFocusSelector.current) {
13
+ focusElement = firstFocusSelector.current;
14
+ }
15
+ }
16
+ if (!focusElement) {
17
+ var children = Array.from(node.querySelectorAll(focusSelector));
18
+ focusElement = children.find(function (el) {
19
+ return isTabble(el);
20
+ }) || null;
21
+ }
22
+
23
+ // Если ничего не нашлось, то может ли сама нода быть под фокусом
24
+ if (!focusElement && isFocusable(node)) {
25
+ focusElement = node;
26
+ }
27
+ return focusElement;
28
+ };
29
+ var processNode = function processNode(node, firstFocusSelector, ref) {
30
+ if (ref !== null && ref !== void 0 && ref.current) {
31
+ ref.current.removeEventListener('animationend', function () {
32
+ processNode(node, firstFocusSelector, ref);
33
+ });
34
+ }
35
+ var focusElement = getFocusElement(node, firstFocusSelector);
36
+ if (focusElement) {
37
+ focusElement.focus();
38
+ }
39
+ };
40
+ var focusManager = /*#__PURE__*/new FocusManager();
41
+
42
+ /**
43
+ * Захватывает фокус внутри DOM node.
44
+ * */
45
+ export var useFocusTrap = function useFocusTrap() {
46
+ var active = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
47
+ var firstFocusSelector = arguments.length > 1 ? arguments[1] : undefined;
48
+ var focusAfterNode = arguments.length > 2 ? arguments[2] : undefined;
49
+ var focusAfterAnimation = arguments.length > 3 ? arguments[3] : undefined;
50
+ var ref = useRef();
51
+ var setRef = useCallback(function (node) {
52
+ if (ref.current) {
53
+ focusManager.teardownScopedFocus();
54
+ focusManager.returnFocus();
55
+ }
56
+ if (active && node) {
57
+ focusManager.setupScopedFocus(node);
58
+ focusManager.markForFocusAfter(focusAfterNode);
59
+
60
+ // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
61
+ setTimeout(function () {
62
+ if (ref !== null && ref !== void 0 && ref.current && node.ownerDocument && focusAfterAnimation) {
63
+ ref.current.addEventListener('animationend', function () {
64
+ processNode(node, firstFocusSelector, ref);
65
+ });
66
+ } else if (node.ownerDocument) {
67
+ processNode(node, firstFocusSelector);
68
+ }
69
+ });
70
+ ref.current = node;
71
+ return;
72
+ }
73
+ ref.current = null;
74
+ }, [active, firstFocusSelector]);
75
+ useEffect(function () {
76
+ if (!active) {
77
+ return;
78
+ }
79
+ var handleKeyDown = function handleKeyDown(event) {
80
+ if (event.key === 'Tab' && ref.current) {
81
+ scopeTab(ref.current, event);
82
+ }
83
+ };
84
+ document.addEventListener('keydown', handleKeyDown);
85
+ return function () {
86
+ document.removeEventListener('keydown', handleKeyDown);
87
+ };
88
+ }, [active]);
89
+ return setRef;
90
+ };
@@ -0,0 +1,55 @@
1
+ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
3
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
4
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
5
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
6
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
7
+ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
8
+ import { findTabbableDescendants } from './tabbable';
9
+
10
+ /**
11
+ * Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.
12
+ * Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.
13
+ * */
14
+ export var FocusManager = /*#__PURE__*/_createClass(function FocusManager() {
15
+ var _this = this;
16
+ _classCallCheck(this, FocusManager);
17
+ // массив с элементами, которые нужно зафокусить после анмаунта
18
+ _defineProperty(this, "focusAfterElements", []);
19
+ // массив с trap нодами
20
+ _defineProperty(this, "focusNodes", []);
21
+ _defineProperty(this, "handleFocus", function () {
22
+ // Фокус всегда должен находиться внутри необходимой ноды
23
+ var focusNode = _this.focusNodes[_this.focusNodes.length - 1];
24
+ if (!focusNode || focusNode.contains(document.activeElement)) {
25
+ return;
26
+ }
27
+
28
+ // Выделяем первый tabbable элемент
29
+ var el = findTabbableDescendants(focusNode)[0] || focusNode;
30
+ el.focus();
31
+ });
32
+ // добавление на фокус после анмаунта
33
+ _defineProperty(this, "markForFocusAfter", function (focusAfterNode) {
34
+ var node = focusAfterNode && focusAfterNode.current ? focusAfterNode.current : document.activeElement;
35
+ _this.focusAfterElements.push(node);
36
+ });
37
+ // фокус на необходимый элемент
38
+ _defineProperty(this, "returnFocus", function () {
39
+ var _this$focusAfterEleme;
40
+ var toFocus = (_this$focusAfterEleme = _this.focusAfterElements.pop()) !== null && _this$focusAfterEleme !== void 0 ? _this$focusAfterEleme : null;
41
+ if (toFocus) {
42
+ toFocus.focus();
43
+ }
44
+ });
45
+ // при маунте ноды
46
+ _defineProperty(this, "setupScopedFocus", function (element) {
47
+ _this.focusNodes.push(element);
48
+ document.addEventListener('focusin', _this.handleFocus, true);
49
+ });
50
+ // при анмаунте
51
+ _defineProperty(this, "teardownScopedFocus", function () {
52
+ _this.focusNodes.pop();
53
+ document.removeEventListener('focusin', _this.handleFocus);
54
+ });
55
+ });
@@ -0,0 +1,30 @@
1
+ import { findTabbableDescendants } from './tabbable';
2
+
3
+ /**
4
+ * Управлление фокусом лишь внутри ноды через tab
5
+ * @param node
6
+ * @param event
7
+ */
8
+ export var scopeTab = function scopeTab(node, event) {
9
+ var tabbable = findTabbableDescendants(node);
10
+ if (!tabbable.length) {
11
+ event.preventDefault();
12
+ return;
13
+ }
14
+
15
+ // смотрим, является ли элемент крайним - первый или последним
16
+ var finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];
17
+ var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
18
+
19
+ // если не является, то передаем обработку таба самому браузеру
20
+ if (!leavingFinalTabbable) {
21
+ return;
22
+ }
23
+
24
+ // иначе зацкливаемся
25
+ event.preventDefault();
26
+ var target = tabbable[event.shiftKey ? tabbable.length - 1 : 0];
27
+ if (target) {
28
+ target.focus();
29
+ }
30
+ };
@@ -0,0 +1,40 @@
1
+ var tabbableNode = /input|select|textarea|button|object/;
2
+ export var focusSelector = /*#__PURE__*/['input', 'select', 'textarea', 'a', 'button', 'object', '[tabindex]', 'audio[controls]', 'video[controls]', '[contenteditable]:not([contenteditable="false"])'].join(',');
3
+ var isHidden = function isHidden(el) {
4
+ return el.offsetWidth <= 0 && el.offsetHeight <= 0 || el.style.display === 'none' || el.style.visibility === 'hidden' || el.style.opacity === '0';
5
+ };
6
+ export var isVisible = function isVisible(element, parentContainer) {
7
+ var parentElement = element;
8
+ while (parentElement) {
9
+ if (parentElement === parentContainer || parentElement === document.body) {
10
+ break;
11
+ }
12
+ if (isHidden(parentElement)) {
13
+ return false;
14
+ }
15
+ parentElement = parentElement.parentNode;
16
+ }
17
+ return true;
18
+ };
19
+ var getElementTabIndex = function getElementTabIndex(element) {
20
+ var tabIndex = element.getAttribute('tabindex');
21
+ return tabIndex === null ? NaN : parseInt(tabIndex, 10);
22
+ };
23
+ export var isFocusable = function isFocusable(element, parentContainer) {
24
+ var nodeName = element.nodeName.toLowerCase();
25
+ var isTabIndexNotNaN = !Number.isNaN(getElementTabIndex(element));
26
+ var res = tabbableNode.test(nodeName) && !element.disabled || (element instanceof HTMLAnchorElement ? element.href || isTabIndexNotNaN : isTabIndexNotNaN);
27
+ return Boolean(res) && isVisible(element, parentContainer);
28
+ };
29
+ export var isTabble = function isTabble(element, parentContainer) {
30
+ var tabIndex = getElementTabIndex(element);
31
+ var isTabIndexNaN = Number.isNaN(tabIndex);
32
+ return (isTabIndexNaN || tabIndex >= 0) && isFocusable(element, parentContainer);
33
+ };
34
+
35
+ // Все элементы внутри данной ноды, до которых можно добраться табом
36
+ export var findTabbableDescendants = function findTabbableDescendants(element) {
37
+ return Array.from(element.querySelectorAll(focusSelector)).filter(function (el) {
38
+ return isTabble(el, element);
39
+ });
40
+ };
@@ -0,0 +1,90 @@
1
+ import { useCallback, useEffect, useRef } from 'react';
2
+ import { FocusManager } from '../utils/focusManager';
3
+ import { focusSelector, isFocusable, isTabble } from '../utils/tabbable';
4
+ import { scopeTab } from '../utils/scopeTab';
5
+
6
+ // Находим элемент для фокуса
7
+ var getFocusElement = function getFocusElement(node, firstFocusSelector) {
8
+ var focusElement = null;
9
+ if (firstFocusSelector) {
10
+ if (typeof firstFocusSelector === 'string') {
11
+ focusElement = node.querySelector(firstFocusSelector);
12
+ } else if (firstFocusSelector.current) {
13
+ focusElement = firstFocusSelector.current;
14
+ }
15
+ }
16
+ if (!focusElement) {
17
+ var children = Array.from(node.querySelectorAll(focusSelector));
18
+ focusElement = children.find(function (el) {
19
+ return isTabble(el);
20
+ }) || null;
21
+ }
22
+
23
+ // Если ничего не нашлось, то может ли сама нода быть под фокусом
24
+ if (!focusElement && isFocusable(node)) {
25
+ focusElement = node;
26
+ }
27
+ return focusElement;
28
+ };
29
+ var processNode = function processNode(node, firstFocusSelector, ref) {
30
+ if (ref !== null && ref !== void 0 && ref.current) {
31
+ ref.current.removeEventListener('animationend', function () {
32
+ processNode(node, firstFocusSelector, ref);
33
+ });
34
+ }
35
+ var focusElement = getFocusElement(node, firstFocusSelector);
36
+ if (focusElement) {
37
+ focusElement.focus();
38
+ }
39
+ };
40
+ var focusManager = /*#__PURE__*/new FocusManager();
41
+
42
+ /**
43
+ * Захватывает фокус внутри DOM node.
44
+ * */
45
+ export var useFocusTrap = function useFocusTrap() {
46
+ var active = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
47
+ var firstFocusSelector = arguments.length > 1 ? arguments[1] : undefined;
48
+ var focusAfterNode = arguments.length > 2 ? arguments[2] : undefined;
49
+ var activeAfterAnimation = arguments.length > 3 ? arguments[3] : undefined;
50
+ var ref = useRef();
51
+ var setRef = useCallback(function (node) {
52
+ if (ref.current) {
53
+ focusManager.teardownScopedFocus();
54
+ focusManager.returnFocus();
55
+ }
56
+ if (active && node) {
57
+ focusManager.setupScopedFocus(node);
58
+ focusManager.markForFocusAfter(focusAfterNode);
59
+
60
+ // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
61
+ setTimeout(function () {
62
+ if (ref !== null && ref !== void 0 && ref.current && node.ownerDocument && activeAfterAnimation) {
63
+ ref.current.addEventListener('animationend', function () {
64
+ processNode(node, firstFocusSelector, ref);
65
+ });
66
+ } else if (node.ownerDocument) {
67
+ processNode(node, firstFocusSelector);
68
+ }
69
+ });
70
+ ref.current = node;
71
+ return;
72
+ }
73
+ ref.current = null;
74
+ }, [active, firstFocusSelector]);
75
+ useEffect(function () {
76
+ if (!active) {
77
+ return;
78
+ }
79
+ var handleKeyDown = function handleKeyDown(event) {
80
+ if (event.key === 'Tab' && ref.current) {
81
+ scopeTab(ref.current, event);
82
+ }
83
+ };
84
+ document.addEventListener('keydown', handleKeyDown);
85
+ return function () {
86
+ document.removeEventListener('keydown', handleKeyDown);
87
+ };
88
+ }, [active]);
89
+ return setRef;
90
+ };
@@ -1,12 +1,14 @@
1
1
  import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
2
2
  import React, { forwardRef, useMemo, useCallback } from 'react';
3
- import { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';
3
+ import { useForkRef, safeUseId } from '@salutejs/plasma-core';
4
4
  import '@linaria/core';
5
5
  import { component } from '../../engines/common.js';
6
6
  import { usePopupContext } from '../Popup/PopupContext.js';
7
7
  import { popupConfig } from '../Popup/Popup.js';
8
8
  import { Overlay } from '../Overlay/Overlay.js';
9
9
  import { DEFAULT_Z_INDEX } from '../Popup/utils/index.js';
10
+ import { useFocusTrap } from '../../hooks/useFocusTrap.js';
11
+ import '../../utils/react.js';
10
12
  import { classes, tokens } from './Modal.tokens.js';
11
13
  import { useModal } from './hooks/useModal.js';
12
14
  import { base } from './variations/_view/base.js';
@@ -41,7 +43,7 @@ var modalRoot = function modalRoot(Root) {
41
43
  view = _ref.view,
42
44
  isOpen = _ref.isOpen,
43
45
  rest = _objectWithoutProperties(_ref, _excluded);
44
- var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);
46
+ var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
45
47
  var popupController = usePopupContext();
46
48
  var innerRef = useForkRef(trapRef, outerRootRef);
47
49
  var uniqId = safeUseId();
@@ -1 +1 @@
1
- {"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n forwardRef<HTMLDivElement, ModalProps>(\n (\n {\n id,\n withAnimation,\n onClose,\n onOverlayClick,\n onEscKeyDown,\n closeOnEsc = true,\n closeOnOverlayClick = true,\n withBlur,\n initialFocusRef,\n focusAfterRef,\n zIndex,\n popupInfo,\n children,\n view,\n isOpen,\n ...rest\n },\n outerRootRef,\n ) => {\n const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n const popupController = usePopupContext();\n\n const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n const uniqId = safeUseId();\n const innerId = id || uniqId;\n const overlayBackgroundToken = withBlur\n ? `var(${tokens.modalOverlayWithBlurColor})`\n : `var(${tokens.modalOverlayColor})`;\n\n const { modalInfo } = useModal({ id: innerId, isOpen, closeOnEsc, onEscKeyDown, onClose, popupInfo });\n const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n innerId,\n popupController.items,\n ]);\n\n const onModalOverlayKeyDown = useCallback(\n (event: React.MouseEvent<HTMLDivElement>) => {\n if (onOverlayClick) {\n onOverlayClick(event);\n return;\n }\n\n if (onClose) {\n onClose();\n }\n },\n [closeOnOverlayClick, onOverlayClick, onClose],\n );\n\n return (\n <Popup\n id={innerId}\n isOpen={isOpen}\n ref={innerRef}\n popupInfo={modalInfo}\n withAnimation={withAnimation}\n zIndex={zIndex}\n overlay={\n <Root view={view}>\n <Overlay\n className={classes.overlay}\n zIndex={zIndex || DEFAULT_Z_INDEX}\n backgroundColorProperty={overlayBackgroundToken}\n withBlur={withBlur}\n transparent={transparent}\n isClickable={closeOnOverlayClick}\n onOverlayClick={onModalOverlayKeyDown}\n />\n </Root>\n }\n {...rest}\n >\n {children}\n </Popup>\n );\n },\n );\n\nexport const modalConfig = {\n name: 'Modal',\n tag: 'div',\n layout: modalRoot,\n base: '',\n variations: {\n view: {\n css: viewCSS,\n },\n },\n defaults: {\n view: 'default',\n },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","isOpen","rest","_objectWithoutProperties","_excluded","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","React","createElement","_extends","ref","overlay","Overlay","className","classes","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":";;;;;;;;;;;;;;;;AAcA;AACA,IAAMA,KAAK,gBAAGC,SAAS,CAACC,WAAW,CAAC,CAAA;;AAEpC;AACA;AACA;AACA;IACaC,SAAS,GAAG,SAAZA,SAASA,CAAIC,IAA2C,EAAA;AAAA,EAAA,oBACjEC,UAAU,CACN,UAAAC,IAAA,EAmBIC,YAAY,EACX;AAAA,IAAA,IAlBGC,EAAE,GAAAF,IAAA,CAAFE,EAAE;MACFC,aAAa,GAAAH,IAAA,CAAbG,aAAa;MACbC,OAAO,GAAAJ,IAAA,CAAPI,OAAO;MACPC,cAAc,GAAAL,IAAA,CAAdK,cAAc;MACdC,YAAY,GAAAN,IAAA,CAAZM,YAAY;MAAAC,eAAA,GAAAP,IAAA,CACZQ,UAAU;AAAVA,MAAAA,UAAU,GAAAD,eAAA,KAAG,KAAA,CAAA,GAAA,IAAI,GAAAA,eAAA;MAAAE,qBAAA,GAAAT,IAAA,CACjBU,mBAAmB;AAAnBA,MAAAA,mBAAmB,GAAAD,qBAAA,KAAG,KAAA,CAAA,GAAA,IAAI,GAAAA,qBAAA;MAC1BE,QAAQ,GAAAX,IAAA,CAARW,QAAQ;MACRC,eAAe,GAAAZ,IAAA,CAAfY,eAAe;MACfC,aAAa,GAAAb,IAAA,CAAba,aAAa;MACbC,MAAM,GAAAd,IAAA,CAANc,MAAM;MACNC,SAAS,GAAAf,IAAA,CAATe,SAAS;MACTC,QAAQ,GAAAhB,IAAA,CAARgB,QAAQ;MACRC,IAAI,GAAAjB,IAAA,CAAJiB,IAAI;MACJC,MAAM,GAAAlB,IAAA,CAANkB,MAAM;AACHC,MAAAA,IAAI,GAAAC,wBAAA,CAAApB,IAAA,EAAAqB,SAAA,CAAA,CAAA;IAIX,IAAMC,OAAO,GAAGC,YAAY,CAAC,IAAI,EAAEX,eAAe,EAAEC,aAAa,CAAC,CAAA;AAClE,IAAA,IAAMW,eAAe,GAAGC,eAAe,EAAE,CAAA;AAEzC,IAAA,IAAMC,QAAQ,GAAGC,UAAU,CAAiBL,OAAO,EAAErB,YAAY,CAAC,CAAA;AAElE,IAAA,IAAM2B,MAAM,GAAGC,SAAS,EAAE,CAAA;AAC1B,IAAA,IAAMC,OAAO,GAAG5B,EAAE,IAAI0B,MAAM,CAAA;AAC5B,IAAA,IAAMG,sBAAsB,GAAGpB,QAAQ,GAAA,MAAA,CAAAqB,MAAA,CAC1BC,MAAM,CAACC,yBAAyB,gBAAAF,MAAA,CAChCC,MAAM,CAACE,iBAAiB,EAAG,GAAA,CAAA,CAAA;IAExC,IAAAC,SAAA,GAAsBC,QAAQ,CAAC;AAAEnC,QAAAA,EAAE,EAAE4B,OAAO;AAAEZ,QAAAA,MAAM,EAANA,MAAM;AAAEV,QAAAA,UAAU,EAAVA,UAAU;AAAEF,QAAAA,YAAY,EAAZA,YAAY;AAAEF,QAAAA,OAAO,EAAPA,OAAO;AAAEW,QAAAA,SAAS,EAATA,SAAAA;AAAU,OAAC,CAAC;MAA7FuB,SAAS,GAAAF,SAAA,CAATE,SAAS,CAAA;IACjB,IAAMC,WAAW,GAAGC,OAAO,CAAC,YAAA;AAAA,MAAA,OAAMC,cAAc,CAACjB,eAAe,CAACkB,KAAK,CAAC,KAAKZ,OAAO,CAAA;AAAA,KAAA,EAAE,CACjFA,OAAO,EACPN,eAAe,CAACkB,KAAK,CACxB,CAAC,CAAA;AAEF,IAAA,IAAMC,qBAAqB,GAAGC,WAAW,CACrC,UAACC,KAAuC,EAAK;AACzC,MAAA,IAAIxC,cAAc,EAAE;QAChBA,cAAc,CAACwC,KAAK,CAAC,CAAA;AACrB,QAAA,OAAA;AACJ,OAAA;AAEA,MAAA,IAAIzC,OAAO,EAAE;AACTA,QAAAA,OAAO,EAAE,CAAA;AACb,OAAA;KACH,EACD,CAACM,mBAAmB,EAAEL,cAAc,EAAED,OAAO,CACjD,CAAC,CAAA;AAED,IAAA,oBACI0C,KAAA,CAAAC,aAAA,CAACrD,KAAK,EAAAsD,QAAA,CAAA;AACF9C,MAAAA,EAAE,EAAE4B,OAAQ;AACZZ,MAAAA,MAAM,EAAEA,MAAO;AACf+B,MAAAA,GAAG,EAAEvB,QAAS;AACdX,MAAAA,SAAS,EAAEuB,SAAU;AACrBnC,MAAAA,aAAa,EAAEA,aAAc;AAC7BW,MAAAA,MAAM,EAAEA,MAAO;AACfoC,MAAAA,OAAO,eACHJ,KAAA,CAAAC,aAAA,CAACjD,IAAI,EAAA;AAACmB,QAAAA,IAAI,EAAEA,IAAAA;AAAK,OAAA,eACb6B,KAAA,CAAAC,aAAA,CAACI,OAAO,EAAA;QACJC,SAAS,EAAEC,OAAO,CAACH,OAAQ;QAC3BpC,MAAM,EAAEA,MAAM,IAAIwC,eAAgB;AAClCC,QAAAA,uBAAuB,EAAExB,sBAAuB;AAChDpB,QAAAA,QAAQ,EAAEA,QAAS;AACnB4B,QAAAA,WAAW,EAAEA,WAAY;AACzBiB,QAAAA,WAAW,EAAE9C,mBAAoB;AACjCL,QAAAA,cAAc,EAAEsC,qBAAAA;AAAsB,OACzC,CACC,CAAA;KAENxB,EAAAA,IAAI,CAEPH,EAAAA,QACE,CAAC,CAAA;AAEhB,GACJ,CAAC,CAAA;AAAA,EAAA;AAEE,IAAMyC,WAAW,GAAG;AACvBC,EAAAA,IAAI,EAAE,OAAO;AACbC,EAAAA,GAAG,EAAE,KAAK;AACVC,EAAAA,MAAM,EAAE/D,SAAS;AACjBgE,EAAAA,IAAI,EAAE,EAAE;AACRC,EAAAA,UAAU,EAAE;AACR7C,IAAAA,IAAI,EAAE;AACF8C,MAAAA,GAAG,EAAEC,IAAAA;AACT,KAAA;GACH;AACDC,EAAAA,QAAQ,EAAE;AACNhD,IAAAA,IAAI,EAAE,SAAA;AACV,GAAA;AACJ;;;;"}
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,93 @@
1
+ import { useRef, useCallback, useEffect } from 'react';
2
+ import { FocusManager } from '../utils/focusManager.js';
3
+ import { focusSelector, isTabble, isFocusable } from '../utils/tabbable.js';
4
+ import { scopeTab } from '../utils/scopeTab.js';
5
+
6
+ // Находим элемент для фокуса
7
+ var getFocusElement = function getFocusElement(node, firstFocusSelector) {
8
+ var focusElement = null;
9
+ if (firstFocusSelector) {
10
+ if (typeof firstFocusSelector === 'string') {
11
+ focusElement = node.querySelector(firstFocusSelector);
12
+ } else if (firstFocusSelector.current) {
13
+ focusElement = firstFocusSelector.current;
14
+ }
15
+ }
16
+ if (!focusElement) {
17
+ var children = Array.from(node.querySelectorAll(focusSelector));
18
+ focusElement = children.find(function (el) {
19
+ return isTabble(el);
20
+ }) || null;
21
+ }
22
+
23
+ // Если ничего не нашлось, то может ли сама нода быть под фокусом
24
+ if (!focusElement && isFocusable(node)) {
25
+ focusElement = node;
26
+ }
27
+ return focusElement;
28
+ };
29
+ var processNode = function processNode(node, firstFocusSelector, ref) {
30
+ if (ref !== null && ref !== void 0 && ref.current) {
31
+ ref.current.removeEventListener('animationend', function () {
32
+ processNode(node, firstFocusSelector, ref);
33
+ });
34
+ }
35
+ var focusElement = getFocusElement(node, firstFocusSelector);
36
+ if (focusElement) {
37
+ focusElement.focus();
38
+ }
39
+ };
40
+ var focusManager = /*#__PURE__*/new FocusManager();
41
+
42
+ /**
43
+ * Захватывает фокус внутри DOM node.
44
+ * */
45
+ var useFocusTrap = function useFocusTrap() {
46
+ var active = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
47
+ var firstFocusSelector = arguments.length > 1 ? arguments[1] : undefined;
48
+ var focusAfterNode = arguments.length > 2 ? arguments[2] : undefined;
49
+ var focusAfterAnimation = arguments.length > 3 ? arguments[3] : undefined;
50
+ var ref = useRef();
51
+ var setRef = useCallback(function (node) {
52
+ if (ref.current) {
53
+ focusManager.teardownScopedFocus();
54
+ focusManager.returnFocus();
55
+ }
56
+ if (active && node) {
57
+ focusManager.setupScopedFocus(node);
58
+ focusManager.markForFocusAfter(focusAfterNode);
59
+
60
+ // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
61
+ setTimeout(function () {
62
+ if (ref !== null && ref !== void 0 && ref.current && node.ownerDocument && focusAfterAnimation) {
63
+ ref.current.addEventListener('animationend', function () {
64
+ processNode(node, firstFocusSelector, ref);
65
+ });
66
+ } else if (node.ownerDocument) {
67
+ processNode(node, firstFocusSelector);
68
+ }
69
+ });
70
+ ref.current = node;
71
+ return;
72
+ }
73
+ ref.current = null;
74
+ }, [active, firstFocusSelector]);
75
+ useEffect(function () {
76
+ if (!active) {
77
+ return;
78
+ }
79
+ var handleKeyDown = function handleKeyDown(event) {
80
+ if (event.key === 'Tab' && ref.current) {
81
+ scopeTab(ref.current, event);
82
+ }
83
+ };
84
+ document.addEventListener('keydown', handleKeyDown);
85
+ return function () {
86
+ document.removeEventListener('keydown', handleKeyDown);
87
+ };
88
+ }, [active]);
89
+ return setRef;
90
+ };
91
+
92
+ export { useFocusTrap };
93
+ //# 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/es/index.js CHANGED
@@ -11,6 +11,7 @@ export { applySkeletonGradient, getSkeletonColor } from './mixins/applySkeletonG
11
11
  export { applyDisabled } from './mixins/applyDisabled.js';
12
12
  export { css } from './engines/index.js';
13
13
  export { useUniqId } from './hooks/useUniqId.js';
14
+ export { useFocusTrap } from './hooks/useFocusTrap.js';
14
15
  export { usePreviousValue } from './hooks/usePreviousValue.js';
15
16
  export { useForceUpdate } from './hooks/useForceUpdate.js';
16
17
  export { useDidMountEffect } from './hooks/useDidMountEffect.js';
package/es/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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}