@tamagui/toggle-group 1.31.0 → 1.31.2
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/ToggleGroup.js +28 -11
- package/dist/cjs/ToggleGroup.js.map +1 -1
- package/dist/esm/ToggleGroup.js +28 -11
- package/dist/esm/ToggleGroup.js.map +1 -1
- package/dist/jsx/ToggleGroup.js +19 -9
- package/dist/jsx/ToggleGroup.js.map +1 -1
- package/dist/jsx/ToggleGroup.mjs +19 -9
- package/dist/jsx/ToggleGroup.mjs.map +1 -1
- package/package.json +13 -13
- package/src/ToggleGroup.tsx +30 -18
- package/types/ToggleGroup.d.ts +1 -1
- package/types/ToggleGroup.d.ts.map +1 -1
package/dist/cjs/ToggleGroup.js
CHANGED
|
@@ -72,15 +72,17 @@ const ToggleGroupItem = import_Toggle.ToggleFrame.extractable(
|
|
|
72
72
|
const ref = import_react.default.useRef(null);
|
|
73
73
|
const groupItemProps = (0, import_group.useGroupItem)({ disabled });
|
|
74
74
|
const size = props.size ?? context.size;
|
|
75
|
-
const sizeProps = {
|
|
75
|
+
const sizeProps = props.unstyled ? {} : {
|
|
76
76
|
width: void 0,
|
|
77
77
|
height: void 0,
|
|
78
78
|
padding: (0, import_web.getVariableValue)(size) * 0.6
|
|
79
79
|
};
|
|
80
|
-
if (props.
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
80
|
+
if (!props.unstyled) {
|
|
81
|
+
if (props.orientation === "horizontal") {
|
|
82
|
+
sizeProps.height = (0, import_web.getVariableValue)(size) * 2.4;
|
|
83
|
+
} else {
|
|
84
|
+
sizeProps.width = (0, import_web.getVariableValue)(size) * 2.4;
|
|
85
|
+
}
|
|
84
86
|
}
|
|
85
87
|
const iconSize = (typeof size === "number" ? size * 0.7 : (0, import_font_size.getFontSize)(size)) * 1.2;
|
|
86
88
|
const theme = (0, import_web.useTheme)();
|
|
@@ -96,23 +98,38 @@ const ToggleGroupItem = import_Toggle.ToggleFrame.extractable(
|
|
|
96
98
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToggleGroupItemProvider, { scope: __scopeToggleGroup, children: context.rovingFocus ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
97
99
|
import_roving_focus.RovingFocusGroup.Item,
|
|
98
100
|
{
|
|
99
|
-
asChild:
|
|
101
|
+
asChild: "except-style",
|
|
100
102
|
...rovingFocusGroupScope,
|
|
101
103
|
focusable: !disabled,
|
|
102
104
|
active: pressed,
|
|
103
105
|
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
104
106
|
import_Toggle.ToggleFrame,
|
|
105
107
|
{
|
|
106
|
-
asChild:
|
|
108
|
+
asChild: "except-style",
|
|
107
109
|
focusable: !disabled,
|
|
108
110
|
disabled,
|
|
109
111
|
ref,
|
|
110
|
-
|
|
111
|
-
|
|
112
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
113
|
+
ToggleGroupItemImpl,
|
|
114
|
+
{
|
|
115
|
+
...commonProps,
|
|
116
|
+
ref: forwardedRef,
|
|
117
|
+
...groupItemProps
|
|
118
|
+
}
|
|
119
|
+
)
|
|
112
120
|
}
|
|
113
121
|
)
|
|
114
122
|
}
|
|
115
|
-
) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
123
|
+
) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
124
|
+
import_Toggle.ToggleFrame,
|
|
125
|
+
{
|
|
126
|
+
asChild: "except-style",
|
|
127
|
+
focusable: !disabled,
|
|
128
|
+
disabled,
|
|
129
|
+
ref,
|
|
130
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToggleGroupItemImpl, { ...commonProps, ref: forwardedRef })
|
|
131
|
+
}
|
|
132
|
+
) });
|
|
116
133
|
}
|
|
117
134
|
)
|
|
118
135
|
);
|
|
@@ -306,7 +323,7 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
|
|
|
306
323
|
children: rovingFocus ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
307
324
|
import_roving_focus.RovingFocusGroup,
|
|
308
325
|
{
|
|
309
|
-
asChild:
|
|
326
|
+
asChild: "except-style",
|
|
310
327
|
...rovingFocusGroupScope,
|
|
311
328
|
orientation,
|
|
312
329
|
dir: direction,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/ToggleGroup.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["React", "value"]
|
|
6
6
|
}
|
package/dist/esm/ToggleGroup.js
CHANGED
|
@@ -44,15 +44,17 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
44
44
|
const ref = React.useRef(null);
|
|
45
45
|
const groupItemProps = useGroupItem({ disabled });
|
|
46
46
|
const size = props.size ?? context.size;
|
|
47
|
-
const sizeProps = {
|
|
47
|
+
const sizeProps = props.unstyled ? {} : {
|
|
48
48
|
width: void 0,
|
|
49
49
|
height: void 0,
|
|
50
50
|
padding: getVariableValue(size) * 0.6
|
|
51
51
|
};
|
|
52
|
-
if (props.
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
52
|
+
if (!props.unstyled) {
|
|
53
|
+
if (props.orientation === "horizontal") {
|
|
54
|
+
sizeProps.height = getVariableValue(size) * 2.4;
|
|
55
|
+
} else {
|
|
56
|
+
sizeProps.width = getVariableValue(size) * 2.4;
|
|
57
|
+
}
|
|
56
58
|
}
|
|
57
59
|
const iconSize = (typeof size === "number" ? size * 0.7 : getFontSize(size)) * 1.2;
|
|
58
60
|
const theme = useTheme();
|
|
@@ -68,23 +70,38 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
68
70
|
return /* @__PURE__ */ jsx(ToggleGroupItemProvider, { scope: __scopeToggleGroup, children: context.rovingFocus ? /* @__PURE__ */ jsx(
|
|
69
71
|
RovingFocusGroup.Item,
|
|
70
72
|
{
|
|
71
|
-
asChild:
|
|
73
|
+
asChild: "except-style",
|
|
72
74
|
...rovingFocusGroupScope,
|
|
73
75
|
focusable: !disabled,
|
|
74
76
|
active: pressed,
|
|
75
77
|
children: /* @__PURE__ */ jsx(
|
|
76
78
|
ToggleFrame,
|
|
77
79
|
{
|
|
78
|
-
asChild:
|
|
80
|
+
asChild: "except-style",
|
|
79
81
|
focusable: !disabled,
|
|
80
82
|
disabled,
|
|
81
83
|
ref,
|
|
82
|
-
|
|
83
|
-
|
|
84
|
+
children: /* @__PURE__ */ jsx(
|
|
85
|
+
ToggleGroupItemImpl,
|
|
86
|
+
{
|
|
87
|
+
...commonProps,
|
|
88
|
+
ref: forwardedRef,
|
|
89
|
+
...groupItemProps
|
|
90
|
+
}
|
|
91
|
+
)
|
|
84
92
|
}
|
|
85
93
|
)
|
|
86
94
|
}
|
|
87
|
-
) : /* @__PURE__ */ jsx(
|
|
95
|
+
) : /* @__PURE__ */ jsx(
|
|
96
|
+
ToggleFrame,
|
|
97
|
+
{
|
|
98
|
+
asChild: "except-style",
|
|
99
|
+
focusable: !disabled,
|
|
100
|
+
disabled,
|
|
101
|
+
ref,
|
|
102
|
+
children: /* @__PURE__ */ jsx(ToggleGroupItemImpl, { ...commonProps, ref: forwardedRef })
|
|
103
|
+
}
|
|
104
|
+
) });
|
|
88
105
|
}
|
|
89
106
|
)
|
|
90
107
|
);
|
|
@@ -278,7 +295,7 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
|
|
|
278
295
|
children: rovingFocus ? /* @__PURE__ */ jsx(
|
|
279
296
|
RovingFocusGroup,
|
|
280
297
|
{
|
|
281
|
-
asChild:
|
|
298
|
+
asChild: "except-style",
|
|
282
299
|
...rovingFocusGroupScope,
|
|
283
300
|
orientation,
|
|
284
301
|
dir: direction,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/ToggleGroup.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["value"]
|
|
6
6
|
}
|
package/dist/jsx/ToggleGroup.js
CHANGED
|
@@ -43,15 +43,17 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
43
43
|
const ref = React.useRef(null);
|
|
44
44
|
const groupItemProps = useGroupItem({ disabled });
|
|
45
45
|
const size = props.size ?? context.size;
|
|
46
|
-
const sizeProps = {
|
|
46
|
+
const sizeProps = props.unstyled ? {} : {
|
|
47
47
|
width: void 0,
|
|
48
48
|
height: void 0,
|
|
49
49
|
padding: getVariableValue(size) * 0.6
|
|
50
50
|
};
|
|
51
|
-
if (props.
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
if (!props.unstyled) {
|
|
52
|
+
if (props.orientation === "horizontal") {
|
|
53
|
+
sizeProps.height = getVariableValue(size) * 2.4;
|
|
54
|
+
} else {
|
|
55
|
+
sizeProps.width = getVariableValue(size) * 2.4;
|
|
56
|
+
}
|
|
55
57
|
}
|
|
56
58
|
const iconSize = (typeof size === "number" ? size * 0.7 : getFontSize(size)) * 1.2;
|
|
57
59
|
const theme = useTheme();
|
|
@@ -65,17 +67,25 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
65
67
|
});
|
|
66
68
|
const commonProps = { ...props, pressed, disabled, ...sizeProps, children };
|
|
67
69
|
return <ToggleGroupItemProvider scope={__scopeToggleGroup}>{context.rovingFocus ? <RovingFocusGroup.Item
|
|
68
|
-
asChild
|
|
70
|
+
asChild="except-style"
|
|
69
71
|
{...rovingFocusGroupScope}
|
|
70
72
|
focusable={!disabled}
|
|
71
73
|
active={pressed}
|
|
72
74
|
><ToggleFrame
|
|
73
|
-
asChild
|
|
75
|
+
asChild="except-style"
|
|
74
76
|
focusable={!disabled}
|
|
75
77
|
disabled={disabled}
|
|
76
78
|
ref={ref}
|
|
79
|
+
><ToggleGroupItemImpl
|
|
80
|
+
{...commonProps}
|
|
81
|
+
ref={forwardedRef}
|
|
77
82
|
{...groupItemProps}
|
|
78
|
-
|
|
83
|
+
/></ToggleFrame></RovingFocusGroup.Item> : <ToggleFrame
|
|
84
|
+
asChild="except-style"
|
|
85
|
+
focusable={!disabled}
|
|
86
|
+
disabled={disabled}
|
|
87
|
+
ref={ref}
|
|
88
|
+
><ToggleGroupItemImpl {...commonProps} ref={forwardedRef} /></ToggleFrame>}</ToggleGroupItemProvider>;
|
|
79
89
|
}
|
|
80
90
|
)
|
|
81
91
|
);
|
|
@@ -254,7 +264,7 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
|
|
|
254
264
|
disabled={disabled}
|
|
255
265
|
size={size}
|
|
256
266
|
>{rovingFocus ? <RovingFocusGroup
|
|
257
|
-
asChild
|
|
267
|
+
asChild="except-style"
|
|
258
268
|
{...rovingFocusGroupScope}
|
|
259
269
|
orientation={orientation}
|
|
260
270
|
dir={direction}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/ToggleGroup.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAgB,0BAA0B;AAC1C,SAAS,yBAAyB;AAClC,SAAS,mBAAmB;AAC5B,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["value"]
|
|
6
6
|
}
|
package/dist/jsx/ToggleGroup.mjs
CHANGED
|
@@ -43,15 +43,17 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
43
43
|
const ref = React.useRef(null);
|
|
44
44
|
const groupItemProps = useGroupItem({ disabled });
|
|
45
45
|
const size = props.size ?? context.size;
|
|
46
|
-
const sizeProps = {
|
|
46
|
+
const sizeProps = props.unstyled ? {} : {
|
|
47
47
|
width: void 0,
|
|
48
48
|
height: void 0,
|
|
49
49
|
padding: getVariableValue(size) * 0.6
|
|
50
50
|
};
|
|
51
|
-
if (props.
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
if (!props.unstyled) {
|
|
52
|
+
if (props.orientation === "horizontal") {
|
|
53
|
+
sizeProps.height = getVariableValue(size) * 2.4;
|
|
54
|
+
} else {
|
|
55
|
+
sizeProps.width = getVariableValue(size) * 2.4;
|
|
56
|
+
}
|
|
55
57
|
}
|
|
56
58
|
const iconSize = (typeof size === "number" ? size * 0.7 : getFontSize(size)) * 1.2;
|
|
57
59
|
const theme = useTheme();
|
|
@@ -65,17 +67,25 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
65
67
|
});
|
|
66
68
|
const commonProps = { ...props, pressed, disabled, ...sizeProps, children };
|
|
67
69
|
return <ToggleGroupItemProvider scope={__scopeToggleGroup}>{context.rovingFocus ? <RovingFocusGroup.Item
|
|
68
|
-
asChild
|
|
70
|
+
asChild="except-style"
|
|
69
71
|
{...rovingFocusGroupScope}
|
|
70
72
|
focusable={!disabled}
|
|
71
73
|
active={pressed}
|
|
72
74
|
><ToggleFrame
|
|
73
|
-
asChild
|
|
75
|
+
asChild="except-style"
|
|
74
76
|
focusable={!disabled}
|
|
75
77
|
disabled={disabled}
|
|
76
78
|
ref={ref}
|
|
79
|
+
><ToggleGroupItemImpl
|
|
80
|
+
{...commonProps}
|
|
81
|
+
ref={forwardedRef}
|
|
77
82
|
{...groupItemProps}
|
|
78
|
-
|
|
83
|
+
/></ToggleFrame></RovingFocusGroup.Item> : <ToggleFrame
|
|
84
|
+
asChild="except-style"
|
|
85
|
+
focusable={!disabled}
|
|
86
|
+
disabled={disabled}
|
|
87
|
+
ref={ref}
|
|
88
|
+
><ToggleGroupItemImpl {...commonProps} ref={forwardedRef} /></ToggleFrame>}</ToggleGroupItemProvider>;
|
|
79
89
|
}
|
|
80
90
|
)
|
|
81
91
|
);
|
|
@@ -254,7 +264,7 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
|
|
|
254
264
|
disabled={disabled}
|
|
255
265
|
size={size}
|
|
256
266
|
>{rovingFocus ? <RovingFocusGroup
|
|
257
|
-
asChild
|
|
267
|
+
asChild="except-style"
|
|
258
268
|
{...rovingFocusGroupScope}
|
|
259
269
|
orientation={orientation}
|
|
260
270
|
dir={direction}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/ToggleGroup.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAgB,0BAA0B;AAC1C,SAAS,yBAAyB;AAClC,SAAS,mBAAmB;AAC5B,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["value"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/toggle-group",
|
|
3
|
-
"version": "1.31.
|
|
3
|
+
"version": "1.31.2",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -31,23 +31,23 @@
|
|
|
31
31
|
}
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@tamagui/create-context": "1.31.
|
|
35
|
-
"@tamagui/focusable": "1.31.
|
|
36
|
-
"@tamagui/font-size": "1.31.
|
|
37
|
-
"@tamagui/get-token": "1.31.
|
|
38
|
-
"@tamagui/group": "1.31.
|
|
39
|
-
"@tamagui/helpers-tamagui": "1.31.
|
|
40
|
-
"@tamagui/roving-focus": "1.31.
|
|
41
|
-
"@tamagui/stacks": "1.31.
|
|
42
|
-
"@tamagui/use-controllable-state": "1.31.
|
|
43
|
-
"@tamagui/use-direction": "1.31.
|
|
44
|
-
"@tamagui/web": "1.31.
|
|
34
|
+
"@tamagui/create-context": "1.31.2",
|
|
35
|
+
"@tamagui/focusable": "1.31.2",
|
|
36
|
+
"@tamagui/font-size": "1.31.2",
|
|
37
|
+
"@tamagui/get-token": "1.31.2",
|
|
38
|
+
"@tamagui/group": "1.31.2",
|
|
39
|
+
"@tamagui/helpers-tamagui": "1.31.2",
|
|
40
|
+
"@tamagui/roving-focus": "1.31.2",
|
|
41
|
+
"@tamagui/stacks": "1.31.2",
|
|
42
|
+
"@tamagui/use-controllable-state": "1.31.2",
|
|
43
|
+
"@tamagui/use-direction": "1.31.2",
|
|
44
|
+
"@tamagui/web": "1.31.2"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"react": "*"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@tamagui/build": "1.31.
|
|
50
|
+
"@tamagui/build": "1.31.2",
|
|
51
51
|
"react": "^18.2.0"
|
|
52
52
|
},
|
|
53
53
|
"publishConfig": {
|
package/src/ToggleGroup.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Scope, createContextScope } from '@tamagui/create-context'
|
|
2
2
|
import { registerFocusable } from '@tamagui/focusable'
|
|
3
3
|
import { getFontSize } from '@tamagui/font-size'
|
|
4
|
-
import { getSize
|
|
4
|
+
import { getSize } from '@tamagui/get-token'
|
|
5
5
|
import { Group, GroupProps, useGroupItem } from '@tamagui/group'
|
|
6
6
|
import { useGetThemedIcon } from '@tamagui/helpers-tamagui'
|
|
7
7
|
import { RovingFocusGroup, createRovingFocusGroupScope } from '@tamagui/roving-focus'
|
|
@@ -70,16 +70,20 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
70
70
|
const groupItemProps = useGroupItem({ disabled })
|
|
71
71
|
const size = props.size ?? context.size
|
|
72
72
|
|
|
73
|
-
const sizeProps: Record<string, any> =
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
73
|
+
const sizeProps: Record<string, any> = props.unstyled
|
|
74
|
+
? {}
|
|
75
|
+
: {
|
|
76
|
+
width: undefined,
|
|
77
|
+
height: undefined,
|
|
78
|
+
padding: getVariableValue(size) * 0.6,
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
if (!props.unstyled) {
|
|
82
|
+
if (props.orientation === 'horizontal') {
|
|
83
|
+
sizeProps.height = getVariableValue(size) * 2.4
|
|
84
|
+
} else {
|
|
85
|
+
sizeProps.width = getVariableValue(size) * 2.4
|
|
86
|
+
}
|
|
83
87
|
}
|
|
84
88
|
|
|
85
89
|
const iconSize = (typeof size === 'number' ? size * 0.7 : getFontSize(size)) * 1.2
|
|
@@ -101,23 +105,31 @@ const ToggleGroupItem = ToggleFrame.extractable(
|
|
|
101
105
|
<ToggleGroupItemProvider scope={__scopeToggleGroup}>
|
|
102
106
|
{context.rovingFocus ? (
|
|
103
107
|
<RovingFocusGroup.Item
|
|
104
|
-
asChild
|
|
108
|
+
asChild="except-style"
|
|
105
109
|
{...rovingFocusGroupScope}
|
|
106
110
|
focusable={!disabled}
|
|
107
111
|
active={pressed}
|
|
108
112
|
>
|
|
109
113
|
<ToggleFrame
|
|
110
|
-
asChild
|
|
114
|
+
asChild="except-style"
|
|
111
115
|
focusable={!disabled}
|
|
112
116
|
disabled={disabled}
|
|
113
117
|
ref={ref}
|
|
114
|
-
{...groupItemProps}
|
|
115
118
|
>
|
|
116
|
-
<ToggleGroupItemImpl
|
|
119
|
+
<ToggleGroupItemImpl
|
|
120
|
+
{...commonProps}
|
|
121
|
+
ref={forwardedRef}
|
|
122
|
+
{...groupItemProps}
|
|
123
|
+
/>
|
|
117
124
|
</ToggleFrame>
|
|
118
125
|
</RovingFocusGroup.Item>
|
|
119
126
|
) : (
|
|
120
|
-
<ToggleFrame
|
|
127
|
+
<ToggleFrame
|
|
128
|
+
asChild="except-style"
|
|
129
|
+
focusable={!disabled}
|
|
130
|
+
disabled={disabled}
|
|
131
|
+
ref={ref}
|
|
132
|
+
>
|
|
121
133
|
<ToggleGroupItemImpl {...commonProps} ref={forwardedRef} />
|
|
122
134
|
</ToggleFrame>
|
|
123
135
|
)}
|
|
@@ -446,7 +458,7 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
|
|
|
446
458
|
>
|
|
447
459
|
{rovingFocus ? (
|
|
448
460
|
<RovingFocusGroup
|
|
449
|
-
asChild
|
|
461
|
+
asChild="except-style"
|
|
450
462
|
{...rovingFocusGroupScope}
|
|
451
463
|
orientation={orientation}
|
|
452
464
|
dir={direction}
|
|
@@ -482,6 +494,6 @@ export { ToggleGroup, createToggleGroupScope }
|
|
|
482
494
|
export type {
|
|
483
495
|
ToggleGroupItemProps,
|
|
484
496
|
ToggleGroupMultipleProps,
|
|
485
|
-
ToggleGroupSingleProps,
|
|
486
497
|
ToggleGroupProps,
|
|
498
|
+
ToggleGroupSingleProps,
|
|
487
499
|
}
|
package/types/ToggleGroup.d.ts
CHANGED
|
@@ -571,5 +571,5 @@ type ToggleGroupImplProps = GetProps<typeof ToggleGroupImplElementFrame> & Group
|
|
|
571
571
|
sizeAdjust?: number;
|
|
572
572
|
};
|
|
573
573
|
export { ToggleGroup, createToggleGroupScope };
|
|
574
|
-
export type { ToggleGroupItemProps, ToggleGroupMultipleProps,
|
|
574
|
+
export type { ToggleGroupItemProps, ToggleGroupMultipleProps, ToggleGroupProps, ToggleGroupSingleProps, };
|
|
575
575
|
//# sourceMappingURL=ToggleGroup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToggleGroup.d.ts","sourceRoot":"","sources":["../src/ToggleGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAsB,MAAM,yBAAyB,CAAA;AAInE,OAAO,EAAS,UAAU,EAAgB,MAAM,gBAAgB,CAAA;AAEhE,OAAO,EAAE,gBAAgB,EAA+B,MAAM,uBAAuB,CAAA;AAGrF,OAAO,EACL,QAAQ,EACR,UAAU,EAMX,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAU,WAAW,EAAe,MAAM,UAAU,CAAA;AAG3D,QAAA,MAAiC,sBAAsB,+CAGtD,CAAA;AAiBD,KAAK,oBAAoB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,GAAG;IACzD,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;
|
|
1
|
+
{"version":3,"file":"ToggleGroup.d.ts","sourceRoot":"","sources":["../src/ToggleGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAsB,MAAM,yBAAyB,CAAA;AAInE,OAAO,EAAS,UAAU,EAAgB,MAAM,gBAAgB,CAAA;AAEhE,OAAO,EAAE,gBAAgB,EAA+B,MAAM,uBAAuB,CAAA;AAGrF,OAAO,EACL,QAAQ,EACR,UAAU,EAMX,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAU,WAAW,EAAe,MAAM,UAAU,CAAA;AAG3D,QAAA,MAAiC,sBAAsB,+CAGtD,CAAA;AAiBD,KAAK,oBAAoB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,GAAG;IACzD,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAkJD,UAAU,sBAAuB,SAAQ,0BAA0B;IACjE,IAAI,EAAE,QAAQ,CAAA;CACf;AACD,UAAU,wBAAyB,SAAQ,4BAA4B;IACrE,IAAI,EAAE,UAAU,CAAA;CACjB;AAED,KAAK,gBAAgB,GAAG,sBAAsB,GAAG,wBAAwB,CAAA;AAEzE,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAnKR,MAAM;;;;QAIb;;WAEG;;;CA4LJ,CAAA;AAkBD,UAAU,0BAA2B,SAAQ,oBAAoB;IAC/D;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;OAEG;IACH,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACnC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAsCD,UAAU,4BAA6B,SAAQ,oBAAoB;IACjE;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB;;OAEG;IACH,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CACtC;AAyDD,KAAK,qBAAqB,GAAG,KAAK,CAAC,wBAAwB,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAIpF,QAAA,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyB/B,CAAA;AAEF,KAAK,oBAAoB,GAAG,QAAQ,CAAC,OAAO,2BAA2B,CAAC,GACtE,UAAU,GAAG;IACX,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,GAAG,CAAC,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAA;IAClC,IAAI,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAwEH,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAA;AAC9C,YAAY,EACV,oBAAoB,EACpB,wBAAwB,EACxB,gBAAgB,EAChB,sBAAsB,GACvB,CAAA"}
|