@tamagui/focus-scope 1.99.1 → 1.100.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/FocusScope.js +15 -21
- package/dist/cjs/FocusScope.js.map +1 -1
- package/dist/esm/FocusScope.js +15 -21
- package/dist/esm/FocusScope.js.map +1 -1
- package/dist/esm/FocusScope.mjs +5 -1
- package/dist/jsx/FocusScope.js +15 -21
- package/dist/jsx/FocusScope.js.map +1 -1
- package/dist/jsx/FocusScope.mjs +5 -1
- package/package.json +4 -4
- package/src/FocusScope.tsx +5 -1
- package/types/FocusScope.d.ts.map +1 -1
package/dist/cjs/FocusScope.js
CHANGED
|
@@ -43,7 +43,11 @@ function useFocusScope(props, forwardedRef) {
|
|
|
43
43
|
forceUnmount,
|
|
44
44
|
children,
|
|
45
45
|
...scopeProps
|
|
46
|
-
} = props, [container, setContainer] = React.useState(null), onMountAutoFocus = (0, import_use_event.useEvent)(onMountAutoFocusProp), onUnmountAutoFocus = (0, import_use_event.useEvent)(onUnmountAutoFocusProp), lastFocusedElementRef = React.useRef(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, (node) =>
|
|
46
|
+
} = props, [container, setContainer] = React.useState(null), onMountAutoFocus = (0, import_use_event.useEvent)(onMountAutoFocusProp), onUnmountAutoFocus = (0, import_use_event.useEvent)(onUnmountAutoFocusProp), lastFocusedElementRef = React.useRef(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, (node) => {
|
|
47
|
+
React.startTransition(() => {
|
|
48
|
+
setContainer(node);
|
|
49
|
+
});
|
|
50
|
+
}), focusScope = React.useRef({
|
|
47
51
|
paused: !1,
|
|
48
52
|
pause() {
|
|
49
53
|
this.paused = !0;
|
|
@@ -53,12 +57,10 @@ function useFocusScope(props, forwardedRef) {
|
|
|
53
57
|
}
|
|
54
58
|
}).current;
|
|
55
59
|
React.useEffect(() => {
|
|
56
|
-
if (!enabled || !trapped)
|
|
57
|
-
return;
|
|
60
|
+
if (!enabled || !trapped) return;
|
|
58
61
|
const controller = new AbortController();
|
|
59
62
|
function handleFocusIn(event) {
|
|
60
|
-
if (focusScope.paused || !container)
|
|
61
|
-
return;
|
|
63
|
+
if (focusScope.paused || !container) return;
|
|
62
64
|
const target = event.target;
|
|
63
65
|
container.contains(target) ? (target?.addEventListener("blur", handleBlur, { signal: controller.signal }), lastFocusedElementRef.current = target) : focus(lastFocusedElementRef.current, { select: !0 });
|
|
64
66
|
}
|
|
@@ -72,8 +74,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
72
74
|
controller.abort(), document.removeEventListener("focusin", handleFocusIn), document.removeEventListener("focusout", handleFocusOut);
|
|
73
75
|
};
|
|
74
76
|
}, [trapped, forceUnmount, container, focusScope.paused]), React.useEffect(() => {
|
|
75
|
-
if (!enabled || !container || forceUnmount)
|
|
76
|
-
return;
|
|
77
|
+
if (!enabled || !container || forceUnmount) return;
|
|
77
78
|
focusScopesStack.add(focusScope);
|
|
78
79
|
const previouslyFocusedElement = document.activeElement;
|
|
79
80
|
if (!container.contains(previouslyFocusedElement)) {
|
|
@@ -91,8 +92,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
91
92
|
}, [enabled, container, forceUnmount, onMountAutoFocus, onUnmountAutoFocus, focusScope]);
|
|
92
93
|
const handleKeyDown = React.useCallback(
|
|
93
94
|
(event) => {
|
|
94
|
-
if (!trapped || !loop || focusScope.paused)
|
|
95
|
-
return;
|
|
95
|
+
if (!trapped || !loop || focusScope.paused) return;
|
|
96
96
|
const isTabKey = event.key === "Tab" && !event.altKey && !event.ctrlKey && !event.metaKey, focusedElement = document.activeElement;
|
|
97
97
|
if (isTabKey && focusedElement) {
|
|
98
98
|
const container2 = event.currentTarget, [first, last] = getTabbableEdges(container2);
|
|
@@ -111,8 +111,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
111
111
|
function focusFirst(candidates, { select = !1 } = {}) {
|
|
112
112
|
const previouslyFocusedElement = document.activeElement;
|
|
113
113
|
for (const candidate of candidates)
|
|
114
|
-
if (focus(candidate, { select }), document.activeElement !== previouslyFocusedElement)
|
|
115
|
-
return;
|
|
114
|
+
if (focus(candidate, { select }), document.activeElement !== previouslyFocusedElement) return;
|
|
116
115
|
}
|
|
117
116
|
function getTabbableEdges(container) {
|
|
118
117
|
const candidates = getTabbableCandidates(container), first = findVisible(candidates, container), last = findVisible(candidates.reverse(), container);
|
|
@@ -125,23 +124,18 @@ function getTabbableCandidates(container) {
|
|
|
125
124
|
return node.disabled || node.hidden || isHiddenInput ? NodeFilter.FILTER_SKIP : node.tabIndex >= 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
|
|
126
125
|
}
|
|
127
126
|
});
|
|
128
|
-
for (; walker.nextNode(); )
|
|
129
|
-
nodes.push(walker.currentNode);
|
|
127
|
+
for (; walker.nextNode(); ) nodes.push(walker.currentNode);
|
|
130
128
|
return nodes;
|
|
131
129
|
}
|
|
132
130
|
function findVisible(elements, container) {
|
|
133
131
|
for (const element of elements)
|
|
134
|
-
if (!isHidden(element, { upTo: container }))
|
|
135
|
-
return element;
|
|
132
|
+
if (!isHidden(element, { upTo: container })) return element;
|
|
136
133
|
}
|
|
137
134
|
function isHidden(node, { upTo }) {
|
|
138
|
-
if (getComputedStyle(node).visibility === "hidden")
|
|
139
|
-
return !0;
|
|
135
|
+
if (getComputedStyle(node).visibility === "hidden") return !0;
|
|
140
136
|
for (; node; ) {
|
|
141
|
-
if (upTo !== void 0 && node === upTo)
|
|
142
|
-
|
|
143
|
-
if (getComputedStyle(node).display === "none")
|
|
144
|
-
return !0;
|
|
137
|
+
if (upTo !== void 0 && node === upTo) return !1;
|
|
138
|
+
if (getComputedStyle(node).display === "none") return !0;
|
|
145
139
|
node = node.parentElement;
|
|
146
140
|
}
|
|
147
141
|
return !1;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/FocusScope.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAgC,kCAChC,mBAAyB,+BACzB,QAAuB,2BAqBV;AAjBb,MAAM,qBAAqB,+BACrB,uBAAuB,iCACvB,gBAAgB,EAAE,SAAS,IAAO,YAAY,GAAK,GAUnD,aAAa,MAAM;AAAA,EACvB,SAAoB,OAAO,cAAc;AACvC,UAAM,aAAa,cAAc,OAAO,YAAY;AAEpD,WAAI,OAAO,MAAM,YAAa,aACrB,2EAAG,gBAAM,SAAS,UAAU,GAAE,IAGhC,MAAM,aAAa,MAAM,SAAS,KAAK,MAAM,QAAQ,GAAU,UAAU;AAAA,EAClF;AACF;AAMO,SAAS,cACd,OACA,cACA;AACA,QAAM;AAAA,IACJ,OAAO;AAAA,IACP,UAAU;AAAA,IACV,UAAU;AAAA,IACV,kBAAkB;AAAA,IAClB,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI,OACE,CAAC,WAAW,YAAY,IAAI,MAAM,SAA6B,IAAI,GACnE,uBAAmB,2BAAS,oBAAoB,GAChD,yBAAqB,2BAAS,sBAAsB,GACpD,wBAAwB,MAAM,OAA2B,IAAI,GAC7D,mBAAe,qCAAgB,cAAc,CAAC,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["container"]
|
|
6
6
|
}
|
package/dist/esm/FocusScope.js
CHANGED
|
@@ -18,7 +18,11 @@ function useFocusScope(props, forwardedRef) {
|
|
|
18
18
|
forceUnmount,
|
|
19
19
|
children,
|
|
20
20
|
...scopeProps
|
|
21
|
-
} = props, [container, setContainer] = React.useState(null), onMountAutoFocus = useEvent(onMountAutoFocusProp), onUnmountAutoFocus = useEvent(onUnmountAutoFocusProp), lastFocusedElementRef = React.useRef(null), composedRefs = useComposedRefs(forwardedRef, (node) =>
|
|
21
|
+
} = props, [container, setContainer] = React.useState(null), onMountAutoFocus = useEvent(onMountAutoFocusProp), onUnmountAutoFocus = useEvent(onUnmountAutoFocusProp), lastFocusedElementRef = React.useRef(null), composedRefs = useComposedRefs(forwardedRef, (node) => {
|
|
22
|
+
React.startTransition(() => {
|
|
23
|
+
setContainer(node);
|
|
24
|
+
});
|
|
25
|
+
}), focusScope = React.useRef({
|
|
22
26
|
paused: !1,
|
|
23
27
|
pause() {
|
|
24
28
|
this.paused = !0;
|
|
@@ -28,12 +32,10 @@ function useFocusScope(props, forwardedRef) {
|
|
|
28
32
|
}
|
|
29
33
|
}).current;
|
|
30
34
|
React.useEffect(() => {
|
|
31
|
-
if (!enabled || !trapped)
|
|
32
|
-
return;
|
|
35
|
+
if (!enabled || !trapped) return;
|
|
33
36
|
const controller = new AbortController();
|
|
34
37
|
function handleFocusIn(event) {
|
|
35
|
-
if (focusScope.paused || !container)
|
|
36
|
-
return;
|
|
38
|
+
if (focusScope.paused || !container) return;
|
|
37
39
|
const target = event.target;
|
|
38
40
|
container.contains(target) ? (target?.addEventListener("blur", handleBlur, { signal: controller.signal }), lastFocusedElementRef.current = target) : focus(lastFocusedElementRef.current, { select: !0 });
|
|
39
41
|
}
|
|
@@ -47,8 +49,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
47
49
|
controller.abort(), document.removeEventListener("focusin", handleFocusIn), document.removeEventListener("focusout", handleFocusOut);
|
|
48
50
|
};
|
|
49
51
|
}, [trapped, forceUnmount, container, focusScope.paused]), React.useEffect(() => {
|
|
50
|
-
if (!enabled || !container || forceUnmount)
|
|
51
|
-
return;
|
|
52
|
+
if (!enabled || !container || forceUnmount) return;
|
|
52
53
|
focusScopesStack.add(focusScope);
|
|
53
54
|
const previouslyFocusedElement = document.activeElement;
|
|
54
55
|
if (!container.contains(previouslyFocusedElement)) {
|
|
@@ -66,8 +67,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
66
67
|
}, [enabled, container, forceUnmount, onMountAutoFocus, onUnmountAutoFocus, focusScope]);
|
|
67
68
|
const handleKeyDown = React.useCallback(
|
|
68
69
|
(event) => {
|
|
69
|
-
if (!trapped || !loop || focusScope.paused)
|
|
70
|
-
return;
|
|
70
|
+
if (!trapped || !loop || focusScope.paused) return;
|
|
71
71
|
const isTabKey = event.key === "Tab" && !event.altKey && !event.ctrlKey && !event.metaKey, focusedElement = document.activeElement;
|
|
72
72
|
if (isTabKey && focusedElement) {
|
|
73
73
|
const container2 = event.currentTarget, [first, last] = getTabbableEdges(container2);
|
|
@@ -86,8 +86,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
86
86
|
function focusFirst(candidates, { select = !1 } = {}) {
|
|
87
87
|
const previouslyFocusedElement = document.activeElement;
|
|
88
88
|
for (const candidate of candidates)
|
|
89
|
-
if (focus(candidate, { select }), document.activeElement !== previouslyFocusedElement)
|
|
90
|
-
return;
|
|
89
|
+
if (focus(candidate, { select }), document.activeElement !== previouslyFocusedElement) return;
|
|
91
90
|
}
|
|
92
91
|
function getTabbableEdges(container) {
|
|
93
92
|
const candidates = getTabbableCandidates(container), first = findVisible(candidates, container), last = findVisible(candidates.reverse(), container);
|
|
@@ -100,23 +99,18 @@ function getTabbableCandidates(container) {
|
|
|
100
99
|
return node.disabled || node.hidden || isHiddenInput ? NodeFilter.FILTER_SKIP : node.tabIndex >= 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
|
|
101
100
|
}
|
|
102
101
|
});
|
|
103
|
-
for (; walker.nextNode(); )
|
|
104
|
-
nodes.push(walker.currentNode);
|
|
102
|
+
for (; walker.nextNode(); ) nodes.push(walker.currentNode);
|
|
105
103
|
return nodes;
|
|
106
104
|
}
|
|
107
105
|
function findVisible(elements, container) {
|
|
108
106
|
for (const element of elements)
|
|
109
|
-
if (!isHidden(element, { upTo: container }))
|
|
110
|
-
return element;
|
|
107
|
+
if (!isHidden(element, { upTo: container })) return element;
|
|
111
108
|
}
|
|
112
109
|
function isHidden(node, { upTo }) {
|
|
113
|
-
if (getComputedStyle(node).visibility === "hidden")
|
|
114
|
-
return !0;
|
|
110
|
+
if (getComputedStyle(node).visibility === "hidden") return !0;
|
|
115
111
|
for (; node; ) {
|
|
116
|
-
if (upTo !== void 0 && node === upTo)
|
|
117
|
-
|
|
118
|
-
if (getComputedStyle(node).display === "none")
|
|
119
|
-
return !0;
|
|
112
|
+
if (upTo !== void 0 && node === upTo) return !1;
|
|
113
|
+
if (getComputedStyle(node).display === "none") return !0;
|
|
120
114
|
node = node.parentElement;
|
|
121
115
|
}
|
|
122
116
|
return !1;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/FocusScope.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,uBAAuB;AAChC,SAAS,gBAAgB;AACzB,YAAY,WAAW;AAqBV;AAjBb,MAAM,qBAAqB,+BACrB,uBAAuB,iCACvB,gBAAgB,EAAE,SAAS,IAAO,YAAY,GAAK,GAUnD,aAAa,MAAM;AAAA,EACvB,SAAoB,OAAO,cAAc;AACvC,UAAM,aAAa,cAAc,OAAO,YAAY;AAEpD,WAAI,OAAO,MAAM,YAAa,aACrB,gCAAG,gBAAM,SAAS,UAAU,GAAE,IAGhC,MAAM,aAAa,MAAM,SAAS,KAAK,MAAM,QAAQ,GAAU,UAAU;AAAA,EAClF;AACF;AAMO,SAAS,cACd,OACA,cACA;AACA,QAAM;AAAA,IACJ,OAAO;AAAA,IACP,UAAU;AAAA,IACV,UAAU;AAAA,IACV,kBAAkB;AAAA,IAClB,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI,OACE,CAAC,WAAW,YAAY,IAAI,MAAM,SAA6B,IAAI,GACnE,mBAAmB,SAAS,oBAAoB,GAChD,qBAAqB,SAAS,sBAAsB,GACpD,wBAAwB,MAAM,OAA2B,IAAI,GAC7D,eAAe,gBAAgB,cAAc,CAAC,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["container"]
|
|
6
6
|
}
|
package/dist/esm/FocusScope.mjs
CHANGED
|
@@ -29,7 +29,11 @@ function useFocusScope(props, forwardedRef) {
|
|
|
29
29
|
onMountAutoFocus = useEvent(onMountAutoFocusProp),
|
|
30
30
|
onUnmountAutoFocus = useEvent(onUnmountAutoFocusProp),
|
|
31
31
|
lastFocusedElementRef = React.useRef(null),
|
|
32
|
-
composedRefs = useComposedRefs(forwardedRef, node =>
|
|
32
|
+
composedRefs = useComposedRefs(forwardedRef, node => {
|
|
33
|
+
React.startTransition(() => {
|
|
34
|
+
setContainer(node);
|
|
35
|
+
});
|
|
36
|
+
}),
|
|
33
37
|
focusScope = React.useRef({
|
|
34
38
|
paused: !1,
|
|
35
39
|
pause() {
|
package/dist/jsx/FocusScope.js
CHANGED
|
@@ -18,7 +18,11 @@ function useFocusScope(props, forwardedRef) {
|
|
|
18
18
|
forceUnmount,
|
|
19
19
|
children,
|
|
20
20
|
...scopeProps
|
|
21
|
-
} = props, [container, setContainer] = React.useState(null), onMountAutoFocus = useEvent(onMountAutoFocusProp), onUnmountAutoFocus = useEvent(onUnmountAutoFocusProp), lastFocusedElementRef = React.useRef(null), composedRefs = useComposedRefs(forwardedRef, (node) =>
|
|
21
|
+
} = props, [container, setContainer] = React.useState(null), onMountAutoFocus = useEvent(onMountAutoFocusProp), onUnmountAutoFocus = useEvent(onUnmountAutoFocusProp), lastFocusedElementRef = React.useRef(null), composedRefs = useComposedRefs(forwardedRef, (node) => {
|
|
22
|
+
React.startTransition(() => {
|
|
23
|
+
setContainer(node);
|
|
24
|
+
});
|
|
25
|
+
}), focusScope = React.useRef({
|
|
22
26
|
paused: !1,
|
|
23
27
|
pause() {
|
|
24
28
|
this.paused = !0;
|
|
@@ -28,12 +32,10 @@ function useFocusScope(props, forwardedRef) {
|
|
|
28
32
|
}
|
|
29
33
|
}).current;
|
|
30
34
|
React.useEffect(() => {
|
|
31
|
-
if (!enabled || !trapped)
|
|
32
|
-
return;
|
|
35
|
+
if (!enabled || !trapped) return;
|
|
33
36
|
const controller = new AbortController();
|
|
34
37
|
function handleFocusIn(event) {
|
|
35
|
-
if (focusScope.paused || !container)
|
|
36
|
-
return;
|
|
38
|
+
if (focusScope.paused || !container) return;
|
|
37
39
|
const target = event.target;
|
|
38
40
|
container.contains(target) ? (target?.addEventListener("blur", handleBlur, { signal: controller.signal }), lastFocusedElementRef.current = target) : focus(lastFocusedElementRef.current, { select: !0 });
|
|
39
41
|
}
|
|
@@ -47,8 +49,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
47
49
|
controller.abort(), document.removeEventListener("focusin", handleFocusIn), document.removeEventListener("focusout", handleFocusOut);
|
|
48
50
|
};
|
|
49
51
|
}, [trapped, forceUnmount, container, focusScope.paused]), React.useEffect(() => {
|
|
50
|
-
if (!enabled || !container || forceUnmount)
|
|
51
|
-
return;
|
|
52
|
+
if (!enabled || !container || forceUnmount) return;
|
|
52
53
|
focusScopesStack.add(focusScope);
|
|
53
54
|
const previouslyFocusedElement = document.activeElement;
|
|
54
55
|
if (!container.contains(previouslyFocusedElement)) {
|
|
@@ -66,8 +67,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
66
67
|
}, [enabled, container, forceUnmount, onMountAutoFocus, onUnmountAutoFocus, focusScope]);
|
|
67
68
|
const handleKeyDown = React.useCallback(
|
|
68
69
|
(event) => {
|
|
69
|
-
if (!trapped || !loop || focusScope.paused)
|
|
70
|
-
return;
|
|
70
|
+
if (!trapped || !loop || focusScope.paused) return;
|
|
71
71
|
const isTabKey = event.key === "Tab" && !event.altKey && !event.ctrlKey && !event.metaKey, focusedElement = document.activeElement;
|
|
72
72
|
if (isTabKey && focusedElement) {
|
|
73
73
|
const container2 = event.currentTarget, [first, last] = getTabbableEdges(container2);
|
|
@@ -86,8 +86,7 @@ function useFocusScope(props, forwardedRef) {
|
|
|
86
86
|
function focusFirst(candidates, { select = !1 } = {}) {
|
|
87
87
|
const previouslyFocusedElement = document.activeElement;
|
|
88
88
|
for (const candidate of candidates)
|
|
89
|
-
if (focus(candidate, { select }), document.activeElement !== previouslyFocusedElement)
|
|
90
|
-
return;
|
|
89
|
+
if (focus(candidate, { select }), document.activeElement !== previouslyFocusedElement) return;
|
|
91
90
|
}
|
|
92
91
|
function getTabbableEdges(container) {
|
|
93
92
|
const candidates = getTabbableCandidates(container), first = findVisible(candidates, container), last = findVisible(candidates.reverse(), container);
|
|
@@ -100,23 +99,18 @@ function getTabbableCandidates(container) {
|
|
|
100
99
|
return node.disabled || node.hidden || isHiddenInput ? NodeFilter.FILTER_SKIP : node.tabIndex >= 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
|
|
101
100
|
}
|
|
102
101
|
});
|
|
103
|
-
for (; walker.nextNode(); )
|
|
104
|
-
nodes.push(walker.currentNode);
|
|
102
|
+
for (; walker.nextNode(); ) nodes.push(walker.currentNode);
|
|
105
103
|
return nodes;
|
|
106
104
|
}
|
|
107
105
|
function findVisible(elements, container) {
|
|
108
106
|
for (const element of elements)
|
|
109
|
-
if (!isHidden(element, { upTo: container }))
|
|
110
|
-
return element;
|
|
107
|
+
if (!isHidden(element, { upTo: container })) return element;
|
|
111
108
|
}
|
|
112
109
|
function isHidden(node, { upTo }) {
|
|
113
|
-
if (getComputedStyle(node).visibility === "hidden")
|
|
114
|
-
return !0;
|
|
110
|
+
if (getComputedStyle(node).visibility === "hidden") return !0;
|
|
115
111
|
for (; node; ) {
|
|
116
|
-
if (upTo !== void 0 && node === upTo)
|
|
117
|
-
|
|
118
|
-
if (getComputedStyle(node).display === "none")
|
|
119
|
-
return !0;
|
|
112
|
+
if (upTo !== void 0 && node === upTo) return !1;
|
|
113
|
+
if (getComputedStyle(node).display === "none") return !0;
|
|
120
114
|
node = node.parentElement;
|
|
121
115
|
}
|
|
122
116
|
return !1;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/FocusScope.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,uBAAuB;AAChC,SAAS,gBAAgB;AACzB,YAAY,WAAW;AAqBV;AAjBb,MAAM,qBAAqB,+BACrB,uBAAuB,iCACvB,gBAAgB,EAAE,SAAS,IAAO,YAAY,GAAK,GAUnD,aAAa,MAAM;AAAA,EACvB,SAAoB,OAAO,cAAc;AACvC,UAAM,aAAa,cAAc,OAAO,YAAY;AAEpD,WAAI,OAAO,MAAM,YAAa,aACrB,gCAAG,gBAAM,SAAS,UAAU,GAAE,IAGhC,MAAM,aAAa,MAAM,SAAS,KAAK,MAAM,QAAQ,GAAU,UAAU;AAAA,EAClF;AACF;AAMO,SAAS,cACd,OACA,cACA;AACA,QAAM;AAAA,IACJ,OAAO;AAAA,IACP,UAAU;AAAA,IACV,UAAU;AAAA,IACV,kBAAkB;AAAA,IAClB,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI,OACE,CAAC,WAAW,YAAY,IAAI,MAAM,SAA6B,IAAI,GACnE,mBAAmB,SAAS,oBAAoB,GAChD,qBAAqB,SAAS,sBAAsB,GACpD,wBAAwB,MAAM,OAA2B,IAAI,GAC7D,eAAe,gBAAgB,cAAc,CAAC,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["container"]
|
|
6
6
|
}
|
package/dist/jsx/FocusScope.mjs
CHANGED
|
@@ -29,7 +29,11 @@ function useFocusScope(props, forwardedRef) {
|
|
|
29
29
|
onMountAutoFocus = useEvent(onMountAutoFocusProp),
|
|
30
30
|
onUnmountAutoFocus = useEvent(onUnmountAutoFocusProp),
|
|
31
31
|
lastFocusedElementRef = React.useRef(null),
|
|
32
|
-
composedRefs = useComposedRefs(forwardedRef, node =>
|
|
32
|
+
composedRefs = useComposedRefs(forwardedRef, node => {
|
|
33
|
+
React.startTransition(() => {
|
|
34
|
+
setContainer(node);
|
|
35
|
+
});
|
|
36
|
+
}),
|
|
33
37
|
focusScope = React.useRef({
|
|
34
38
|
paused: !1,
|
|
35
39
|
pause() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/focus-scope",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.100.0",
|
|
4
4
|
"sideEffects": true,
|
|
5
5
|
"source": "src/index.ts",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
}
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@tamagui/compose-refs": "1.
|
|
34
|
-
"@tamagui/use-event": "1.
|
|
33
|
+
"@tamagui/compose-refs": "1.100.0",
|
|
34
|
+
"@tamagui/use-event": "1.100.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@tamagui/build": "1.
|
|
37
|
+
"@tamagui/build": "1.100.0",
|
|
38
38
|
"react": "^18.2.0"
|
|
39
39
|
},
|
|
40
40
|
"publishConfig": {
|
package/src/FocusScope.tsx
CHANGED
|
@@ -50,7 +50,11 @@ export function useFocusScope(
|
|
|
50
50
|
const onMountAutoFocus = useEvent(onMountAutoFocusProp)
|
|
51
51
|
const onUnmountAutoFocus = useEvent(onUnmountAutoFocusProp)
|
|
52
52
|
const lastFocusedElementRef = React.useRef<HTMLElement | null>(null)
|
|
53
|
-
const composedRefs = useComposedRefs(forwardedRef, (node) =>
|
|
53
|
+
const composedRefs = useComposedRefs(forwardedRef, (node) => {
|
|
54
|
+
React.startTransition(() => {
|
|
55
|
+
setContainer(node)
|
|
56
|
+
})
|
|
57
|
+
})
|
|
54
58
|
|
|
55
59
|
const focusScope = React.useRef({
|
|
56
60
|
paused: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusScope.d.ts","sourceRoot":"","sources":["../src/FocusScope.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAYxD,KAAK,iBAAiB,GAAG,cAAc,CAAA;AAEvC,QAAA,MAAM,UAAU,wFAUf,CAAA;AAMD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,eAAe,EACtB,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC;;
|
|
1
|
+
{"version":3,"file":"FocusScope.d.ts","sourceRoot":"","sources":["../src/FocusScope.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAYxD,KAAK,iBAAiB,GAAG,cAAc,CAAA;AAEvC,QAAA,MAAM,UAAU,wFAUf,CAAA;AAMD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,eAAe,EACtB,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC;;uBAkHzC,mBAAmB;;EAqC9B;AA2ID,OAAO,EAAE,UAAU,EAAE,CAAA;AAErB,YAAY,EAAE,eAAe,EAAE,CAAA"}
|