@tamagui/group 1.101.7 → 1.102.1
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/Group.js +3 -4
- package/dist/cjs/Group.js.map +1 -1
- package/dist/cjs/Group.native.js +3 -4
- package/dist/cjs/Group.native.js.map +2 -2
- package/dist/esm/Group.js +4 -5
- package/dist/esm/Group.js.map +1 -1
- package/dist/esm/Group.mjs +4 -5
- package/dist/esm/Group.native.js +4 -5
- package/dist/esm/Group.native.js.map +2 -2
- package/dist/jsx/Group.js +4 -5
- package/dist/jsx/Group.js.map +1 -1
- package/dist/jsx/Group.mjs +4 -5
- package/dist/jsx/Group.native.js +4 -5
- package/dist/jsx/Group.native.js.map +2 -2
- package/package.json +7 -7
- package/src/Group.tsx +3 -4
- package/types/Group.d.ts.map +1 -1
package/dist/cjs/Group.js
CHANGED
|
@@ -67,7 +67,7 @@ function createGroup(verticalDefault) {
|
|
|
67
67
|
} = activeProps, vertical = orientation === "vertical", [itemChildrenCount, setItemChildrenCount] = (0, import_use_controllable_state.useControllableState)({
|
|
68
68
|
defaultProp: forceUseItem ? 1 : 0
|
|
69
69
|
}), isUsingItems = itemChildrenCount > 0, radius = borderRadius ?? (size ? (0, import_core.getVariableValue)((0, import_core.getTokens)().radius[size]) - 1 : void 0), disablePassBorderRadius = disablePassBorderRadiusProp ?? !(radius !== void 0), childrenArray = import_react.Children.toArray(childrenProp), children = isUsingItems ? import_react.Children.toArray(childrenProp).filter(import_react.isValidElement) : childrenArray.map((child, i) => {
|
|
70
|
-
if (!(0, import_react.isValidElement)(child))
|
|
70
|
+
if (!(0, import_react.isValidElement)(child) || child.type === import_react.Fragment)
|
|
71
71
|
return child;
|
|
72
72
|
const disabled = child.props.disabled ?? disabledProp, isFirst = i === 0, isLast = i === childrenArray.length - 1, radiusStyles = disablePassBorderRadius === !0 ? null : getBorderRadius({
|
|
73
73
|
isFirst,
|
|
@@ -84,7 +84,6 @@ function createGroup(verticalDefault) {
|
|
|
84
84
|
(0, import_core.spacedChildren)({
|
|
85
85
|
direction: spaceDirection,
|
|
86
86
|
separator,
|
|
87
|
-
// @ts-ignore
|
|
88
87
|
space,
|
|
89
88
|
children
|
|
90
89
|
})
|
|
@@ -131,13 +130,13 @@ const GroupItem = (0, import_react.forwardRef)(
|
|
|
131
130
|
forcePlacement,
|
|
132
131
|
__scopeGroup
|
|
133
132
|
);
|
|
134
|
-
return (0, import_react.isValidElement)(children) ? (0, import_core.isTamaguiElement)(children) ? import_react.default.cloneElement(children, groupItemProps) : import_react.default.cloneElement(children, {
|
|
133
|
+
return !(0, import_react.isValidElement)(children) || children.type === import_react.Fragment ? children : (0, import_core.isTamaguiElement)(children) ? import_react.default.cloneElement(children, groupItemProps) : import_react.default.cloneElement(children, {
|
|
135
134
|
style: {
|
|
136
135
|
// @ts-ignore
|
|
137
136
|
...children.props?.style,
|
|
138
137
|
...groupItemProps
|
|
139
138
|
}
|
|
140
|
-
})
|
|
139
|
+
});
|
|
141
140
|
}
|
|
142
141
|
), useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
|
|
143
142
|
const treeIndex = (0, import_reforest.useIndex)(), context = useGroupContext("GroupItem", __scopeGroup);
|
package/dist/cjs/Group.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Group.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBASO,0BAEP,wBAAmC,oCACnC,iBAAqC,6BACrC,gBAA+B,4BAC/B,gCAAqC,4CACrC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["props", "React"]
|
|
6
6
|
}
|
package/dist/cjs/Group.native.js
CHANGED
|
@@ -161,7 +161,7 @@ function createGroup(verticalDefault) {
|
|
|
161
161
|
]), vertical = orientation === "vertical", _useControllableState = _sliced_to_array((0, import_use_controllable_state.useControllableState)({
|
|
162
162
|
defaultProp: forceUseItem ? 1 : 0
|
|
163
163
|
}), 2), itemChildrenCount = _useControllableState[0], setItemChildrenCount = _useControllableState[1], isUsingItems = itemChildrenCount > 0, radius = borderRadius ?? (size ? (0, import_core.getVariableValue)((0, import_core.getTokens)().radius[size]) - 1 : void 0), hasRadius = radius !== void 0, disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius, childrenArray = import_react.Children.toArray(childrenProp), children = isUsingItems ? import_react.Children.toArray(childrenProp).filter(import_react.isValidElement) : childrenArray.map(function(child, i) {
|
|
164
|
-
if (!/* @__PURE__ */ (0, import_react.isValidElement)(child))
|
|
164
|
+
if (!/* @__PURE__ */ (0, import_react.isValidElement)(child) || child.type === import_react.Fragment)
|
|
165
165
|
return child;
|
|
166
166
|
var _child_props_disabled, disabled = (_child_props_disabled = child.props.disabled) !== null && _child_props_disabled !== void 0 ? _child_props_disabled : disabledProp, isFirst = i === 0, isLast = i === childrenArray.length - 1, radiusStyles = disablePassBorderRadius === !0 ? null : getBorderRadius({
|
|
167
167
|
isFirst,
|
|
@@ -178,7 +178,6 @@ function createGroup(verticalDefault) {
|
|
|
178
178
|
}), indexedChildren = (0, import_reforest.useIndexedChildren)((0, import_core.spacedChildren)({
|
|
179
179
|
direction: spaceDirection,
|
|
180
180
|
separator,
|
|
181
|
-
// @ts-ignore
|
|
182
181
|
space,
|
|
183
182
|
children
|
|
184
183
|
})), onItemMount = import_react.default.useCallback(function() {
|
|
@@ -218,9 +217,9 @@ var GroupItem = /* @__PURE__ */ (0, import_react.forwardRef)(function(props, _re
|
|
|
218
217
|
var _children_props, __scopeGroup = props.__scopeGroup, children = props.children, forcePlacement = props.forcePlacement, groupItemProps = useGroupItem({
|
|
219
218
|
disabled: /* @__PURE__ */ (0, import_react.isValidElement)(children) ? children.props.disabled : void 0
|
|
220
219
|
}, forcePlacement, __scopeGroup);
|
|
221
|
-
return
|
|
220
|
+
return !/* @__PURE__ */ (0, import_react.isValidElement)(children) || children.type === import_react.Fragment ? children : (0, import_core.isTamaguiElement)(children) ? /* @__PURE__ */ import_react.default.cloneElement(children, groupItemProps) : /* @__PURE__ */ import_react.default.cloneElement(children, {
|
|
222
221
|
style: _object_spread({}, (_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.style, groupItemProps)
|
|
223
|
-
})
|
|
222
|
+
});
|
|
224
223
|
}), useGroupItem = function(childrenProps, forcePlacement, __scopeGroup) {
|
|
225
224
|
var treeIndex = (0, import_reforest.useIndex)(), context = useGroupContext("GroupItem", __scopeGroup);
|
|
226
225
|
if (import_react.default.useEffect(function() {
|
|
@@ -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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uDACA,cASO,0BAEP,wBAAmC,oCACnC,iBAAqC,6BACrC,gBAA+B,4BAC/B,gCAAqC,4CACrC,
|
|
5
|
-
"names": ["GROUP_NAME", "createContextScope", "createGroupContext", "createGroupScope", "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", "childrenProp", "children", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabledProp", "disabled", "disablePassBorderRadiusProp", "disablePassBorderRadius", "forceUseItem", "restProps", "vertical", "useControllableState", "defaultProp", "itemChildrenCount", "setItemChildrenCount", "isUsingItems", "getVariableValue", "getTokens", "undefined", "hasRadius", "childrenArray", "Children", "toArray", "filter", "isValidElement", "map", "child", "i", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "isTamaguiElement", "style", "cloneElementWithPropOrder", "indexedChildren", "useIndexedChildren", "spacedChildren", "direction", "onItemMount", "React", "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", "createContextScope", "createGroupContext", "createGroupScope", "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", "childrenProp", "children", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabledProp", "disabled", "disablePassBorderRadiusProp", "disablePassBorderRadius", "forceUseItem", "restProps", "vertical", "useControllableState", "defaultProp", "itemChildrenCount", "setItemChildrenCount", "isUsingItems", "getVariableValue", "getTokens", "undefined", "hasRadius", "childrenArray", "Children", "toArray", "filter", "isValidElement", "map", "child", "i", "type", "Fragment", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "isTamaguiElement", "style", "cloneElementWithPropOrder", "indexedChildren", "useIndexedChildren", "spacedChildren", "direction", "onItemMount", "React", "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"]
|
|
6
6
|
}
|
package/dist/esm/Group.js
CHANGED
|
@@ -12,7 +12,7 @@ import { createContextScope } from "@tamagui/create-context";
|
|
|
12
12
|
import { withStaticProperties } from "@tamagui/helpers";
|
|
13
13
|
import { ThemeableStack } from "@tamagui/stacks";
|
|
14
14
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
15
|
-
import React, { Children, forwardRef, isValidElement } from "react";
|
|
15
|
+
import React, { Children, Fragment, forwardRef, isValidElement } from "react";
|
|
16
16
|
import { ScrollView } from "react-native-web";
|
|
17
17
|
import { useIndex, useIndexedChildren } from "reforest";
|
|
18
18
|
import { jsx } from "react/jsx-runtime";
|
|
@@ -53,7 +53,7 @@ function createGroup(verticalDefault) {
|
|
|
53
53
|
} = activeProps, vertical = orientation === "vertical", [itemChildrenCount, setItemChildrenCount] = useControllableState({
|
|
54
54
|
defaultProp: forceUseItem ? 1 : 0
|
|
55
55
|
}), isUsingItems = itemChildrenCount > 0, radius = borderRadius ?? (size ? getVariableValue(getTokens().radius[size]) - 1 : void 0), disablePassBorderRadius = disablePassBorderRadiusProp ?? !(radius !== void 0), childrenArray = Children.toArray(childrenProp), children = isUsingItems ? Children.toArray(childrenProp).filter(isValidElement) : childrenArray.map((child, i) => {
|
|
56
|
-
if (!isValidElement(child))
|
|
56
|
+
if (!isValidElement(child) || child.type === Fragment)
|
|
57
57
|
return child;
|
|
58
58
|
const disabled = child.props.disabled ?? disabledProp, isFirst = i === 0, isLast = i === childrenArray.length - 1, radiusStyles = disablePassBorderRadius === !0 ? null : getBorderRadius({
|
|
59
59
|
isFirst,
|
|
@@ -70,7 +70,6 @@ function createGroup(verticalDefault) {
|
|
|
70
70
|
spacedChildren({
|
|
71
71
|
direction: spaceDirection,
|
|
72
72
|
separator,
|
|
73
|
-
// @ts-ignore
|
|
74
73
|
space,
|
|
75
74
|
children
|
|
76
75
|
})
|
|
@@ -117,13 +116,13 @@ const GroupItem = forwardRef(
|
|
|
117
116
|
forcePlacement,
|
|
118
117
|
__scopeGroup
|
|
119
118
|
);
|
|
120
|
-
return isValidElement(children) ? isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
119
|
+
return !isValidElement(children) || children.type === Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
121
120
|
style: {
|
|
122
121
|
// @ts-ignore
|
|
123
122
|
...children.props?.style,
|
|
124
123
|
...groupItemProps
|
|
125
124
|
}
|
|
126
|
-
})
|
|
125
|
+
});
|
|
127
126
|
}
|
|
128
127
|
), useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
|
|
129
128
|
const treeIndex = useIndex(), context = useGroupContext("GroupItem", __scopeGroup);
|
package/dist/esm/Group.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Group.tsx"],
|
|
4
|
-
"mappings": "AACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,0BAA0B;AACnC,SAAS,4BAA4B;AACrC,SAAS,sBAAsB;AAC/B,SAAS,4BAA4B;AACrC,OAAO,SAAS,UAAU,YAAY,sBAAsB;
|
|
4
|
+
"mappings": "AACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,0BAA0B;AACnC,SAAS,4BAA4B;AACrC,SAAS,sBAAsB;AAC/B,SAAS,4BAA4B;AACrC,OAAO,SAAS,UAAU,UAAU,YAAY,sBAAsB;AACtE,SAAS,kBAAkB;AAC3B,SAAS,UAAU,0BAA0B;AA4JnC;AA/IV,MAAM,aAAa,SAGb,CAAC,oBAAoB,gBAAgB,IAAI,mBAAmB,UAAU,GACtE,CAAC,eAAe,eAAe,IAAI,mBAAsC,UAAU,GAE5E,aAAa,OAAO,gBAAgB;AAAA,EAC/C,MAAM;AAAA,EAEN,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,MACR;AAAA,IACF;AAAA,IAEA,MAAM,CAAC,KAAK,EAAE,OAAO,OAEZ;AAAA,MACL,cAFmB,OAAO,OAAO,GAAG,KAAK,OAAO,OAAO,OAAO;AAAA,IAGhE;AAAA,EAEJ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC;AAqBD,SAAS,YAAY,iBAA0B;AAC7C,SAAO;AAAA,IACL,WAAW,UAAmC,CAAC,OAAO,QAAQ;AAC5D,YAAM,cAAc,SAAS,KAAK,GAE5B;AAAA,QACJ;AAAA,QACA,UAAU;AAAA,QACV;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO,kBAAkB,aAAa;AAAA,QACtC,cAAc;AAAA,QACd,UAAU;AAAA,QACV,yBAAyB;AAAA,QACzB;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL,IAAI,aAEE,WAAW,gBAAgB,YAC3B,CAAC,mBAAmB,oBAAoB,IAAI,qBAAqB;AAAA,QACrE,aAAa,eAAe,IAAI;AAAA,MAClC,CAAC,GACK,eAAe,oBAAoB,GAGnC,SACJ,iBACC,OAAO,iBAAiB,UAAU,EAAE,OAAO,IAAI,CAAC,IAAI,IAAI,SAGrD,0BAA0B,+BAA+B,EAD7C,WAAW,SAGvB,gBAAgB,SAAS,QAAQ,YAAY,GAC7C,WAAW,eACb,SAAS,QAAQ,YAAY,EAAE,OAAO,cAAc,IACpD,cAAc,IAAI,CAAC,OAAO,MAAM;AAC9B,YAAI,CAAC,eAAe,KAAK,KAAK,MAAM,SAAS;AAC3C,iBAAO;AAET,cAAM,WAAW,MAAM,MAAM,YAAY,cAEnC,UAAU,MAAM,GAChB,SAAS,MAAM,cAAc,SAAS,GAEtC,eACJ,4BAA4B,KACxB,OACA,gBAAgB;AAAA,UACd;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,SAAS;AAAA,QACX,CAAC,GACDA,SAAQ;AAAA,UACZ;AAAA,UACA,GAAI,iBAAiB,KAAK,IAAI,eAAe,EAAE,OAAO,aAAa;AAAA,QACrE;AAEA,eAAO,0BAA0B,OAAOA,MAAK;AAAA,MAC/C,CAAC,GAEC,kBAAkB;AAAA,QACtB,eAAe;AAAA,UACb,WAAW;AAAA,UACX;AAAA,UACA;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACH,GAEM,cAAc,MAAM;AAAA,QACxB,MAAM,qBAAqB,CAAC,SAAS,OAAO,CAAC;AAAA,QAC7C,CAAC;AAAA,MACH,GACM,gBAAgB,MAAM;AAAA,QAC1B,MAAM,qBAAqB,CAAC,SAAS,OAAO,CAAC;AAAA,QAC7C,CAAC;AAAA,MACH;AAEA,aACE;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA,UAAU,gBAAgB;AAAA,UAE1B;AAAA,UACA,UAAU;AAAA,UACV;AAAA,UACA;AAAA,UACA,OAAO;AAAA,UAEP;AAAA,YAAC;AAAA;AAAA,cACC;AAAA,cACA;AAAA,cACA,eAAe,gBAAgB,eAAe,QAAQ;AAAA,cACtD;AAAA,cACC,GAAG;AAAA,cAEH,qBAAW,EAAE,GAAG,aAAa,YAAY,GAAG,eAAe;AAAA;AAAA,UAC9D;AAAA;AAAA,MACF;AAAA,IAEJ,CAAC;AAAA,IACD;AAAA,MACE,MAAM;AAAA,IACR;AAAA,EACF;AACF;AAUA,MAAM,YAAY;AAAA,EAChB,CACE,OAEA,SACG;AACH,UAAM,EAAE,cAAc,UAAU,eAAe,IAAI,OAC7C,iBAAiB;AAAA,MACrB,EAAE,UAAU,eAAe,QAAQ,IAAI,SAAS,MAAM,WAAW,OAAU;AAAA,MAC3E;AAAA,MACA;AAAA,IACF;AAEA,WAAI,CAAC,eAAe,QAAQ,KAAK,SAAS,SAAS,WAC1C,WAGL,iBAAiB,QAAQ,IACpB,MAAM,aAAa,UAAU,cAAc,IAG7C,MAAM,aAAa,UAAU;AAAA,MAClC,OAAO;AAAA;AAAA,QAEL,GAAG,SAAS,OAAQ;AAAA,QACpB,GAAG;AAAA,MACL;AAAA,IACF,CAAQ;AAAA,EACV;AACF,GAEa,eAAe,CAC1B,eACA,gBACA,iBACG;AACH,QAAM,YAAY,SAAS,GACrB,UAAU,gBAAgB,aAAa,YAAY;AASzD,MAPA,MAAM,UAAU,OACd,QAAQ,YAAY,GACb,MAAM;AACX,YAAQ,cAAc;AAAA,EACxB,IACC,CAAC,CAAC,GAED,CAAC;AACH,UAAM,MAAM,qDAAqD;AAGnE,QAAM,UACJ,mBAAmB,WAAY,mBAAmB,UAAU,UAAU,UAAU,GAC5E,SACJ,mBAAmB,UAClB,mBAAmB,WAAW,UAAU,UAAU,UAAU;AAI/D,MAAI,cAAmC;AAAA,IACrC,UAHe,cAAc,YAAY,QAAQ;AAAA,EAInD;AAEA,MAAI,QAAQ,4BAA4B,IAAM;AAC5C,UAAM,eAAe,gBAAgB;AAAA,MACnC,QAAQ,QAAQ;AAAA,MAChB;AAAA,MACA;AAAA,MACA,UAAU,QAAQ;AAAA,MAClB,SAAS,QAAQ;AAAA,IACnB,CAAC;AACD,WAAO,EAAE,GAAG,aAAa,GAAG,aAAa;AAAA,EAC3C;AACA,SAAO;AACT,GAEa,QAAQ,YAAY,EAAI,GACxB,SAAS,OACT,SAAS,YAAY,EAAK,GAEjC,aAAa,CACjB,EAAE,YAAY,aAAa,sBAAsB,GAAM,GACvD,aAEI,aAEA;AAAA,EAAC;AAAA;AAAA,IACE,GAAI,gBAAgB,cAAc;AAAA,MACjC,8BAA8B;AAAA,IAChC;AAAA,IACC,GAAI,gBAAgB,gBAAgB;AAAA,MACnC,YAAY;AAAA,MACZ,gCAAgC;AAAA,IAClC;AAAA,IAEC;AAAA;AACH,IAEG,UAGH,kBAAkB,CAAC;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,OAQS;AAAA,EACL,qBAAqB,WAAW,YAAY,SAAS,YAAY,UAAU,SAAS;AAAA,EACpF,sBACE,YAAY,SACZ,YAAY,UACV,YAAY,WAAa,CAAC,YAAY,UACpC,SACA;AAAA,EACN,wBACE,YAAY,YACZ,YAAY,YACV,YAAY,UAAY,CAAC,YAAY,WACnC,SACA;AAAA,EACN,yBACE,UAAU,YAAY,YAAY,YAAY,QAAQ,SAAS;AACnE,IAGI,4BAA4B,CAAC,OAAY,UAAkB;AAC/D,QAAM,OAAO,WAAW,MAAM,OAAO,OAAO,UAAU,EAAE,UAAU;AAClE,SAAO,MAAM,aAAa,EAAE,GAAG,OAAO,OAAO,KAAK,GAAG,IAAI;AAC3D;",
|
|
5
5
|
"names": ["props"]
|
|
6
6
|
}
|
package/dist/esm/Group.mjs
CHANGED
|
@@ -3,7 +3,7 @@ import { createContextScope } from "@tamagui/create-context";
|
|
|
3
3
|
import { withStaticProperties } from "@tamagui/helpers";
|
|
4
4
|
import { ThemeableStack } from "@tamagui/stacks";
|
|
5
5
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
6
|
-
import React, { Children, forwardRef, isValidElement } from "react";
|
|
6
|
+
import React, { Children, Fragment, forwardRef, isValidElement } from "react";
|
|
7
7
|
import { ScrollView } from "react-native-web";
|
|
8
8
|
import { useIndex, useIndexedChildren } from "reforest";
|
|
9
9
|
import { jsx } from "react/jsx-runtime";
|
|
@@ -56,7 +56,7 @@ function createGroup(verticalDefault) {
|
|
|
56
56
|
disablePassBorderRadius = disablePassBorderRadiusProp ?? !(radius !== void 0),
|
|
57
57
|
childrenArray = Children.toArray(childrenProp),
|
|
58
58
|
children = isUsingItems ? Children.toArray(childrenProp).filter(isValidElement) : childrenArray.map((child, i) => {
|
|
59
|
-
if (!isValidElement(child)) return child;
|
|
59
|
+
if (!isValidElement(child) || child.type === Fragment) return child;
|
|
60
60
|
const disabled = child.props.disabled ?? disabledProp,
|
|
61
61
|
isFirst = i === 0,
|
|
62
62
|
isLast = i === childrenArray.length - 1,
|
|
@@ -78,7 +78,6 @@ function createGroup(verticalDefault) {
|
|
|
78
78
|
indexedChildren = useIndexedChildren(spacedChildren({
|
|
79
79
|
direction: spaceDirection,
|
|
80
80
|
separator,
|
|
81
|
-
// @ts-ignore
|
|
82
81
|
space,
|
|
83
82
|
children
|
|
84
83
|
})),
|
|
@@ -117,13 +116,13 @@ const GroupItem = forwardRef((props, _ref) => {
|
|
|
117
116
|
groupItemProps = useGroupItem({
|
|
118
117
|
disabled: isValidElement(children) ? children.props.disabled : void 0
|
|
119
118
|
}, forcePlacement, __scopeGroup);
|
|
120
|
-
return isValidElement(children) ? isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
119
|
+
return !isValidElement(children) || children.type === Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
121
120
|
style: {
|
|
122
121
|
// @ts-ignore
|
|
123
122
|
...children.props?.style,
|
|
124
123
|
...groupItemProps
|
|
125
124
|
}
|
|
126
|
-
})
|
|
125
|
+
});
|
|
127
126
|
}),
|
|
128
127
|
useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
|
|
129
128
|
const treeIndex = useIndex(),
|
package/dist/esm/Group.native.js
CHANGED
|
@@ -4,7 +4,7 @@ import { createContextScope } from "@tamagui/create-context";
|
|
|
4
4
|
import { withStaticProperties } from "@tamagui/helpers";
|
|
5
5
|
import { ThemeableStack } from "@tamagui/stacks";
|
|
6
6
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
7
|
-
import React, { Children, forwardRef, isValidElement } from "react";
|
|
7
|
+
import React, { Children, Fragment, forwardRef, isValidElement } from "react";
|
|
8
8
|
import { ScrollView } from "react-native";
|
|
9
9
|
import { useIndex, useIndexedChildren } from "reforest";
|
|
10
10
|
function _array_like_to_array(arr, len) {
|
|
@@ -137,7 +137,7 @@ function createGroup(verticalDefault) {
|
|
|
137
137
|
]), vertical = orientation === "vertical", _useControllableState = _sliced_to_array(useControllableState({
|
|
138
138
|
defaultProp: forceUseItem ? 1 : 0
|
|
139
139
|
}), 2), itemChildrenCount = _useControllableState[0], setItemChildrenCount = _useControllableState[1], isUsingItems = itemChildrenCount > 0, radius = borderRadius ?? (size ? getVariableValue(getTokens().radius[size]) - 1 : void 0), hasRadius = radius !== void 0, disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius, childrenArray = Children.toArray(childrenProp), children = isUsingItems ? Children.toArray(childrenProp).filter(isValidElement) : childrenArray.map(function(child, i) {
|
|
140
|
-
if (!/* @__PURE__ */ isValidElement(child))
|
|
140
|
+
if (!/* @__PURE__ */ isValidElement(child) || child.type === Fragment)
|
|
141
141
|
return child;
|
|
142
142
|
var _child_props_disabled, disabled = (_child_props_disabled = child.props.disabled) !== null && _child_props_disabled !== void 0 ? _child_props_disabled : disabledProp, isFirst = i === 0, isLast = i === childrenArray.length - 1, radiusStyles = disablePassBorderRadius === !0 ? null : getBorderRadius({
|
|
143
143
|
isFirst,
|
|
@@ -154,7 +154,6 @@ function createGroup(verticalDefault) {
|
|
|
154
154
|
}), indexedChildren = useIndexedChildren(spacedChildren({
|
|
155
155
|
direction: spaceDirection,
|
|
156
156
|
separator,
|
|
157
|
-
// @ts-ignore
|
|
158
157
|
space,
|
|
159
158
|
children
|
|
160
159
|
})), onItemMount = React.useCallback(function() {
|
|
@@ -194,9 +193,9 @@ var GroupItem = /* @__PURE__ */ forwardRef(function(props, _ref) {
|
|
|
194
193
|
var _children_props, __scopeGroup = props.__scopeGroup, children = props.children, forcePlacement = props.forcePlacement, groupItemProps = useGroupItem({
|
|
195
194
|
disabled: /* @__PURE__ */ isValidElement(children) ? children.props.disabled : void 0
|
|
196
195
|
}, forcePlacement, __scopeGroup);
|
|
197
|
-
return
|
|
196
|
+
return !/* @__PURE__ */ isValidElement(children) || children.type === Fragment ? children : isTamaguiElement(children) ? /* @__PURE__ */ React.cloneElement(children, groupItemProps) : /* @__PURE__ */ React.cloneElement(children, {
|
|
198
197
|
style: _object_spread({}, (_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.style, groupItemProps)
|
|
199
|
-
})
|
|
198
|
+
});
|
|
200
199
|
}), useGroupItem = function(childrenProps, forcePlacement, __scopeGroup) {
|
|
201
200
|
var treeIndex = useIndex(), context = useGroupContext("GroupItem", __scopeGroup);
|
|
202
201
|
if (React.useEffect(function() {
|
|
@@ -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": ";AACA,SACEA,WACAC,WACAC,kBACAC,kBACAC,YACAC,gBACAC,QACAC,gBACK;AAEP,SAASC,0BAA0B;AACnC,SAASC,4BAA4B;AACrC,SAASC,sBAAsB;AAC/B,SAASC,4BAA4B;AACrC,OAAOC,SAASC,UAAUC,YAAYC,sBAAsB;
|
|
5
|
-
"names": ["getConfig", "getTokens", "getVariableValue", "isTamaguiElement", "mergeProps", "spacedChildren", "styled", "useProps", "createContextScope", "withStaticProperties", "ThemeableStack", "useControllableState", "React", "Children", "forwardRef", "isValidElement", "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", "childrenProp", "children", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabledProp", "disabled", "disablePassBorderRadiusProp", "disablePassBorderRadius", "forceUseItem", "restProps", "vertical", "defaultProp", "itemChildrenCount", "setItemChildrenCount", "isUsingItems", "undefined", "hasRadius", "childrenArray", "toArray", "filter", "map", "child", "i", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "style", "cloneElementWithPropOrder", "indexedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "_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": ["getConfig", "getTokens", "getVariableValue", "isTamaguiElement", "mergeProps", "spacedChildren", "styled", "useProps", "createContextScope", "withStaticProperties", "ThemeableStack", "useControllableState", "React", "Children", "Fragment", "forwardRef", "isValidElement", "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", "childrenProp", "children", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabledProp", "disabled", "disablePassBorderRadiusProp", "disablePassBorderRadius", "forceUseItem", "restProps", "vertical", "defaultProp", "itemChildrenCount", "setItemChildrenCount", "isUsingItems", "undefined", "hasRadius", "childrenArray", "toArray", "filter", "map", "child", "i", "type", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "style", "cloneElementWithPropOrder", "indexedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "_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"]
|
|
6
6
|
}
|
package/dist/jsx/Group.js
CHANGED
|
@@ -12,7 +12,7 @@ import { createContextScope } from "@tamagui/create-context";
|
|
|
12
12
|
import { withStaticProperties } from "@tamagui/helpers";
|
|
13
13
|
import { ThemeableStack } from "@tamagui/stacks";
|
|
14
14
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
15
|
-
import React, { Children, forwardRef, isValidElement } from "react";
|
|
15
|
+
import React, { Children, Fragment, forwardRef, isValidElement } from "react";
|
|
16
16
|
import { ScrollView } from "react-native-web";
|
|
17
17
|
import { useIndex, useIndexedChildren } from "reforest";
|
|
18
18
|
import { jsx } from "react/jsx-runtime";
|
|
@@ -53,7 +53,7 @@ function createGroup(verticalDefault) {
|
|
|
53
53
|
} = activeProps, vertical = orientation === "vertical", [itemChildrenCount, setItemChildrenCount] = useControllableState({
|
|
54
54
|
defaultProp: forceUseItem ? 1 : 0
|
|
55
55
|
}), isUsingItems = itemChildrenCount > 0, radius = borderRadius ?? (size ? getVariableValue(getTokens().radius[size]) - 1 : void 0), disablePassBorderRadius = disablePassBorderRadiusProp ?? !(radius !== void 0), childrenArray = Children.toArray(childrenProp), children = isUsingItems ? Children.toArray(childrenProp).filter(isValidElement) : childrenArray.map((child, i) => {
|
|
56
|
-
if (!isValidElement(child))
|
|
56
|
+
if (!isValidElement(child) || child.type === Fragment)
|
|
57
57
|
return child;
|
|
58
58
|
const disabled = child.props.disabled ?? disabledProp, isFirst = i === 0, isLast = i === childrenArray.length - 1, radiusStyles = disablePassBorderRadius === !0 ? null : getBorderRadius({
|
|
59
59
|
isFirst,
|
|
@@ -70,7 +70,6 @@ function createGroup(verticalDefault) {
|
|
|
70
70
|
spacedChildren({
|
|
71
71
|
direction: spaceDirection,
|
|
72
72
|
separator,
|
|
73
|
-
// @ts-ignore
|
|
74
73
|
space,
|
|
75
74
|
children
|
|
76
75
|
})
|
|
@@ -117,13 +116,13 @@ const GroupItem = forwardRef(
|
|
|
117
116
|
forcePlacement,
|
|
118
117
|
__scopeGroup
|
|
119
118
|
);
|
|
120
|
-
return isValidElement(children) ? isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
119
|
+
return !isValidElement(children) || children.type === Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
121
120
|
style: {
|
|
122
121
|
// @ts-ignore
|
|
123
122
|
...children.props?.style,
|
|
124
123
|
...groupItemProps
|
|
125
124
|
}
|
|
126
|
-
})
|
|
125
|
+
});
|
|
127
126
|
}
|
|
128
127
|
), useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
|
|
129
128
|
const treeIndex = useIndex(), context = useGroupContext("GroupItem", __scopeGroup);
|
package/dist/jsx/Group.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Group.tsx"],
|
|
4
|
-
"mappings": "AACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,0BAA0B;AACnC,SAAS,4BAA4B;AACrC,SAAS,sBAAsB;AAC/B,SAAS,4BAA4B;AACrC,OAAO,SAAS,UAAU,YAAY,sBAAsB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["props"]
|
|
6
6
|
}
|
package/dist/jsx/Group.mjs
CHANGED
|
@@ -3,7 +3,7 @@ import { createContextScope } from "@tamagui/create-context";
|
|
|
3
3
|
import { withStaticProperties } from "@tamagui/helpers";
|
|
4
4
|
import { ThemeableStack } from "@tamagui/stacks";
|
|
5
5
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
6
|
-
import React, { Children, forwardRef, isValidElement } from "react";
|
|
6
|
+
import React, { Children, Fragment, forwardRef, isValidElement } from "react";
|
|
7
7
|
import { ScrollView } from "react-native-web";
|
|
8
8
|
import { useIndex, useIndexedChildren } from "reforest";
|
|
9
9
|
import { jsx } from "react/jsx-runtime";
|
|
@@ -56,7 +56,7 @@ function createGroup(verticalDefault) {
|
|
|
56
56
|
disablePassBorderRadius = disablePassBorderRadiusProp ?? !(radius !== void 0),
|
|
57
57
|
childrenArray = Children.toArray(childrenProp),
|
|
58
58
|
children = isUsingItems ? Children.toArray(childrenProp).filter(isValidElement) : childrenArray.map((child, i) => {
|
|
59
|
-
if (!isValidElement(child)) return child;
|
|
59
|
+
if (!isValidElement(child) || child.type === Fragment) return child;
|
|
60
60
|
const disabled = child.props.disabled ?? disabledProp,
|
|
61
61
|
isFirst = i === 0,
|
|
62
62
|
isLast = i === childrenArray.length - 1,
|
|
@@ -78,7 +78,6 @@ function createGroup(verticalDefault) {
|
|
|
78
78
|
indexedChildren = useIndexedChildren(spacedChildren({
|
|
79
79
|
direction: spaceDirection,
|
|
80
80
|
separator,
|
|
81
|
-
// @ts-ignore
|
|
82
81
|
space,
|
|
83
82
|
children
|
|
84
83
|
})),
|
|
@@ -117,13 +116,13 @@ const GroupItem = forwardRef((props, _ref) => {
|
|
|
117
116
|
groupItemProps = useGroupItem({
|
|
118
117
|
disabled: isValidElement(children) ? children.props.disabled : void 0
|
|
119
118
|
}, forcePlacement, __scopeGroup);
|
|
120
|
-
return isValidElement(children) ? isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
119
|
+
return !isValidElement(children) || children.type === Fragment ? children : isTamaguiElement(children) ? React.cloneElement(children, groupItemProps) : React.cloneElement(children, {
|
|
121
120
|
style: {
|
|
122
121
|
// @ts-ignore
|
|
123
122
|
...children.props?.style,
|
|
124
123
|
...groupItemProps
|
|
125
124
|
}
|
|
126
|
-
})
|
|
125
|
+
});
|
|
127
126
|
}),
|
|
128
127
|
useGroupItem = (childrenProps, forcePlacement, __scopeGroup) => {
|
|
129
128
|
const treeIndex = useIndex(),
|
package/dist/jsx/Group.native.js
CHANGED
|
@@ -4,7 +4,7 @@ import { createContextScope } from "@tamagui/create-context";
|
|
|
4
4
|
import { withStaticProperties } from "@tamagui/helpers";
|
|
5
5
|
import { ThemeableStack } from "@tamagui/stacks";
|
|
6
6
|
import { useControllableState } from "@tamagui/use-controllable-state";
|
|
7
|
-
import React, { Children, forwardRef, isValidElement } from "react";
|
|
7
|
+
import React, { Children, Fragment, forwardRef, isValidElement } from "react";
|
|
8
8
|
import { ScrollView } from "react-native";
|
|
9
9
|
import { useIndex, useIndexedChildren } from "reforest";
|
|
10
10
|
function _array_like_to_array(arr, len) {
|
|
@@ -137,7 +137,7 @@ function createGroup(verticalDefault) {
|
|
|
137
137
|
]), vertical = orientation === "vertical", _useControllableState = _sliced_to_array(useControllableState({
|
|
138
138
|
defaultProp: forceUseItem ? 1 : 0
|
|
139
139
|
}), 2), itemChildrenCount = _useControllableState[0], setItemChildrenCount = _useControllableState[1], isUsingItems = itemChildrenCount > 0, radius = borderRadius ?? (size ? getVariableValue(getTokens().radius[size]) - 1 : void 0), hasRadius = radius !== void 0, disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius, childrenArray = Children.toArray(childrenProp), children = isUsingItems ? Children.toArray(childrenProp).filter(isValidElement) : childrenArray.map(function(child, i) {
|
|
140
|
-
if (!/* @__PURE__ */ isValidElement(child))
|
|
140
|
+
if (!/* @__PURE__ */ isValidElement(child) || child.type === Fragment)
|
|
141
141
|
return child;
|
|
142
142
|
var _child_props_disabled, disabled = (_child_props_disabled = child.props.disabled) !== null && _child_props_disabled !== void 0 ? _child_props_disabled : disabledProp, isFirst = i === 0, isLast = i === childrenArray.length - 1, radiusStyles = disablePassBorderRadius === !0 ? null : getBorderRadius({
|
|
143
143
|
isFirst,
|
|
@@ -154,7 +154,6 @@ function createGroup(verticalDefault) {
|
|
|
154
154
|
}), indexedChildren = useIndexedChildren(spacedChildren({
|
|
155
155
|
direction: spaceDirection,
|
|
156
156
|
separator,
|
|
157
|
-
// @ts-ignore
|
|
158
157
|
space,
|
|
159
158
|
children
|
|
160
159
|
})), onItemMount = React.useCallback(function() {
|
|
@@ -194,9 +193,9 @@ var GroupItem = /* @__PURE__ */ forwardRef(function(props, _ref) {
|
|
|
194
193
|
var _children_props, __scopeGroup = props.__scopeGroup, children = props.children, forcePlacement = props.forcePlacement, groupItemProps = useGroupItem({
|
|
195
194
|
disabled: /* @__PURE__ */ isValidElement(children) ? children.props.disabled : void 0
|
|
196
195
|
}, forcePlacement, __scopeGroup);
|
|
197
|
-
return
|
|
196
|
+
return !/* @__PURE__ */ isValidElement(children) || children.type === Fragment ? children : isTamaguiElement(children) ? /* @__PURE__ */ React.cloneElement(children, groupItemProps) : /* @__PURE__ */ React.cloneElement(children, {
|
|
198
197
|
style: _object_spread({}, (_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.style, groupItemProps)
|
|
199
|
-
})
|
|
198
|
+
});
|
|
200
199
|
}), useGroupItem = function(childrenProps, forcePlacement, __scopeGroup) {
|
|
201
200
|
var treeIndex = useIndex(), context = useGroupContext("GroupItem", __scopeGroup);
|
|
202
201
|
if (React.useEffect(function() {
|
|
@@ -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": ";AACA,SACEA,WACAC,WACAC,kBACAC,kBACAC,YACAC,gBACAC,QACAC,gBACK;AAEP,SAASC,0BAA0B;AACnC,SAASC,4BAA4B;AACrC,SAASC,sBAAsB;AAC/B,SAASC,4BAA4B;AACrC,OAAOC,SAASC,UAAUC,YAAYC,sBAAsB;
|
|
5
|
-
"names": ["getConfig", "getTokens", "getVariableValue", "isTamaguiElement", "mergeProps", "spacedChildren", "styled", "useProps", "createContextScope", "withStaticProperties", "ThemeableStack", "useControllableState", "React", "Children", "forwardRef", "isValidElement", "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", "childrenProp", "children", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabledProp", "disabled", "disablePassBorderRadiusProp", "disablePassBorderRadius", "forceUseItem", "restProps", "vertical", "defaultProp", "itemChildrenCount", "setItemChildrenCount", "isUsingItems", "undefined", "hasRadius", "childrenArray", "toArray", "filter", "map", "child", "i", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "style", "cloneElementWithPropOrder", "indexedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "_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": ["getConfig", "getTokens", "getVariableValue", "isTamaguiElement", "mergeProps", "spacedChildren", "styled", "useProps", "createContextScope", "withStaticProperties", "ThemeableStack", "useControllableState", "React", "Children", "Fragment", "forwardRef", "isValidElement", "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", "childrenProp", "children", "space", "spaceDirection", "separator", "scrollable", "axis", "orientation", "disabledProp", "disabled", "disablePassBorderRadiusProp", "disablePassBorderRadius", "forceUseItem", "restProps", "vertical", "defaultProp", "itemChildrenCount", "setItemChildrenCount", "isUsingItems", "undefined", "hasRadius", "childrenArray", "toArray", "filter", "map", "child", "i", "type", "isFirst", "isLast", "length", "radiusStyles", "getBorderRadius", "disable", "style", "cloneElementWithPropOrder", "indexedChildren", "direction", "onItemMount", "useCallback", "prev", "onItemUnmount", "scope", "flexDirection", "wrapScroll", "Item", "GroupItem", "_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"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/group",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.102.1",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -32,15 +32,15 @@
|
|
|
32
32
|
}
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@tamagui/core": "1.
|
|
36
|
-
"@tamagui/create-context": "1.
|
|
37
|
-
"@tamagui/helpers": "1.
|
|
38
|
-
"@tamagui/stacks": "1.
|
|
39
|
-
"@tamagui/use-controllable-state": "1.
|
|
35
|
+
"@tamagui/core": "1.102.1",
|
|
36
|
+
"@tamagui/create-context": "1.102.1",
|
|
37
|
+
"@tamagui/helpers": "1.102.1",
|
|
38
|
+
"@tamagui/stacks": "1.102.1",
|
|
39
|
+
"@tamagui/use-controllable-state": "1.102.1",
|
|
40
40
|
"reforest": "^0.13.0"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@tamagui/build": "1.
|
|
43
|
+
"@tamagui/build": "1.102.1",
|
|
44
44
|
"react": "^18.2.0"
|
|
45
45
|
},
|
|
46
46
|
"publishConfig": {
|
package/src/Group.tsx
CHANGED
|
@@ -14,7 +14,7 @@ import { createContextScope } from '@tamagui/create-context'
|
|
|
14
14
|
import { withStaticProperties } from '@tamagui/helpers'
|
|
15
15
|
import { ThemeableStack } from '@tamagui/stacks'
|
|
16
16
|
import { useControllableState } from '@tamagui/use-controllable-state'
|
|
17
|
-
import React, { Children, forwardRef, isValidElement } from 'react'
|
|
17
|
+
import React, { Children, Fragment, forwardRef, isValidElement } from 'react'
|
|
18
18
|
import { ScrollView } from 'react-native'
|
|
19
19
|
import { useIndex, useIndexedChildren } from 'reforest'
|
|
20
20
|
|
|
@@ -117,7 +117,7 @@ function createGroup(verticalDefault: boolean) {
|
|
|
117
117
|
const children = isUsingItems
|
|
118
118
|
? Children.toArray(childrenProp).filter(isValidElement)
|
|
119
119
|
: childrenArray.map((child, i) => {
|
|
120
|
-
if (!isValidElement(child)) {
|
|
120
|
+
if (!isValidElement(child) || child.type === Fragment) {
|
|
121
121
|
return child
|
|
122
122
|
}
|
|
123
123
|
const disabled = child.props.disabled ?? disabledProp
|
|
@@ -147,7 +147,6 @@ function createGroup(verticalDefault: boolean) {
|
|
|
147
147
|
spacedChildren({
|
|
148
148
|
direction: spaceDirection,
|
|
149
149
|
separator,
|
|
150
|
-
// @ts-ignore
|
|
151
150
|
space,
|
|
152
151
|
children,
|
|
153
152
|
})
|
|
@@ -212,7 +211,7 @@ const GroupItem = forwardRef(
|
|
|
212
211
|
__scopeGroup
|
|
213
212
|
)
|
|
214
213
|
|
|
215
|
-
if (!isValidElement(children)) {
|
|
214
|
+
if (!isValidElement(children) || children.type === Fragment) {
|
|
216
215
|
return children as any
|
|
217
216
|
}
|
|
218
217
|
|
package/types/Group.d.ts.map
CHANGED
|
@@ -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,
|
|
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,KAAyD,MAAM,OAAO,CAAA;AAI7E,KAAK,uBAAuB,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAA;AAiB3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;8CAqBrB,CAAA;AAEF,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,UAAU,CAAC,GAAG;IACrD;;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;AAmHD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAtNhB;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4B9C;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4B9C;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4B9C;;WAEG;eACI,YAAY,GAAG,UAAU;sBAClB,YAAY,GAAG,UAAU;qBAC1B,OAAO;QACpB;;WAEG;8BACmB,OAAO;mBAClB,OAAO;kCACQ,uBAAuB;QACjD;;WAEG;uBACY,OAAO;;uBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4B9C;;WAEG;eACI,YAAY,GAAG,UAAU;sBAClB,YAAY,GAAG,UAAU;qBAC1B,OAAO;QACpB;;WAEG;8BACmB,OAAO;mBAClB,OAAO;kCACQ,uBAAuB;QACjD;;WAEG;uBACY,OAAO;;uBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CAkPV,CAAA;AACtC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAvNjB;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4B9C;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4B9C;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4B9C;;WAEG;eACI,YAAY,GAAG,UAAU;sBAClB,YAAY,GAAG,UAAU;qBAC1B,OAAO;QACpB;;WAEG;8BACmB,OAAO;mBAClB,OAAO;kCACQ,uBAAuB;QACjD;;WAEG;uBACY,OAAO;;uBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4B9C;;WAEG;eACI,YAAY,GAAG,UAAU;sBAClB,YAAY,GAAG,UAAU;qBAC1B,OAAO;QACpB;;WAEG;8BACmB,OAAO;mBAClB,OAAO;kCACQ,uBAAuB;QACjD;;WAEG;uBACY,OAAO;;uBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CAmPrB,CAAA;AAC3B,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAxNjB;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4B9C;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4B9C;;OAEG;WACI,YAAY,GAAG,UAAU;kBAClB,YAAY,GAAG,UAAU;iBAC1B,OAAO;IACpB;;OAEG;0BACmB,OAAO;eAClB,OAAO;8BACQ,uBAAuB;IACjD;;OAEG;mBACY,OAAO;;mBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4B9C;;WAEG;eACI,YAAY,GAAG,UAAU;sBAClB,YAAY,GAAG,UAAU;qBAC1B,OAAO;QACpB;;WAEG;8BACmB,OAAO;mBAClB,OAAO;kCACQ,uBAAuB;QACjD;;WAEG;uBACY,OAAO;;uBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4B9C;;WAEG;eACI,YAAY,GAAG,UAAU;sBAClB,YAAY,GAAG,UAAU;qBAC1B,OAAO;QACpB;;WAEG;8BACmB,OAAO;mBAClB,OAAO;kCACQ,uBAAuB;QACjD;;WAEG;uBACY,OAAO;;uBA3CmB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;uBAAL,KAAK;;CAoPR,CAAA"}
|