@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
@@ -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 +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,eAAe,CAAC;
|
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,eAAe,CAAC;AAOrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C;;;GAGG;AACH,eAAO,MAAM,SAAS,SAAU,UAAU,cAAc,EAAE,UAAU,CAAC,sFAiFhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBAnFQ,UAAU,cAAc,EAAE,UAAU,CAAC;;;;;;;;;;CAgGpE,CAAC"}
|
package/types/hooks/index.d.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC"}
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC"}
|
@@ -0,0 +1,6 @@
|
|
1
|
+
/// <reference types="react" />
|
2
|
+
/**
|
3
|
+
* Захватывает фокус внутри DOM node.
|
4
|
+
* */
|
5
|
+
export declare const useFocusTrap: (active?: boolean, firstFocusSelector?: string | import("react").RefObject<HTMLElement> | undefined, focusAfterNode?: import("react").RefObject<HTMLElement> | undefined, focusAfterAnimation?: boolean | undefined) => (instance: HTMLElement | null) => void;
|
6
|
+
//# sourceMappingURL=useFocusTrap.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"useFocusTrap.d.ts","sourceRoot":"","sources":["../../src/hooks/useFocusTrap.ts"],"names":[],"mappings":";AAoDA;;KAEK;AACL,eAAO,MAAM,YAAY,qOAKV,WAAW,GAAG,IAAI,KAAK,IAoDrC,CAAC"}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
/// <reference types="react" />
|
2
|
+
/**
|
3
|
+
* Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.
|
4
|
+
* Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.
|
5
|
+
* */
|
6
|
+
export declare class FocusManager {
|
7
|
+
private focusAfterElements;
|
8
|
+
private focusNodes;
|
9
|
+
private handleFocus;
|
10
|
+
markForFocusAfter: (focusAfterNode?: import("react").RefObject<HTMLElement> | undefined) => void;
|
11
|
+
returnFocus: () => void;
|
12
|
+
setupScopedFocus: (element: HTMLElement) => void;
|
13
|
+
teardownScopedFocus: () => void;
|
14
|
+
}
|
15
|
+
//# sourceMappingURL=focusManager.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"focusManager.d.ts","sourceRoot":"","sources":["../../src/utils/focusManager.ts"],"names":[],"mappings":";AAEA;;;KAGK;AACL,qBAAa,YAAY;IAErB,OAAO,CAAC,kBAAkB,CAA0B;IAGpD,OAAO,CAAC,UAAU,CAA0B;IAE5C,OAAO,CAAC,WAAW,CAWjB;IAGK,iBAAiB,gFAItB;IAGK,WAAW,aAKhB;IAGK,gBAAgB,YAAa,WAAW,UAG7C;IAGK,mBAAmB,aAGxB;CACL"}
|
@@ -0,0 +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,SAsB/D,CAAC"}
|
@@ -0,0 +1,6 @@
|
|
1
|
+
export declare const focusSelector: string;
|
2
|
+
export declare const isVisible: (element: HTMLElement, parentContainer?: HTMLElement | undefined) => boolean;
|
3
|
+
export declare const isFocusable: (element: HTMLElement, parentContainer?: HTMLElement | undefined) => boolean;
|
4
|
+
export declare const isTabble: (element: HTMLElement, parentContainer?: HTMLElement | undefined) => boolean;
|
5
|
+
export declare const findTabbableDescendants: (element: HTMLElement) => Array<HTMLElement>;
|
6
|
+
//# sourceMappingURL=tabbable.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"tabbable.d.ts","sourceRoot":"","sources":["../../src/utils/tabbable.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,QAWf,CAAC;AAWZ,eAAO,MAAM,SAAS,YAAa,WAAW,gDAAkC,OAgB/E,CAAC;AAQF,eAAO,MAAM,WAAW,YAAa,WAAW,gDAAkC,OAQjF,CAAC;AAEF,eAAO,MAAM,QAAQ,YAAa,WAAW,gDAAkC,OAI9E,CAAC;AAGF,eAAO,MAAM,uBAAuB,YAAa,WAAW,KAAG,MAAM,WAAW,CAE/E,CAAC"}
|
@@ -0,0 +1,6 @@
|
|
1
|
+
/// <reference types="react" />
|
2
|
+
/**
|
3
|
+
* Захватывает фокус внутри DOM node.
|
4
|
+
* */
|
5
|
+
export declare const useFocusTrap: (active?: boolean, firstFocusSelector?: string | import("react").RefObject<HTMLElement> | undefined, focusAfterNode?: import("react").RefObject<HTMLElement> | undefined, activeAfterAnimation?: boolean | undefined) => (instance: HTMLElement | null) => void;
|
6
|
+
//# sourceMappingURL=useFocusTrap.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"useFocusTrap.d.ts","sourceRoot":"","sources":["../../src/utils/useFocusTrap.ts"],"names":[],"mappings":";AAoDA;;KAEK;AACL,eAAO,MAAM,YAAY,sOAKV,WAAW,GAAG,IAAI,KAAK,IAoDrC,CAAC"}
|