@tamagui/group 1.125.25 → 1.125.27

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.
@@ -109,9 +109,7 @@ function createGroup(verticalDefault) {
109
109
  }),
110
110
  props2 = {
111
111
  disabled,
112
- ...((0, import_core.isTamaguiElement)(child) ? radiusStyles : {
113
- style: radiusStyles
114
- })
112
+ ...radiusStyles
115
113
  };
116
114
  return cloneElementWithPropOrder(child, props2);
117
115
  }),
@@ -156,13 +154,7 @@ const GroupItem = import_react.default.forwardRef((props, _ref) => {
156
154
  groupItemProps = useGroupItem({
157
155
  disabled: import_react.default.isValidElement(children) ? children.props.disabled : void 0
158
156
  }, forcePlacement, __scopeGroup);
159
- return !import_react.default.isValidElement(children) || children.type === import_react.default.Fragment ? children : (0, import_core.isTamaguiElement)(children) ? import_react.default.cloneElement(children, groupItemProps) : import_react.default.cloneElement(children, {
160
- style: {
161
- // @ts-ignore
162
- ...children.props?.style,
163
- ...groupItemProps
164
- }
165
- });
157
+ return !import_react.default.isValidElement(children) || children.type === import_react.default.Fragment ? children : import_react.default.cloneElement(children, groupItemProps);
166
158
  }),
167
159
  useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
168
160
  const treeIndex = (0, import_useIndexedChildren.useIndex)(),
@@ -219,10 +211,10 @@ const GroupItem = import_react.default.forwardRef((props, _ref) => {
219
211
  borderBottomLeftRadius: disable !== "bottom" && disable !== "start" && (vertical && isLast || !vertical && isFirst) ? radius : 0,
220
212
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
221
213
  }),
222
- cloneElementWithPropOrder = (child, props) => {
223
- const next = (0, import_core.mergeProps)(child.props, props, (0, import_core.getConfig)().shorthands);
224
- return import_react.default.cloneElement({
225
- ...child,
226
- props: null
227
- }, next);
228
- };
214
+ cloneElementWithPropOrder = (child, props) => import_react.default.cloneElement({
215
+ ...child,
216
+ props: null
217
+ }, {
218
+ ...child.props,
219
+ ...props
220
+ });
package/dist/cjs/Group.js CHANGED
@@ -77,7 +77,7 @@ function createGroup(verticalDefault) {
77
77
  disable: disablePassBorderRadius
78
78
  }), props2 = {
79
79
  disabled,
80
- ...(0, import_core.isTamaguiElement)(child) ? radiusStyles : { style: radiusStyles }
80
+ ...radiusStyles
81
81
  };
82
82
  return cloneElementWithPropOrder(child, props2);
83
83
  }), indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)(
@@ -130,13 +130,7 @@ const GroupItem = import_react.default.forwardRef(
130
130
  forcePlacement,
131
131
  __scopeGroup
132
132
  );
133
- return !import_react.default.isValidElement(children) || children.type === import_react.default.Fragment ? children : (0, import_core.isTamaguiElement)(children) ? import_react.default.cloneElement(children, groupItemProps) : import_react.default.cloneElement(children, {
134
- style: {
135
- // @ts-ignore
136
- ...children.props?.style,
137
- ...groupItemProps
138
- }
139
- });
133
+ return !import_react.default.isValidElement(children) || children.type === import_react.default.Fragment ? children : import_react.default.cloneElement(children, groupItemProps);
140
134
  }
141
135
  ), useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
142
136
  const treeIndex = (0, import_useIndexedChildren.useIndex)(), context = useGroupContext("GroupItem", __scopeGroup);
@@ -182,8 +176,5 @@ const GroupItem = import_react.default.forwardRef(
182
176
  borderTopRightRadius: disable !== "top" && disable !== "end" && (vertical && isFirst || !vertical && isLast) ? radius : 0,
183
177
  borderBottomLeftRadius: disable !== "bottom" && disable !== "start" && (vertical && isLast || !vertical && isFirst) ? radius : 0,
184
178
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
185
- }), cloneElementWithPropOrder = (child, props) => {
186
- const next = (0, import_core.mergeProps)(child.props, props, (0, import_core.getConfig)().shorthands);
187
- return import_react.default.cloneElement({ ...child, props: null }, next);
188
- };
179
+ }), cloneElementWithPropOrder = (child, props) => import_react.default.cloneElement({ ...child, props: null }, { ...child.props, ...props });
189
180
  //# sourceMappingURL=Group.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Group.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["React", "props"]
6
6
  }
@@ -64,9 +64,7 @@ function createGroup(verticalDefault) {
64
64
  disable: disablePassBorderRadius
65
65
  }), _$props = {
66
66
  disabled,
67
- ...(0, import_core.isTamaguiElement)(child) ? radiusStyles : {
68
- style: radiusStyles
69
- }
67
+ ...radiusStyles
70
68
  };
71
69
  return cloneElementWithPropOrder(child, _$props);
72
70
  }), indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)((0, import_core.spacedChildren)({
@@ -109,15 +107,10 @@ function createGroup(verticalDefault) {
109
107
  });
110
108
  }
111
109
  var GroupItem = /* @__PURE__ */ import_react.default.forwardRef(function(props, _ref) {
112
- var _children_props, { __scopeGroup, children, forcePlacement } = props, groupItemProps = useGroupItem({
110
+ var { __scopeGroup, children, forcePlacement } = props, groupItemProps = useGroupItem({
113
111
  disabled: /* @__PURE__ */ import_react.default.isValidElement(children) ? children.props.disabled : void 0
114
112
  }, forcePlacement, __scopeGroup);
115
- return !/* @__PURE__ */ import_react.default.isValidElement(children) || children.type === import_react.default.Fragment ? children : (0, import_core.isTamaguiElement)(children) ? /* @__PURE__ */ import_react.default.cloneElement(children, groupItemProps) : /* @__PURE__ */ import_react.default.cloneElement(children, {
116
- style: {
117
- ...(_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.style,
118
- ...groupItemProps
119
- }
120
- });
113
+ return !/* @__PURE__ */ import_react.default.isValidElement(children) || children.type === import_react.default.Fragment ? children : /* @__PURE__ */ import_react.default.cloneElement(children, groupItemProps);
121
114
  }), useGroupItem = function(childrenProps, forcePlacement, __scopeGroup) {
122
115
  var treeIndex = (0, import_useIndexedChildren.useIndex)(), context = useGroupContext("GroupItem", __scopeGroup);
123
116
  if (import_react.default.useEffect(function() {
@@ -164,11 +157,13 @@ var GroupItem = /* @__PURE__ */ import_react.default.forwardRef(function(props,
164
157
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
165
158
  };
166
159
  }, cloneElementWithPropOrder = function(child, props) {
167
- var next = (0, import_core.mergeProps)(child.props, props, (0, import_core.getConfig)().shorthands);
168
160
  return /* @__PURE__ */ import_react.default.cloneElement({
169
161
  ...child,
170
162
  props: null
171
- }, next);
163
+ }, {
164
+ ...child.props,
165
+ ...props
166
+ });
172
167
  };
173
168
  // Annotate the CommonJS export names for ESM import in node:
174
169
  0 && (module.exports = {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/code/ui/group/src/Group.tsx"],
4
- "mappings": "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",
5
- "names": ["GROUP_NAME", "createGroupContext", "createGroupScope", "createContextScope", "GroupProvider", "useGroupContext", "GroupFrame", "styled", "ThemeableStack", "name", "variants", "unstyled", "false", "size", "val", "tokens", "borderRadius", "radius", "defaultVariants", "process", "env", "TAMAGUI_HEADLESS", "createGroup", "verticalDefault", "withStaticProperties", "styleable", "props", "ref", "activeProps", "useProps", "__scopeGroup", "children", "childrenProp", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabled", "disabledProp", "disablePassBorderRadius", "disablePassBorderRadiusProp", "forceUseItem", "restProps", "vertical", "itemChildrenCount", "setItemChildrenCount", "useControllableState", "defaultProp", "isUsingItems", "getVariableValue", "getTokens", "undefined", "hasRadius", "childrenArray", "React", "Children", "toArray", "filter", "isValidElement", "map", "child", "i", "type", "Fragment", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "isTamaguiElement", "style", "cloneElementWithPropOrder", "indexedChildren", "useIndexedChildren", "spacedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "_jsx", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "forwardRef", "_ref", "forcePlacement", "groupItemProps", "useGroupItem", "cloneElement", "childrenProps", "treeIndex", "useIndex", "context", "useEffect", "Error", "index", "maxIndex", "propsToPass", "Group", "YGroup", "XGroup", "showScrollIndicator", "ScrollView", "showsVerticalScrollIndicator", "horizontal", "showsHorizontalScrollIndicator", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "next", "mergeProps", "getConfig", "shorthands"]
4
+ "mappings": "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",
5
+ "names": ["GROUP_NAME", "createGroupContext", "createGroupScope", "createContextScope", "GroupProvider", "useGroupContext", "GroupFrame", "styled", "ThemeableStack", "name", "variants", "unstyled", "false", "size", "val", "tokens", "borderRadius", "radius", "defaultVariants", "process", "env", "TAMAGUI_HEADLESS", "createGroup", "verticalDefault", "withStaticProperties", "styleable", "props", "ref", "activeProps", "useProps", "__scopeGroup", "children", "childrenProp", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabled", "disabledProp", "disablePassBorderRadius", "disablePassBorderRadiusProp", "forceUseItem", "restProps", "vertical", "itemChildrenCount", "setItemChildrenCount", "useControllableState", "defaultProp", "isUsingItems", "getVariableValue", "getTokens", "undefined", "hasRadius", "childrenArray", "React", "Children", "toArray", "filter", "isValidElement", "map", "child", "i", "type", "Fragment", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "cloneElementWithPropOrder", "indexedChildren", "useIndexedChildren", "spacedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "_jsx", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "forwardRef", "_ref", "forcePlacement", "groupItemProps", "useGroupItem", "cloneElement", "childrenProps", "treeIndex", "useIndex", "context", "useEffect", "Error", "index", "maxIndex", "propsToPass", "Group", "YGroup", "XGroup", "showScrollIndicator", "ScrollView", "showsVerticalScrollIndicator", "horizontal", "showsHorizontalScrollIndicator", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius"]
6
6
  }
package/dist/esm/Group.js CHANGED
@@ -1,9 +1,6 @@
1
1
  import {
2
- getConfig,
3
2
  getTokens,
4
3
  getVariableValue,
5
- isTamaguiElement,
6
- mergeProps,
7
4
  spacedChildren,
8
5
  styled,
9
6
  useProps
@@ -63,7 +60,7 @@ function createGroup(verticalDefault) {
63
60
  disable: disablePassBorderRadius
64
61
  }), props2 = {
65
62
  disabled,
66
- ...isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }
63
+ ...radiusStyles
67
64
  };
68
65
  return cloneElementWithPropOrder(child, props2);
69
66
  }), indexedChildren = useIndexedChildren(
@@ -116,13 +113,7 @@ const GroupItem = React.forwardRef(
116
113
  forcePlacement,
117
114
  __scopeGroup
118
115
  );
119
- return !React.isValidElement(children) || children.type === React.Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
120
- style: {
121
- // @ts-ignore
122
- ...children.props?.style,
123
- ...groupItemProps
124
- }
125
- });
116
+ return !React.isValidElement(children) || children.type === React.Fragment ? children : React.cloneElement(children, groupItemProps);
126
117
  }
127
118
  ), useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
128
119
  const treeIndex = useIndex(), context = useGroupContext("GroupItem", __scopeGroup);
@@ -168,10 +159,7 @@ const GroupItem = React.forwardRef(
168
159
  borderTopRightRadius: disable !== "top" && disable !== "end" && (vertical && isFirst || !vertical && isLast) ? radius : 0,
169
160
  borderBottomLeftRadius: disable !== "bottom" && disable !== "start" && (vertical && isLast || !vertical && isFirst) ? radius : 0,
170
161
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
171
- }), cloneElementWithPropOrder = (child, props) => {
172
- const next = mergeProps(child.props, props, getConfig().shorthands);
173
- return React.cloneElement({ ...child, props: null }, next);
174
- };
162
+ }), cloneElementWithPropOrder = (child, props) => React.cloneElement({ ...child, props: null }, { ...child.props, ...props });
175
163
  export {
176
164
  Group,
177
165
  GroupFrame,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Group.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["props"]
6
6
  }
@@ -1,4 +1,4 @@
1
- import { getConfig, getTokens, getVariableValue, isTamaguiElement, mergeProps, spacedChildren, styled, useProps } from "@tamagui/core";
1
+ import { getTokens, getVariableValue, spacedChildren, styled, useProps } from "@tamagui/core";
2
2
  import { createContextScope } from "@tamagui/create-context";
3
3
  import { withStaticProperties } from "@tamagui/helpers";
4
4
  import { ThemeableStack } from "@tamagui/stacks";
@@ -69,9 +69,7 @@ function createGroup(verticalDefault) {
69
69
  }),
70
70
  props2 = {
71
71
  disabled,
72
- ...(isTamaguiElement(child) ? radiusStyles : {
73
- style: radiusStyles
74
- })
72
+ ...radiusStyles
75
73
  };
76
74
  return cloneElementWithPropOrder(child, props2);
77
75
  }),
@@ -116,13 +114,7 @@ const GroupItem = React.forwardRef((props, _ref) => {
116
114
  groupItemProps = useGroupItem({
117
115
  disabled: React.isValidElement(children) ? children.props.disabled : void 0
118
116
  }, forcePlacement, __scopeGroup);
119
- return !React.isValidElement(children) || children.type === React.Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
120
- style: {
121
- // @ts-ignore
122
- ...children.props?.style,
123
- ...groupItemProps
124
- }
125
- });
117
+ return !React.isValidElement(children) || children.type === React.Fragment ? children : React.cloneElement(children, groupItemProps);
126
118
  }),
127
119
  useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
128
120
  const treeIndex = useIndex(),
@@ -179,12 +171,12 @@ const GroupItem = React.forwardRef((props, _ref) => {
179
171
  borderBottomLeftRadius: disable !== "bottom" && disable !== "start" && (vertical && isLast || !vertical && isFirst) ? radius : 0,
180
172
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
181
173
  }),
182
- cloneElementWithPropOrder = (child, props) => {
183
- const next = mergeProps(child.props, props, getConfig().shorthands);
184
- return React.cloneElement({
185
- ...child,
186
- props: null
187
- }, next);
188
- };
174
+ cloneElementWithPropOrder = (child, props) => React.cloneElement({
175
+ ...child,
176
+ props: null
177
+ }, {
178
+ ...child.props,
179
+ ...props
180
+ });
189
181
  export { Group, GroupFrame, XGroup, YGroup, useGroupItem };
190
182
  //# sourceMappingURL=Group.mjs.map
@@ -1 +1 @@
1
- {"version":3,"names":["getConfig","getTokens","getVariableValue","isTamaguiElement","mergeProps","spacedChildren","styled","useProps","createContextScope","withStaticProperties","ThemeableStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","jsx","GROUP_NAME","createGroupContext","createGroupScope","GroupProvider","useGroupContext","GroupFrame","name","variants","unstyled","false","size","val","tokens","borderRadius","radius","$true","defaultVariants","process","env","TAMAGUI_HEADLESS","createGroup","verticalDefault","styleable","props","ref","activeProps","__scopeGroup","children","childrenProp","space","spaceDirection","separator","scrollable","axis","orientation","disabled","disabledProp","disablePassBorderRadius","disablePassBorderRadiusProp","forceUseItem","restProps","vertical","itemChildrenCount","setItemChildrenCount","defaultProp","isUsingItems","childrenArray","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","props2","style","cloneElementWithPropOrder","indexedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","_ref","forcePlacement","groupItemProps","useGroupItem","cloneElement","childrenProps","treeIndex","context","useEffect","Error","index","maxIndex","propsToPass","Group","YGroup","XGroup","showScrollIndicator","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","next","shorthands"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getTokens","getVariableValue","spacedChildren","styled","useProps","createContextScope","withStaticProperties","ThemeableStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","jsx","GROUP_NAME","createGroupContext","createGroupScope","GroupProvider","useGroupContext","GroupFrame","name","variants","unstyled","false","size","val","tokens","borderRadius","radius","$true","defaultVariants","process","env","TAMAGUI_HEADLESS","createGroup","verticalDefault","styleable","props","ref","activeProps","__scopeGroup","children","childrenProp","space","spaceDirection","separator","scrollable","axis","orientation","disabled","disabledProp","disablePassBorderRadius","disablePassBorderRadiusProp","forceUseItem","restProps","vertical","itemChildrenCount","setItemChildrenCount","defaultProp","isUsingItems","childrenArray","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","props2","cloneElementWithPropOrder","indexedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","_ref","forcePlacement","groupItemProps","useGroupItem","cloneElement","childrenProps","treeIndex","context","useEffect","Error","index","maxIndex","propsToPass","Group","YGroup","XGroup","showScrollIndicator","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,5 +1,5 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- import { getConfig, getTokens, getVariableValue, isTamaguiElement, mergeProps, spacedChildren, styled, useProps } from "@tamagui/core";
2
+ import { getTokens, getVariableValue, spacedChildren, styled, useProps } from "@tamagui/core";
3
3
  import { createContextScope } from "@tamagui/create-context";
4
4
  import { withStaticProperties } from "@tamagui/helpers";
5
5
  import { ThemeableStack } from "@tamagui/stacks";
@@ -77,9 +77,7 @@ function createGroup(verticalDefault) {
77
77
  }),
78
78
  _$props = {
79
79
  disabled,
80
- ...(isTamaguiElement(child) ? radiusStyles : {
81
- style: radiusStyles
82
- })
80
+ ...radiusStyles
83
81
  };
84
82
  return cloneElementWithPropOrder(child, _$props);
85
83
  }),
@@ -125,8 +123,7 @@ function createGroup(verticalDefault) {
125
123
  });
126
124
  }
127
125
  var GroupItem = /* @__PURE__ */React.forwardRef(function (props, _ref) {
128
- var _children_props,
129
- {
126
+ var {
130
127
  __scopeGroup,
131
128
  children,
132
129
  forcePlacement
@@ -134,12 +131,7 @@ var GroupItem = /* @__PURE__ */React.forwardRef(function (props, _ref) {
134
131
  groupItemProps = useGroupItem({
135
132
  disabled: /* @__PURE__ */React.isValidElement(children) ? children.props.disabled : void 0
136
133
  }, forcePlacement, __scopeGroup);
137
- return ! /* @__PURE__ */React.isValidElement(children) || children.type === React.Fragment ? children : isTamaguiElement(children) ? /* @__PURE__ */React.cloneElement(children, groupItemProps) : /* @__PURE__ */React.cloneElement(children, {
138
- style: {
139
- ...((_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.style),
140
- ...groupItemProps
141
- }
142
- });
134
+ return ! /* @__PURE__ */React.isValidElement(children) || children.type === React.Fragment ? children : /* @__PURE__ */React.cloneElement(children, groupItemProps);
143
135
  }),
144
136
  useGroupItem = function (childrenProps, forcePlacement, __scopeGroup) {
145
137
  var treeIndex = useIndex(),
@@ -207,11 +199,13 @@ var GroupItem = /* @__PURE__ */React.forwardRef(function (props, _ref) {
207
199
  };
208
200
  },
209
201
  cloneElementWithPropOrder = function (child, props) {
210
- var next = mergeProps(child.props, props, getConfig().shorthands);
211
202
  return /* @__PURE__ */React.cloneElement({
212
203
  ...child,
213
204
  props: null
214
- }, next);
205
+ }, {
206
+ ...child.props,
207
+ ...props
208
+ });
215
209
  };
216
210
  export { Group, GroupFrame, XGroup, YGroup, useGroupItem };
217
211
  //# sourceMappingURL=Group.native.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["jsx","_jsx","getConfig","getTokens","getVariableValue","isTamaguiElement","mergeProps","spacedChildren","styled","useProps","createContextScope","withStaticProperties","ThemeableStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","GROUP_NAME","createGroupContext","createGroupScope","GroupProvider","useGroupContext","GroupFrame","name","variants","unstyled","false","size","val","param","tokens","_tokens_radius_val","_ref","borderRadius","radius","$true","defaultVariants","process","env","TAMAGUI_HEADLESS","createGroup","verticalDefault","styleable","props","ref","activeProps","__scopeGroup","children","childrenProp","space","spaceDirection","separator","scrollable","axis","orientation","disabled","disabledProp","disablePassBorderRadius","disablePassBorderRadiusProp","forceUseItem","restProps","vertical","itemChildrenCount","setItemChildrenCount","defaultProp","isUsingItems","hasRadius","childrenArray","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","_child_props_disabled","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","_$props","style","cloneElementWithPropOrder","indexedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","_children_props","forcePlacement","groupItemProps","useGroupItem","cloneElement","childrenProps","treeIndex","context","useEffect","Error","index","maxIndex","_childrenProps_disabled","propsToPass","Group","YGroup","XGroup","showScrollIndicator","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","next","shorthands"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["jsx","_jsx","getTokens","getVariableValue","spacedChildren","styled","useProps","createContextScope","withStaticProperties","ThemeableStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","GROUP_NAME","createGroupContext","createGroupScope","GroupProvider","useGroupContext","GroupFrame","name","variants","unstyled","false","size","val","param","tokens","_tokens_radius_val","_ref","borderRadius","radius","$true","defaultVariants","process","env","TAMAGUI_HEADLESS","createGroup","verticalDefault","styleable","props","ref","activeProps","__scopeGroup","children","childrenProp","space","spaceDirection","separator","scrollable","axis","orientation","disabled","disabledProp","disablePassBorderRadius","disablePassBorderRadiusProp","forceUseItem","restProps","vertical","itemChildrenCount","setItemChildrenCount","defaultProp","isUsingItems","hasRadius","childrenArray","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","_child_props_disabled","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","_$props","cloneElementWithPropOrder","indexedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","forcePlacement","groupItemProps","useGroupItem","cloneElement","childrenProps","treeIndex","context","useEffect","Error","index","maxIndex","_childrenProps_disabled","propsToPass","Group","YGroup","XGroup","showScrollIndicator","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/dist/jsx/Group.js CHANGED
@@ -1,9 +1,6 @@
1
1
  import {
2
- getConfig,
3
2
  getTokens,
4
3
  getVariableValue,
5
- isTamaguiElement,
6
- mergeProps,
7
4
  spacedChildren,
8
5
  styled,
9
6
  useProps
@@ -63,7 +60,7 @@ function createGroup(verticalDefault) {
63
60
  disable: disablePassBorderRadius
64
61
  }), props2 = {
65
62
  disabled,
66
- ...isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }
63
+ ...radiusStyles
67
64
  };
68
65
  return cloneElementWithPropOrder(child, props2);
69
66
  }), indexedChildren = useIndexedChildren(
@@ -116,13 +113,7 @@ const GroupItem = React.forwardRef(
116
113
  forcePlacement,
117
114
  __scopeGroup
118
115
  );
119
- return !React.isValidElement(children) || children.type === React.Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
120
- style: {
121
- // @ts-ignore
122
- ...children.props?.style,
123
- ...groupItemProps
124
- }
125
- });
116
+ return !React.isValidElement(children) || children.type === React.Fragment ? children : React.cloneElement(children, groupItemProps);
126
117
  }
127
118
  ), useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
128
119
  const treeIndex = useIndex(), context = useGroupContext("GroupItem", __scopeGroup);
@@ -168,10 +159,7 @@ const GroupItem = React.forwardRef(
168
159
  borderTopRightRadius: disable !== "top" && disable !== "end" && (vertical && isFirst || !vertical && isLast) ? radius : 0,
169
160
  borderBottomLeftRadius: disable !== "bottom" && disable !== "start" && (vertical && isLast || !vertical && isFirst) ? radius : 0,
170
161
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
171
- }), cloneElementWithPropOrder = (child, props) => {
172
- const next = mergeProps(child.props, props, getConfig().shorthands);
173
- return React.cloneElement({ ...child, props: null }, next);
174
- };
162
+ }), cloneElementWithPropOrder = (child, props) => React.cloneElement({ ...child, props: null }, { ...child.props, ...props });
175
163
  export {
176
164
  Group,
177
165
  GroupFrame,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Group.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["props"]
6
6
  }
@@ -1,4 +1,4 @@
1
- import { getConfig, getTokens, getVariableValue, isTamaguiElement, mergeProps, spacedChildren, styled, useProps } from "@tamagui/core";
1
+ import { getTokens, getVariableValue, spacedChildren, styled, useProps } from "@tamagui/core";
2
2
  import { createContextScope } from "@tamagui/create-context";
3
3
  import { withStaticProperties } from "@tamagui/helpers";
4
4
  import { ThemeableStack } from "@tamagui/stacks";
@@ -69,9 +69,7 @@ function createGroup(verticalDefault) {
69
69
  }),
70
70
  props2 = {
71
71
  disabled,
72
- ...(isTamaguiElement(child) ? radiusStyles : {
73
- style: radiusStyles
74
- })
72
+ ...radiusStyles
75
73
  };
76
74
  return cloneElementWithPropOrder(child, props2);
77
75
  }),
@@ -116,13 +114,7 @@ const GroupItem = React.forwardRef((props, _ref) => {
116
114
  groupItemProps = useGroupItem({
117
115
  disabled: React.isValidElement(children) ? children.props.disabled : void 0
118
116
  }, forcePlacement, __scopeGroup);
119
- return !React.isValidElement(children) || children.type === React.Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
120
- style: {
121
- // @ts-ignore
122
- ...children.props?.style,
123
- ...groupItemProps
124
- }
125
- });
117
+ return !React.isValidElement(children) || children.type === React.Fragment ? children : React.cloneElement(children, groupItemProps);
126
118
  }),
127
119
  useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
128
120
  const treeIndex = useIndex(),
@@ -179,12 +171,12 @@ const GroupItem = React.forwardRef((props, _ref) => {
179
171
  borderBottomLeftRadius: disable !== "bottom" && disable !== "start" && (vertical && isLast || !vertical && isFirst) ? radius : 0,
180
172
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
181
173
  }),
182
- cloneElementWithPropOrder = (child, props) => {
183
- const next = mergeProps(child.props, props, getConfig().shorthands);
184
- return React.cloneElement({
185
- ...child,
186
- props: null
187
- }, next);
188
- };
174
+ cloneElementWithPropOrder = (child, props) => React.cloneElement({
175
+ ...child,
176
+ props: null
177
+ }, {
178
+ ...child.props,
179
+ ...props
180
+ });
189
181
  export { Group, GroupFrame, XGroup, YGroup, useGroupItem };
190
182
  //# sourceMappingURL=Group.mjs.map
@@ -1 +1 @@
1
- {"version":3,"names":["getConfig","getTokens","getVariableValue","isTamaguiElement","mergeProps","spacedChildren","styled","useProps","createContextScope","withStaticProperties","ThemeableStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","jsx","GROUP_NAME","createGroupContext","createGroupScope","GroupProvider","useGroupContext","GroupFrame","name","variants","unstyled","false","size","val","tokens","borderRadius","radius","$true","defaultVariants","process","env","TAMAGUI_HEADLESS","createGroup","verticalDefault","styleable","props","ref","activeProps","__scopeGroup","children","childrenProp","space","spaceDirection","separator","scrollable","axis","orientation","disabled","disabledProp","disablePassBorderRadius","disablePassBorderRadiusProp","forceUseItem","restProps","vertical","itemChildrenCount","setItemChildrenCount","defaultProp","isUsingItems","childrenArray","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","props2","style","cloneElementWithPropOrder","indexedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","_ref","forcePlacement","groupItemProps","useGroupItem","cloneElement","childrenProps","treeIndex","context","useEffect","Error","index","maxIndex","propsToPass","Group","YGroup","XGroup","showScrollIndicator","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","next","shorthands"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getTokens","getVariableValue","spacedChildren","styled","useProps","createContextScope","withStaticProperties","ThemeableStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","jsx","GROUP_NAME","createGroupContext","createGroupScope","GroupProvider","useGroupContext","GroupFrame","name","variants","unstyled","false","size","val","tokens","borderRadius","radius","$true","defaultVariants","process","env","TAMAGUI_HEADLESS","createGroup","verticalDefault","styleable","props","ref","activeProps","__scopeGroup","children","childrenProp","space","spaceDirection","separator","scrollable","axis","orientation","disabled","disabledProp","disablePassBorderRadius","disablePassBorderRadiusProp","forceUseItem","restProps","vertical","itemChildrenCount","setItemChildrenCount","defaultProp","isUsingItems","childrenArray","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","props2","cloneElementWithPropOrder","indexedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","_ref","forcePlacement","groupItemProps","useGroupItem","cloneElement","childrenProps","treeIndex","context","useEffect","Error","index","maxIndex","propsToPass","Group","YGroup","XGroup","showScrollIndicator","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,5 +1,5 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- import { getConfig, getTokens, getVariableValue, isTamaguiElement, mergeProps, spacedChildren, styled, useProps } from "@tamagui/core";
2
+ import { getTokens, getVariableValue, spacedChildren, styled, useProps } from "@tamagui/core";
3
3
  import { createContextScope } from "@tamagui/create-context";
4
4
  import { withStaticProperties } from "@tamagui/helpers";
5
5
  import { ThemeableStack } from "@tamagui/stacks";
@@ -41,9 +41,7 @@ function createGroup(verticalDefault) {
41
41
  disable: disablePassBorderRadius
42
42
  }), _$props = {
43
43
  disabled,
44
- ...isTamaguiElement(child) ? radiusStyles : {
45
- style: radiusStyles
46
- }
44
+ ...radiusStyles
47
45
  };
48
46
  return cloneElementWithPropOrder(child, _$props);
49
47
  }), indexedChildren = useIndexedChildren(spacedChildren({
@@ -86,15 +84,10 @@ function createGroup(verticalDefault) {
86
84
  });
87
85
  }
88
86
  var GroupItem = /* @__PURE__ */ React.forwardRef(function(props, _ref) {
89
- var _children_props, { __scopeGroup, children, forcePlacement } = props, groupItemProps = useGroupItem({
87
+ var { __scopeGroup, children, forcePlacement } = props, groupItemProps = useGroupItem({
90
88
  disabled: /* @__PURE__ */ React.isValidElement(children) ? children.props.disabled : void 0
91
89
  }, forcePlacement, __scopeGroup);
92
- return !/* @__PURE__ */ React.isValidElement(children) || children.type === React.Fragment ? children : isTamaguiElement(children) ? /* @__PURE__ */ React.cloneElement(children, groupItemProps) : /* @__PURE__ */ React.cloneElement(children, {
93
- style: {
94
- ...(_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.style,
95
- ...groupItemProps
96
- }
97
- });
90
+ return !/* @__PURE__ */ React.isValidElement(children) || children.type === React.Fragment ? children : /* @__PURE__ */ React.cloneElement(children, groupItemProps);
98
91
  }), useGroupItem = function(childrenProps, forcePlacement, __scopeGroup) {
99
92
  var treeIndex = useIndex(), context = useGroupContext("GroupItem", __scopeGroup);
100
93
  if (React.useEffect(function() {
@@ -141,11 +134,13 @@ var GroupItem = /* @__PURE__ */ React.forwardRef(function(props, _ref) {
141
134
  borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
142
135
  };
143
136
  }, cloneElementWithPropOrder = function(child, props) {
144
- var next = mergeProps(child.props, props, getConfig().shorthands);
145
137
  return /* @__PURE__ */ React.cloneElement({
146
138
  ...child,
147
139
  props: null
148
- }, next);
140
+ }, {
141
+ ...child.props,
142
+ ...props
143
+ });
149
144
  };
150
145
  export {
151
146
  Group,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/code/ui/group/src/Group.tsx"],
4
- "mappings": "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",
5
- "names": ["getConfig", "getTokens", "getVariableValue", "isTamaguiElement", "mergeProps", "spacedChildren", "styled", "useProps", "createContextScope", "withStaticProperties", "ThemeableStack", "useControllableState", "React", "ScrollView", "useIndex", "useIndexedChildren", "GROUP_NAME", "createGroupContext", "createGroupScope", "GroupProvider", "useGroupContext", "GroupFrame", "name", "variants", "unstyled", "false", "size", "val", "tokens", "borderRadius", "radius", "defaultVariants", "process", "env", "TAMAGUI_HEADLESS", "createGroup", "verticalDefault", "styleable", "props", "ref", "activeProps", "__scopeGroup", "children", "childrenProp", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabled", "disabledProp", "disablePassBorderRadius", "disablePassBorderRadiusProp", "forceUseItem", "restProps", "vertical", "itemChildrenCount", "setItemChildrenCount", "defaultProp", "isUsingItems", "undefined", "hasRadius", "childrenArray", "Children", "toArray", "filter", "isValidElement", "map", "child", "i", "type", "Fragment", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "style", "cloneElementWithPropOrder", "indexedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "forwardRef", "_ref", "forcePlacement", "groupItemProps", "useGroupItem", "cloneElement", "childrenProps", "treeIndex", "context", "useEffect", "Error", "index", "maxIndex", "propsToPass", "Group", "YGroup", "XGroup", "showScrollIndicator", "showsVerticalScrollIndicator", "horizontal", "showsHorizontalScrollIndicator", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "next", "shorthands"]
4
+ "mappings": "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",
5
+ "names": ["getTokens", "getVariableValue", "spacedChildren", "styled", "useProps", "createContextScope", "withStaticProperties", "ThemeableStack", "useControllableState", "React", "ScrollView", "useIndex", "useIndexedChildren", "GROUP_NAME", "createGroupContext", "createGroupScope", "GroupProvider", "useGroupContext", "GroupFrame", "name", "variants", "unstyled", "false", "size", "val", "tokens", "borderRadius", "radius", "defaultVariants", "process", "env", "TAMAGUI_HEADLESS", "createGroup", "verticalDefault", "styleable", "props", "ref", "activeProps", "__scopeGroup", "children", "childrenProp", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabled", "disabledProp", "disablePassBorderRadius", "disablePassBorderRadiusProp", "forceUseItem", "restProps", "vertical", "itemChildrenCount", "setItemChildrenCount", "defaultProp", "isUsingItems", "undefined", "hasRadius", "childrenArray", "Children", "toArray", "filter", "isValidElement", "map", "child", "i", "type", "Fragment", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "cloneElementWithPropOrder", "indexedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "forwardRef", "_ref", "forcePlacement", "groupItemProps", "useGroupItem", "cloneElement", "childrenProps", "treeIndex", "context", "useEffect", "Error", "index", "maxIndex", "propsToPass", "Group", "YGroup", "XGroup", "showScrollIndicator", "showsVerticalScrollIndicator", "horizontal", "showsHorizontalScrollIndicator", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/group",
3
- "version": "1.125.25",
3
+ "version": "1.125.27",
4
4
  "sideEffects": [
5
5
  "*.css"
6
6
  ],
@@ -36,14 +36,14 @@
36
36
  }
37
37
  },
38
38
  "dependencies": {
39
- "@tamagui/core": "1.125.25",
40
- "@tamagui/create-context": "1.125.25",
41
- "@tamagui/helpers": "1.125.25",
42
- "@tamagui/stacks": "1.125.25",
43
- "@tamagui/use-controllable-state": "1.125.25"
39
+ "@tamagui/core": "1.125.27",
40
+ "@tamagui/create-context": "1.125.27",
41
+ "@tamagui/helpers": "1.125.27",
42
+ "@tamagui/stacks": "1.125.27",
43
+ "@tamagui/use-controllable-state": "1.125.27"
44
44
  },
45
45
  "devDependencies": {
46
- "@tamagui/build": "1.125.25",
46
+ "@tamagui/build": "1.125.27",
47
47
  "react": "*"
48
48
  },
49
49
  "publishConfig": {
package/src/Group.tsx CHANGED
@@ -1,10 +1,8 @@
1
1
  import type { GetProps, UnionableString, Variable } from '@tamagui/core'
2
2
  import {
3
- getConfig,
4
3
  getTokens,
5
4
  getVariableValue,
6
5
  isTamaguiElement,
7
- mergeProps,
8
6
  spacedChildren,
9
7
  styled,
10
8
  useProps,
@@ -138,9 +136,10 @@ function createGroup(verticalDefault: boolean) {
138
136
  vertical,
139
137
  disable: disablePassBorderRadius,
140
138
  })
139
+
141
140
  const props = {
142
141
  disabled,
143
- ...(isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }),
142
+ ...radiusStyles,
144
143
  }
145
144
 
146
145
  return cloneElementWithPropOrder(child, props)
@@ -218,17 +217,7 @@ const GroupItem = React.forwardRef(
218
217
  return children as any
219
218
  }
220
219
 
221
- if (isTamaguiElement(children)) {
222
- return React.cloneElement(children, groupItemProps)
223
- }
224
-
225
- return React.cloneElement(children, {
226
- style: {
227
- // @ts-ignore
228
- ...children.props?.['style'],
229
- ...groupItemProps,
230
- },
231
- } as any)
220
+ return React.cloneElement(children, groupItemProps)
232
221
  }
233
222
  )
234
223
 
@@ -336,6 +325,5 @@ const getBorderRadius = ({
336
325
  }
337
326
 
338
327
  const cloneElementWithPropOrder = (child: any, props: Object) => {
339
- const next = mergeProps(child.props, props, getConfig().shorthands)
340
- return React.cloneElement({ ...child, props: null }, next)
328
+ return React.cloneElement({ ...child, props: null }, { ...child.props, ...props })
341
329
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../src/Group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAA6B,MAAM,eAAe,CAAA;AAWxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAKpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,KAAK,uBAAuB,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAA;AAiB3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;8CAqBrB,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IAChC,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IACvC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;IACjD;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,UAAU,CAAC,GAAG,eAAe,CAAA;AAoHtE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAA;CAC7C,CAAA;AAiCD,eAAO,MAAM,YAAY,kBACR;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,mBAC9B,cAAc,CAAC,gBAAgB,CAAC,iBAClC,KAAK,wBAuCrB,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;mBArPyB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;mBAAL,KAAK;;mBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;uBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CAqPV,CAAA;AACtC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;mBAtPwB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;mBAAL,KAAK;;mBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;uBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CAsPrB,CAAA;AAC3B,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;mBAvPwB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;mBAAL,KAAK;;mBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;uBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CAuPR,CAAA"}
1
+ {"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../src/Group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAA6B,MAAM,eAAe,CAAA;AASxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAKpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,KAAK,uBAAuB,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAA;AAiB3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;8CAqBrB,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IAChC,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IACvC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;IACjD;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,UAAU,CAAC,GAAG,eAAe,CAAA;AAqHtE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAA;CAC7C,CAAA;AAuBD,eAAO,MAAM,YAAY,GACvB,eAAe;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,EAC/C,iBAAiB,cAAc,CAAC,gBAAgB,CAAC,EACjD,eAAe,KAAK,wBAuCrB,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;mBA5OyB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;mBAAL,KAAK;;mBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;uBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CA4OV,CAAA;AACtC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;mBA7OwB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;mBAAL,KAAK;;mBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;uBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CA6OrB,CAAA;AAC3B,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;mBA9OwB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;mBAAL,KAAK;;mBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;uBAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CA8OR,CAAA"}