@tamagui/roving-focus 1.69.3 → 1.71.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/RovingFocusGroup.js +22 -13
- package/dist/cjs/RovingFocusGroup.js.map +1 -1
- package/dist/esm/RovingFocusGroup.js +21 -11
- package/dist/esm/RovingFocusGroup.js.map +1 -1
- package/dist/jsx/RovingFocusGroup.js +13 -11
- package/dist/jsx/RovingFocusGroup.js.map +1 -1
- package/package.json +9 -9
- package/src/RovingFocusGroup.tsx +32 -23
- package/types/RovingFocusGroup.d.ts +7 -4
- package/types/RovingFocusGroup.d.ts.map +1 -1
|
@@ -22,11 +22,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
22
22
|
)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
23
23
|
var RovingFocusGroup_exports = {};
|
|
24
24
|
__export(RovingFocusGroup_exports, {
|
|
25
|
-
RovingFocusGroup: () => RovingFocusGroup
|
|
26
|
-
createRovingFocusGroupScope: () => createRovingFocusGroupScope
|
|
25
|
+
RovingFocusGroup: () => RovingFocusGroup
|
|
27
26
|
});
|
|
28
27
|
module.exports = __toCommonJS(RovingFocusGroup_exports);
|
|
29
|
-
var import_collection = require("@tamagui/collection"), import_compose_refs = require("@tamagui/compose-refs"), import_core = require("@tamagui/core"),
|
|
28
|
+
var import_collection = require("@tamagui/collection"), import_compose_refs = require("@tamagui/compose-refs"), import_core = require("@tamagui/core"), import_use_controllable_state = require("@tamagui/use-controllable-state"), import_use_direction = require("@tamagui/use-direction"), React = __toESM(require("react")), import_jsx_runtime = require("react/jsx-runtime");
|
|
30
29
|
const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles: !1, cancelable: !0 }, RovingFocusGroupImpl = React.forwardRef((props, forwardedRef) => {
|
|
31
30
|
const {
|
|
32
31
|
__scopeRovingFocusGroup,
|
|
@@ -42,7 +41,7 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
42
41
|
prop: currentTabStopIdProp,
|
|
43
42
|
defaultProp: defaultCurrentTabStopId ?? null,
|
|
44
43
|
onChange: onCurrentTabStopIdChange
|
|
45
|
-
}), [isTabbingBackOut, setIsTabbingBackOut] = React.useState(!1), handleEntryFocus = (0, import_core.useEvent)(onEntryFocus), getItems = useCollection(__scopeRovingFocusGroup), isClickFocusRef = React.useRef(!1), [focusableItemsCount, setFocusableItemsCount] = React.useState(0);
|
|
44
|
+
}), [isTabbingBackOut, setIsTabbingBackOut] = React.useState(!1), handleEntryFocus = (0, import_core.useEvent)(onEntryFocus), getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT), isClickFocusRef = React.useRef(!1), [focusableItemsCount, setFocusableItemsCount] = React.useState(0);
|
|
46
45
|
return React.useEffect(() => {
|
|
47
46
|
const node = ref.current;
|
|
48
47
|
if (node)
|
|
@@ -107,14 +106,14 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
107
106
|
active = !1,
|
|
108
107
|
tabStopId,
|
|
109
108
|
...itemProps
|
|
110
|
-
} = props, autoId = React.useId(), id = tabStopId || autoId, context = useRovingFocusContext(
|
|
109
|
+
} = props, autoId = React.useId(), id = tabStopId || autoId, context = useRovingFocusContext(__scopeRovingFocusGroup), isCurrentTabStop = context.currentTabStopId === id, getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT), { onFocusableItemAdd, onFocusableItemRemove } = context;
|
|
111
110
|
return React.useEffect(() => {
|
|
112
111
|
if (focusable)
|
|
113
112
|
return onFocusableItemAdd(), () => onFocusableItemRemove();
|
|
114
113
|
}, [focusable, onFocusableItemAdd, onFocusableItemRemove]), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
115
114
|
Collection.ItemSlot,
|
|
116
115
|
{
|
|
117
|
-
|
|
116
|
+
__scopeCollection: __scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT,
|
|
118
117
|
id,
|
|
119
118
|
focusable,
|
|
120
119
|
active,
|
|
@@ -161,12 +160,23 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
161
160
|
);
|
|
162
161
|
});
|
|
163
162
|
RovingFocusGroupItem.displayName = ITEM_NAME;
|
|
164
|
-
const GROUP_NAME = "RovingFocusGroup", [Collection, useCollection
|
|
165
|
-
GROUP_NAME
|
|
166
|
-
|
|
167
|
-
), [RovingFocusProvider, useRovingFocusContext] = createRovingFocusGroupContext(GROUP_NAME), RovingFocusGroup = (0, import_core.withStaticProperties)(
|
|
163
|
+
const GROUP_NAME = "RovingFocusGroup", [Collection, useCollection] = (0, import_collection.createCollection)(
|
|
164
|
+
GROUP_NAME
|
|
165
|
+
), { Provider: RovingFocusProvider, useStyledContext: useRovingFocusContext } = (0, import_core.createStyledContext)(), ROVING_FOCUS_GROUP_CONTEXT = "RovingFocusGroupContext", RovingFocusGroup = (0, import_core.withStaticProperties)(
|
|
168
166
|
React.forwardRef(
|
|
169
|
-
(props, forwardedRef) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
167
|
+
(props, forwardedRef) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
168
|
+
Collection.Provider,
|
|
169
|
+
{
|
|
170
|
+
__scopeCollection: props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT,
|
|
171
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
172
|
+
Collection.Slot,
|
|
173
|
+
{
|
|
174
|
+
__scopeCollection: props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT,
|
|
175
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RovingFocusGroupImpl, { ...props, ref: forwardedRef })
|
|
176
|
+
}
|
|
177
|
+
)
|
|
178
|
+
}
|
|
179
|
+
)
|
|
170
180
|
),
|
|
171
181
|
{
|
|
172
182
|
Item: RovingFocusGroupItem
|
|
@@ -202,7 +212,6 @@ function wrapArray(array, startIndex) {
|
|
|
202
212
|
}
|
|
203
213
|
// Annotate the CommonJS export names for ESM import in node:
|
|
204
214
|
0 && (module.exports = {
|
|
205
|
-
RovingFocusGroup
|
|
206
|
-
createRovingFocusGroupScope
|
|
215
|
+
RovingFocusGroup
|
|
207
216
|
});
|
|
208
217
|
//# sourceMappingURL=RovingFocusGroup.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/RovingFocusGroup.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,11 +3,11 @@ import { useComposedRefs } from "@tamagui/compose-refs";
|
|
|
3
3
|
import {
|
|
4
4
|
Stack,
|
|
5
5
|
composeEventHandlers,
|
|
6
|
+
createStyledContext,
|
|
6
7
|
isWeb,
|
|
7
8
|
useEvent,
|
|
8
9
|
withStaticProperties
|
|
9
10
|
} from "@tamagui/core";
|
|
10
|
-
import { createContextScope } from "@tamagui/create-context";
|
|
11
11
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
12
12
|
import { useDirection } from "@tamagui/use-direction";
|
|
13
13
|
import * as React from "react";
|
|
@@ -27,7 +27,7 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
27
27
|
prop: currentTabStopIdProp,
|
|
28
28
|
defaultProp: defaultCurrentTabStopId ?? null,
|
|
29
29
|
onChange: onCurrentTabStopIdChange
|
|
30
|
-
}), [isTabbingBackOut, setIsTabbingBackOut] = React.useState(!1), handleEntryFocus = useEvent(onEntryFocus), getItems = useCollection(__scopeRovingFocusGroup), isClickFocusRef = React.useRef(!1), [focusableItemsCount, setFocusableItemsCount] = React.useState(0);
|
|
30
|
+
}), [isTabbingBackOut, setIsTabbingBackOut] = React.useState(!1), handleEntryFocus = useEvent(onEntryFocus), getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT), isClickFocusRef = React.useRef(!1), [focusableItemsCount, setFocusableItemsCount] = React.useState(0);
|
|
31
31
|
return React.useEffect(() => {
|
|
32
32
|
const node = ref.current;
|
|
33
33
|
if (node)
|
|
@@ -92,14 +92,14 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
92
92
|
active = !1,
|
|
93
93
|
tabStopId,
|
|
94
94
|
...itemProps
|
|
95
|
-
} = props, autoId = React.useId(), id = tabStopId || autoId, context = useRovingFocusContext(
|
|
95
|
+
} = props, autoId = React.useId(), id = tabStopId || autoId, context = useRovingFocusContext(__scopeRovingFocusGroup), isCurrentTabStop = context.currentTabStopId === id, getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT), { onFocusableItemAdd, onFocusableItemRemove } = context;
|
|
96
96
|
return React.useEffect(() => {
|
|
97
97
|
if (focusable)
|
|
98
98
|
return onFocusableItemAdd(), () => onFocusableItemRemove();
|
|
99
99
|
}, [focusable, onFocusableItemAdd, onFocusableItemRemove]), /* @__PURE__ */ jsx(
|
|
100
100
|
Collection.ItemSlot,
|
|
101
101
|
{
|
|
102
|
-
|
|
102
|
+
__scopeCollection: __scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT,
|
|
103
103
|
id,
|
|
104
104
|
focusable,
|
|
105
105
|
active,
|
|
@@ -146,12 +146,23 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
146
146
|
);
|
|
147
147
|
});
|
|
148
148
|
RovingFocusGroupItem.displayName = ITEM_NAME;
|
|
149
|
-
const GROUP_NAME = "RovingFocusGroup", [Collection, useCollection
|
|
150
|
-
GROUP_NAME
|
|
151
|
-
|
|
152
|
-
), [RovingFocusProvider, useRovingFocusContext] = createRovingFocusGroupContext(GROUP_NAME), RovingFocusGroup = withStaticProperties(
|
|
149
|
+
const GROUP_NAME = "RovingFocusGroup", [Collection, useCollection] = createCollection(
|
|
150
|
+
GROUP_NAME
|
|
151
|
+
), { Provider: RovingFocusProvider, useStyledContext: useRovingFocusContext } = createStyledContext(), ROVING_FOCUS_GROUP_CONTEXT = "RovingFocusGroupContext", RovingFocusGroup = withStaticProperties(
|
|
153
152
|
React.forwardRef(
|
|
154
|
-
(props, forwardedRef) => /* @__PURE__ */ jsx(
|
|
153
|
+
(props, forwardedRef) => /* @__PURE__ */ jsx(
|
|
154
|
+
Collection.Provider,
|
|
155
|
+
{
|
|
156
|
+
__scopeCollection: props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT,
|
|
157
|
+
children: /* @__PURE__ */ jsx(
|
|
158
|
+
Collection.Slot,
|
|
159
|
+
{
|
|
160
|
+
__scopeCollection: props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT,
|
|
161
|
+
children: /* @__PURE__ */ jsx(RovingFocusGroupImpl, { ...props, ref: forwardedRef })
|
|
162
|
+
}
|
|
163
|
+
)
|
|
164
|
+
}
|
|
165
|
+
)
|
|
155
166
|
),
|
|
156
167
|
{
|
|
157
168
|
Item: RovingFocusGroupItem
|
|
@@ -186,7 +197,6 @@ function wrapArray(array, startIndex) {
|
|
|
186
197
|
return array.map((_, index) => array[(startIndex + index) % array.length]);
|
|
187
198
|
}
|
|
188
199
|
export {
|
|
189
|
-
RovingFocusGroup
|
|
190
|
-
createRovingFocusGroupScope
|
|
200
|
+
RovingFocusGroup
|
|
191
201
|
};
|
|
192
202
|
//# sourceMappingURL=RovingFocusGroup.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/RovingFocusGroup.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,wBAAwB;AACjC,SAAS,uBAAuB;AAChC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,11 +3,11 @@ import { useComposedRefs } from "@tamagui/compose-refs";
|
|
|
3
3
|
import {
|
|
4
4
|
Stack,
|
|
5
5
|
composeEventHandlers,
|
|
6
|
+
createStyledContext,
|
|
6
7
|
isWeb,
|
|
7
8
|
useEvent,
|
|
8
9
|
withStaticProperties
|
|
9
10
|
} from "@tamagui/core";
|
|
10
|
-
import { createContextScope } from "@tamagui/create-context";
|
|
11
11
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
12
12
|
import { useDirection } from "@tamagui/use-direction";
|
|
13
13
|
import * as React from "react";
|
|
@@ -26,7 +26,7 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
26
26
|
prop: currentTabStopIdProp,
|
|
27
27
|
defaultProp: defaultCurrentTabStopId ?? null,
|
|
28
28
|
onChange: onCurrentTabStopIdChange
|
|
29
|
-
}), [isTabbingBackOut, setIsTabbingBackOut] = React.useState(!1), handleEntryFocus = useEvent(onEntryFocus), getItems = useCollection(__scopeRovingFocusGroup), isClickFocusRef = React.useRef(!1), [focusableItemsCount, setFocusableItemsCount] = React.useState(0);
|
|
29
|
+
}), [isTabbingBackOut, setIsTabbingBackOut] = React.useState(!1), handleEntryFocus = useEvent(onEntryFocus), getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT), isClickFocusRef = React.useRef(!1), [focusableItemsCount, setFocusableItemsCount] = React.useState(0);
|
|
30
30
|
return React.useEffect(() => {
|
|
31
31
|
const node = ref.current;
|
|
32
32
|
if (node)
|
|
@@ -84,12 +84,12 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
84
84
|
active = !1,
|
|
85
85
|
tabStopId,
|
|
86
86
|
...itemProps
|
|
87
|
-
} = props, autoId = React.useId(), id = tabStopId || autoId, context = useRovingFocusContext(
|
|
87
|
+
} = props, autoId = React.useId(), id = tabStopId || autoId, context = useRovingFocusContext(__scopeRovingFocusGroup), isCurrentTabStop = context.currentTabStopId === id, getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT), { onFocusableItemAdd, onFocusableItemRemove } = context;
|
|
88
88
|
return React.useEffect(() => {
|
|
89
89
|
if (focusable)
|
|
90
90
|
return onFocusableItemAdd(), () => onFocusableItemRemove();
|
|
91
91
|
}, [focusable, onFocusableItemAdd, onFocusableItemRemove]), <Collection.ItemSlot
|
|
92
|
-
|
|
92
|
+
__scopeCollection={__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT}
|
|
93
93
|
id={id}
|
|
94
94
|
focusable={focusable}
|
|
95
95
|
active={active}
|
|
@@ -131,12 +131,15 @@ const ENTRY_FOCUS = "rovingFocusGroup.onEntryFocus", EVENT_OPTIONS = { bubbles:
|
|
|
131
131
|
/></Collection.ItemSlot>;
|
|
132
132
|
});
|
|
133
133
|
RovingFocusGroupItem.displayName = ITEM_NAME;
|
|
134
|
-
const GROUP_NAME = "RovingFocusGroup", [Collection, useCollection
|
|
135
|
-
GROUP_NAME
|
|
136
|
-
|
|
137
|
-
), [RovingFocusProvider, useRovingFocusContext] = createRovingFocusGroupContext(GROUP_NAME), RovingFocusGroup = withStaticProperties(
|
|
134
|
+
const GROUP_NAME = "RovingFocusGroup", [Collection, useCollection] = createCollection(
|
|
135
|
+
GROUP_NAME
|
|
136
|
+
), { Provider: RovingFocusProvider, useStyledContext: useRovingFocusContext } = createStyledContext(), ROVING_FOCUS_GROUP_CONTEXT = "RovingFocusGroupContext", RovingFocusGroup = withStaticProperties(
|
|
138
137
|
React.forwardRef(
|
|
139
|
-
(props, forwardedRef) => <Collection.Provider
|
|
138
|
+
(props, forwardedRef) => <Collection.Provider
|
|
139
|
+
__scopeCollection={props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT}
|
|
140
|
+
><Collection.Slot
|
|
141
|
+
__scopeCollection={props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT}
|
|
142
|
+
><RovingFocusGroupImpl {...props} ref={forwardedRef} /></Collection.Slot></Collection.Provider>
|
|
140
143
|
),
|
|
141
144
|
{
|
|
142
145
|
Item: RovingFocusGroupItem
|
|
@@ -171,7 +174,6 @@ function wrapArray(array, startIndex) {
|
|
|
171
174
|
return array.map((_, index) => array[(startIndex + index) % array.length]);
|
|
172
175
|
}
|
|
173
176
|
export {
|
|
174
|
-
RovingFocusGroup
|
|
175
|
-
createRovingFocusGroupScope
|
|
177
|
+
RovingFocusGroup
|
|
176
178
|
};
|
|
177
179
|
//# sourceMappingURL=RovingFocusGroup.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/RovingFocusGroup.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,wBAAwB;AACjC,SAAS,uBAAuB;AAChC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/roving-focus",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.71.0",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
}
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/collection": "1.
|
|
31
|
-
"@tamagui/compose-refs": "1.
|
|
32
|
-
"@tamagui/core": "1.
|
|
33
|
-
"@tamagui/create-context": "1.
|
|
34
|
-
"@tamagui/use-controllable-state": "1.
|
|
35
|
-
"@tamagui/use-direction": "1.
|
|
36
|
-
"@tamagui/use-event": "1.
|
|
30
|
+
"@tamagui/collection": "1.71.0",
|
|
31
|
+
"@tamagui/compose-refs": "1.71.0",
|
|
32
|
+
"@tamagui/core": "1.71.0",
|
|
33
|
+
"@tamagui/create-context": "1.71.0",
|
|
34
|
+
"@tamagui/use-controllable-state": "1.71.0",
|
|
35
|
+
"@tamagui/use-direction": "1.71.0",
|
|
36
|
+
"@tamagui/use-event": "1.71.0"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.
|
|
42
|
+
"@tamagui/build": "1.71.0",
|
|
43
43
|
"react": "^18.2.0"
|
|
44
44
|
},
|
|
45
45
|
"publishConfig": {
|
package/src/RovingFocusGroup.tsx
CHANGED
|
@@ -3,12 +3,11 @@ import { useComposedRefs } from '@tamagui/compose-refs'
|
|
|
3
3
|
import {
|
|
4
4
|
Stack,
|
|
5
5
|
composeEventHandlers,
|
|
6
|
+
createStyledContext,
|
|
6
7
|
isWeb,
|
|
7
8
|
useEvent,
|
|
8
9
|
withStaticProperties,
|
|
9
10
|
} from '@tamagui/core'
|
|
10
|
-
import { createContextScope } from '@tamagui/create-context'
|
|
11
|
-
import type { Scope } from '@tamagui/create-context'
|
|
12
11
|
import { useControllableState } from '@tamagui/use-controllable-state'
|
|
13
12
|
import { useDirection } from '@tamagui/use-direction'
|
|
14
13
|
import * as React from 'react'
|
|
@@ -31,7 +30,7 @@ interface RovingFocusGroupImplProps
|
|
|
31
30
|
|
|
32
31
|
const RovingFocusGroupImpl = React.forwardRef<
|
|
33
32
|
RovingFocusGroupImplElement,
|
|
34
|
-
RovingFocusGroupImplProps
|
|
33
|
+
ScopedProps<RovingFocusGroupImplProps>
|
|
35
34
|
>((props: ScopedProps<RovingFocusGroupImplProps>, forwardedRef) => {
|
|
36
35
|
const {
|
|
37
36
|
__scopeRovingFocusGroup,
|
|
@@ -54,7 +53,7 @@ const RovingFocusGroupImpl = React.forwardRef<
|
|
|
54
53
|
})
|
|
55
54
|
const [isTabbingBackOut, setIsTabbingBackOut] = React.useState(false)
|
|
56
55
|
const handleEntryFocus = useEvent(onEntryFocus)
|
|
57
|
-
const getItems = useCollection(__scopeRovingFocusGroup)
|
|
56
|
+
const getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT)
|
|
58
57
|
const isClickFocusRef = React.useRef(false)
|
|
59
58
|
const [focusableItemsCount, setFocusableItemsCount] = React.useState(0)
|
|
60
59
|
|
|
@@ -151,7 +150,7 @@ interface RovingFocusItemProps extends PrimitiveSpanProps {
|
|
|
151
150
|
|
|
152
151
|
const RovingFocusGroupItem = React.forwardRef<
|
|
153
152
|
RovingFocusItemElement,
|
|
154
|
-
RovingFocusItemProps
|
|
153
|
+
ScopedProps<RovingFocusItemProps>
|
|
155
154
|
>((props: ScopedProps<RovingFocusItemProps>, forwardedRef) => {
|
|
156
155
|
const {
|
|
157
156
|
__scopeRovingFocusGroup,
|
|
@@ -162,9 +161,9 @@ const RovingFocusGroupItem = React.forwardRef<
|
|
|
162
161
|
} = props
|
|
163
162
|
const autoId = React.useId()
|
|
164
163
|
const id = tabStopId || autoId
|
|
165
|
-
const context = useRovingFocusContext(
|
|
164
|
+
const context = useRovingFocusContext(__scopeRovingFocusGroup)
|
|
166
165
|
const isCurrentTabStop = context.currentTabStopId === id
|
|
167
|
-
const getItems = useCollection(__scopeRovingFocusGroup)
|
|
166
|
+
const getItems = useCollection(__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT)
|
|
168
167
|
|
|
169
168
|
const { onFocusableItemAdd, onFocusableItemRemove } = context
|
|
170
169
|
|
|
@@ -177,7 +176,7 @@ const RovingFocusGroupItem = React.forwardRef<
|
|
|
177
176
|
|
|
178
177
|
return (
|
|
179
178
|
<Collection.ItemSlot
|
|
180
|
-
|
|
179
|
+
__scopeCollection={__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT}
|
|
181
180
|
id={id}
|
|
182
181
|
focusable={focusable}
|
|
183
182
|
active={active}
|
|
@@ -245,17 +244,16 @@ RovingFocusGroupItem.displayName = ITEM_NAME
|
|
|
245
244
|
const GROUP_NAME = 'RovingFocusGroup'
|
|
246
245
|
|
|
247
246
|
type ItemData = { id: string; focusable: boolean; active: boolean }
|
|
248
|
-
const [Collection, useCollection
|
|
249
|
-
|
|
250
|
-
ItemData
|
|
251
|
-
>(GROUP_NAME)
|
|
252
|
-
|
|
253
|
-
type ScopedProps<P> = P & { __scopeRovingFocusGroup?: Scope }
|
|
254
|
-
const [createRovingFocusGroupContext, createRovingFocusGroupScope] = createContextScope(
|
|
255
|
-
GROUP_NAME,
|
|
256
|
-
[createCollectionScope]
|
|
247
|
+
const [Collection, useCollection] = createCollection<HTMLSpanElement, ItemData>(
|
|
248
|
+
GROUP_NAME
|
|
257
249
|
)
|
|
258
250
|
|
|
251
|
+
type ScopedProps<P> = P & { __scopeRovingFocusGroup?: string }
|
|
252
|
+
// const [createRovingFocusGroupContext, createRovingFocusGroupScope] = createContextScope(
|
|
253
|
+
// GROUP_NAME,
|
|
254
|
+
// [createCollectionScope]
|
|
255
|
+
// )
|
|
256
|
+
|
|
259
257
|
type Orientation = React.AriaAttributes['aria-orientation']
|
|
260
258
|
type Direction = 'ltr' | 'rtl'
|
|
261
259
|
|
|
@@ -284,18 +282,29 @@ type RovingContextValue = RovingFocusGroupOptions & {
|
|
|
284
282
|
onFocusableItemRemove(): void
|
|
285
283
|
}
|
|
286
284
|
|
|
287
|
-
const [RovingFocusProvider, useRovingFocusContext] =
|
|
288
|
-
|
|
285
|
+
// const [RovingFocusProvider, useRovingFocusContext] =
|
|
286
|
+
// createRovingFocusGroupContext<RovingContextValue>(GROUP_NAME)
|
|
287
|
+
|
|
288
|
+
const { Provider: RovingFocusProvider, useStyledContext: useRovingFocusContext } =
|
|
289
|
+
createStyledContext<RovingContextValue>()
|
|
289
290
|
|
|
290
291
|
type RovingFocusGroupElement = RovingFocusGroupImplElement
|
|
291
292
|
interface RovingFocusGroupProps extends RovingFocusGroupImplProps {}
|
|
292
293
|
|
|
294
|
+
const ROVING_FOCUS_GROUP_CONTEXT = 'RovingFocusGroupContext'
|
|
295
|
+
|
|
293
296
|
const RovingFocusGroup = withStaticProperties(
|
|
294
|
-
React.forwardRef<RovingFocusGroupElement, RovingFocusGroupProps
|
|
297
|
+
React.forwardRef<RovingFocusGroupElement, ScopedProps<RovingFocusGroupProps>>(
|
|
295
298
|
(props: ScopedProps<RovingFocusGroupProps>, forwardedRef) => {
|
|
296
299
|
return (
|
|
297
|
-
<Collection.Provider
|
|
298
|
-
|
|
300
|
+
<Collection.Provider
|
|
301
|
+
__scopeCollection={props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT}
|
|
302
|
+
>
|
|
303
|
+
<Collection.Slot
|
|
304
|
+
__scopeCollection={
|
|
305
|
+
props.__scopeRovingFocusGroup || ROVING_FOCUS_GROUP_CONTEXT
|
|
306
|
+
}
|
|
307
|
+
>
|
|
299
308
|
<RovingFocusGroupImpl {...props} ref={forwardedRef} />
|
|
300
309
|
</Collection.Slot>
|
|
301
310
|
</Collection.Provider>
|
|
@@ -357,6 +366,6 @@ function wrapArray<T>(array: T[], startIndex: number) {
|
|
|
357
366
|
return array.map((_, index) => array[(startIndex + index) % array.length])
|
|
358
367
|
}
|
|
359
368
|
|
|
360
|
-
export {
|
|
369
|
+
export { RovingFocusGroup }
|
|
361
370
|
|
|
362
371
|
export type { RovingFocusGroupProps, RovingFocusItemProps }
|
|
@@ -13,7 +13,6 @@ interface RovingFocusItemProps extends PrimitiveSpanProps {
|
|
|
13
13
|
focusable?: boolean;
|
|
14
14
|
active?: boolean;
|
|
15
15
|
}
|
|
16
|
-
declare const createRovingFocusGroupScope: import("@tamagui/create-context").CreateScope;
|
|
17
16
|
type Orientation = React.AriaAttributes['aria-orientation'];
|
|
18
17
|
type Direction = 'ltr' | 'rtl';
|
|
19
18
|
interface RovingFocusGroupOptions {
|
|
@@ -34,9 +33,13 @@ interface RovingFocusGroupOptions {
|
|
|
34
33
|
}
|
|
35
34
|
interface RovingFocusGroupProps extends RovingFocusGroupImplProps {
|
|
36
35
|
}
|
|
37
|
-
declare const RovingFocusGroup: React.ForwardRefExoticComponent<RovingFocusGroupProps &
|
|
38
|
-
|
|
36
|
+
declare const RovingFocusGroup: React.ForwardRefExoticComponent<RovingFocusGroupProps & {
|
|
37
|
+
__scopeRovingFocusGroup?: string | undefined;
|
|
38
|
+
} & React.RefAttributes<import("@tamagui/core").TamaguiElement>> & {
|
|
39
|
+
Item: React.ForwardRefExoticComponent<RovingFocusItemProps & {
|
|
40
|
+
__scopeRovingFocusGroup?: string | undefined;
|
|
41
|
+
} & React.RefAttributes<import("@tamagui/core").TamaguiElement>>;
|
|
39
42
|
};
|
|
40
|
-
export {
|
|
43
|
+
export { RovingFocusGroup };
|
|
41
44
|
export type { RovingFocusGroupProps, RovingFocusItemProps };
|
|
42
45
|
//# sourceMappingURL=RovingFocusGroup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RovingFocusGroup.d.ts","sourceRoot":"","sources":["../src/RovingFocusGroup.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,
|
|
1
|
+
{"version":3,"file":"RovingFocusGroup.d.ts","sourceRoot":"","sources":["../src/RovingFocusGroup.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,EAMN,MAAM,eAAe,CAAA;AAGtB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,KAAK,iBAAiB,GAAG,KAAK,CAAC,wBAAwB,CAAC,OAAO,KAAK,CAAC,CAAA;AACrE,UAAU,yBACR,SAAQ,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,EACpC,uBAAuB;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,wBAAwB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IAC7D,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;CACtC;AAmHD,KAAK,kBAAkB,GAAG,KAAK,CAAC,wBAAwB,CAAC,OAAO,KAAK,CAAC,CAAA;AACtE,UAAU,oBAAqB,SAAQ,kBAAkB;IACvD,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AA4GD,KAAK,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;AAC3D,KAAK,SAAS,GAAG,KAAK,GAAG,KAAK,CAAA;AAE9B,UAAU,uBAAuB;IAC/B;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB;;OAEG;IACH,GAAG,CAAC,EAAE,SAAS,CAAA;IACf;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAiBD,UAAU,qBAAsB,SAAQ,yBAAyB;CAAG;AAIpE,QAAA,MAAM,gBAAgB;;;;;;CAqBrB,CAAA;AAoDD,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAE3B,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,CAAA"}
|