@tamagui/group 1.142.0 → 2.0.0-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.
@@ -46,11 +46,12 @@ var import_core = require("@tamagui/core"),
46
46
  import_react = __toESM(require("react"), 1),
47
47
  import_react_native = require("react-native-web"),
48
48
  import_useIndexedChildren = require("./useIndexedChildren.cjs"),
49
+ import_spacer = require("@tamagui/spacer"),
49
50
  import_jsx_runtime = require("react/jsx-runtime");
50
51
  const GROUP_NAME = "Group",
51
52
  [createGroupContext, createGroupScope] = (0, import_create_context.createContextScope)(GROUP_NAME),
52
53
  [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME),
53
- GroupFrame = (0, import_core.styled)(import_stacks.ThemeableStack, {
54
+ GroupFrame = (0, import_core.styled)(import_stacks.YStack, {
54
55
  name: "GroupFrame",
55
56
  variants: {
56
57
  unstyled: {
@@ -76,11 +77,11 @@ function createGroup(verticalDefault) {
76
77
  children: childrenProp,
77
78
  space,
78
79
  size = "$true",
80
+ flex,
79
81
  spaceDirection,
80
82
  separator,
81
83
  scrollable,
82
- axis = verticalDefault ? "vertical" : "horizontal",
83
- orientation = axis,
84
+ orientation = verticalDefault ? "vertical" : "horizontal",
84
85
  disabled: disabledProp,
85
86
  disablePassBorderRadius: disablePassBorderRadiusProp,
86
87
  borderRadius,
@@ -113,14 +114,15 @@ function createGroup(verticalDefault) {
113
114
  };
114
115
  return cloneElementWithPropOrder(child, props2);
115
116
  }),
116
- indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)((0, import_core.spacedChildren)({
117
+ indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)((0, import_spacer.spacedChildren)({
117
118
  direction: spaceDirection,
118
119
  separator,
119
120
  space,
120
121
  children
121
122
  })),
122
123
  onItemMount = import_react.default.useCallback(() => setItemChildrenCount(prev => prev + 1), []),
123
- onItemUnmount = import_react.default.useCallback(() => setItemChildrenCount(prev => prev - 1), []);
124
+ onItemUnmount = import_react.default.useCallback(() => setItemChildrenCount(prev => prev - 1), []),
125
+ flexValue = flex === !0 ? 1 : flex === !1 ? 0 : flex;
124
126
  return /* @__PURE__ */(0, import_jsx_runtime.jsx)(GroupProvider, {
125
127
  disablePassBorderRadius,
126
128
  vertical: orientation === "vertical",
@@ -134,9 +136,11 @@ function createGroup(verticalDefault) {
134
136
  size,
135
137
  flexDirection: orientation === "horizontal" ? "row" : "column",
136
138
  borderRadius,
139
+ flex: flexValue,
137
140
  ...restProps,
138
141
  children: wrapScroll({
139
142
  ...activeProps,
143
+ flex: flexValue,
140
144
  orientation
141
145
  }, indexedChildren)
142
146
  })
package/dist/cjs/Group.js CHANGED
@@ -29,8 +29,8 @@ __export(Group_exports, {
29
29
  useGroupItem: () => useGroupItem
30
30
  });
31
31
  module.exports = __toCommonJS(Group_exports);
32
- var import_core = require("@tamagui/core"), import_create_context = require("@tamagui/create-context"), import_helpers = require("@tamagui/helpers"), import_stacks = require("@tamagui/stacks"), import_use_controllable_state = require("@tamagui/use-controllable-state"), import_react = __toESM(require("react"), 1), import_react_native = require("react-native-web"), import_useIndexedChildren = require("./useIndexedChildren"), import_jsx_runtime = require("react/jsx-runtime");
33
- const GROUP_NAME = "Group", [createGroupContext, createGroupScope] = (0, import_create_context.createContextScope)(GROUP_NAME), [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME), GroupFrame = (0, import_core.styled)(import_stacks.ThemeableStack, {
32
+ var import_core = require("@tamagui/core"), import_create_context = require("@tamagui/create-context"), import_helpers = require("@tamagui/helpers"), import_stacks = require("@tamagui/stacks"), import_use_controllable_state = require("@tamagui/use-controllable-state"), import_react = __toESM(require("react"), 1), import_react_native = require("react-native-web"), import_useIndexedChildren = require("./useIndexedChildren"), import_spacer = require("@tamagui/spacer"), import_jsx_runtime = require("react/jsx-runtime");
33
+ const GROUP_NAME = "Group", [createGroupContext, createGroupScope] = (0, import_create_context.createContextScope)(GROUP_NAME), [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME), GroupFrame = (0, import_core.styled)(import_stacks.YStack, {
34
34
  name: "GroupFrame",
35
35
  variants: {
36
36
  unstyled: {
@@ -54,11 +54,11 @@ function createGroup(verticalDefault) {
54
54
  children: childrenProp,
55
55
  space,
56
56
  size = "$true",
57
+ flex,
57
58
  spaceDirection,
58
59
  separator,
59
60
  scrollable,
60
- axis = verticalDefault ? "vertical" : "horizontal",
61
- orientation = axis,
61
+ orientation = verticalDefault ? "vertical" : "horizontal",
62
62
  disabled: disabledProp,
63
63
  disablePassBorderRadius: disablePassBorderRadiusProp,
64
64
  borderRadius,
@@ -81,7 +81,7 @@ function createGroup(verticalDefault) {
81
81
  };
82
82
  return cloneElementWithPropOrder(child, props2);
83
83
  }), indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)(
84
- (0, import_core.spacedChildren)({
84
+ (0, import_spacer.spacedChildren)({
85
85
  direction: spaceDirection,
86
86
  separator,
87
87
  space,
@@ -93,7 +93,7 @@ function createGroup(verticalDefault) {
93
93
  ), onItemUnmount = import_react.default.useCallback(
94
94
  () => setItemChildrenCount((prev) => prev - 1),
95
95
  []
96
- );
96
+ ), flexValue = flex === !0 ? 1 : flex === !1 ? 0 : flex;
97
97
  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
98
98
  GroupProvider,
99
99
  {
@@ -111,8 +111,12 @@ function createGroup(verticalDefault) {
111
111
  size,
112
112
  flexDirection: orientation === "horizontal" ? "row" : "column",
113
113
  borderRadius,
114
+ flex: flexValue,
114
115
  ...restProps,
115
- children: wrapScroll({ ...activeProps, orientation }, indexedChildren)
116
+ children: wrapScroll(
117
+ { ...activeProps, flex: flexValue, orientation },
118
+ indexedChildren
119
+ )
116
120
  }
117
121
  )
118
122
  }
@@ -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
  }
@@ -49,10 +49,11 @@ var import_jsx_runtime = require("react/jsx-runtime"),
49
49
  import_react = __toESM(require("react"), 1),
50
50
  import_react_native = require("react-native"),
51
51
  import_useIndexedChildren = require("./useIndexedChildren.native.js"),
52
+ import_spacer = require("@tamagui/spacer"),
52
53
  GROUP_NAME = "Group",
53
54
  [createGroupContext, createGroupScope] = (0, import_create_context.createContextScope)(GROUP_NAME),
54
55
  [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME),
55
- GroupFrame = (0, import_core.styled)(import_stacks.ThemeableStack, {
56
+ GroupFrame = (0, import_core.styled)(import_stacks.YStack, {
56
57
  name: "GroupFrame",
57
58
  variants: {
58
59
  unstyled: {
@@ -84,11 +85,11 @@ function createGroup(verticalDefault) {
84
85
  children: childrenProp,
85
86
  space,
86
87
  size = "$true",
88
+ flex,
87
89
  spaceDirection,
88
90
  separator,
89
91
  scrollable,
90
- axis = verticalDefault ? "vertical" : "horizontal",
91
- orientation = axis,
92
+ orientation = verticalDefault ? "vertical" : "horizontal",
92
93
  disabled: disabledProp,
93
94
  disablePassBorderRadius: disablePassBorderRadiusProp,
94
95
  borderRadius,
@@ -123,7 +124,7 @@ function createGroup(verticalDefault) {
123
124
  };
124
125
  return cloneElementWithPropOrder(child, _$props);
125
126
  }),
126
- indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)((0, import_core.spacedChildren)({
127
+ indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)((0, import_spacer.spacedChildren)({
127
128
  direction: spaceDirection,
128
129
  separator,
129
130
  space,
@@ -138,7 +139,8 @@ function createGroup(verticalDefault) {
138
139
  return setItemChildrenCount(function (prev) {
139
140
  return prev - 1;
140
141
  });
141
- }, []);
142
+ }, []),
143
+ flexValue = flex === !0 ? 1 : flex === !1 ? 0 : flex;
142
144
  return /* @__PURE__ */(0, import_jsx_runtime.jsx)(GroupProvider, {
143
145
  disablePassBorderRadius,
144
146
  vertical: orientation === "vertical",
@@ -153,9 +155,11 @@ function createGroup(verticalDefault) {
153
155
  size,
154
156
  flexDirection: orientation === "horizontal" ? "row" : "column",
155
157
  borderRadius,
158
+ flex: flexValue,
156
159
  ...restProps,
157
160
  children: wrapScroll({
158
161
  ...activeProps,
162
+ flex: flexValue,
159
163
  orientation
160
164
  }, indexedChildren)
161
165
  })
@@ -1 +1 @@
1
- {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Group_exports","__export","Group","GroupFrame","XGroup","YGroup","useGroupItem","module","exports","import_jsx_runtime","require","import_core","import_create_context","import_helpers","import_stacks","import_use_controllable_state","import_react","__toESM","import_react_native","import_useIndexedChildren","GROUP_NAME","createGroupContext","createGroupScope","createContextScope","GroupProvider","useGroupContext","styled","ThemeableStack","name","variants","unstyled","false","size","val","param","tokens","_tokens_radius_val","_ref","borderRadius","radius","$true","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","hasRadius","childrenArray","default","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","_child_props_disabled","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","_$props","cloneElementWithPropOrder","indexedChildren","useIndexedChildren","spacedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","jsx","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","forcePlacement","groupItemProps","cloneElement","childrenProps","treeIndex","useIndex","context","useEffect","Error","index","maxIndex","_childrenProps_disabled","propsToPass","showScrollIndicator","ScrollView","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Group_exports","__export","Group","GroupFrame","XGroup","YGroup","useGroupItem","module","exports","import_jsx_runtime","require","import_core","import_create_context","import_helpers","import_stacks","import_use_controllable_state","import_react","__toESM","import_react_native","import_useIndexedChildren","import_spacer","GROUP_NAME","createGroupContext","createGroupScope","createContextScope","GroupProvider","useGroupContext","styled","YStack","name","variants","unstyled","false","size","val","param","tokens","_tokens_radius_val","_ref","borderRadius","radius","$true","defaultVariants","process","env","TAMAGUI_HEADLESS","createGroup","verticalDefault","withStaticProperties","styleable","props","ref","activeProps","useProps","__scopeGroup","children","childrenProp","space","flex","spaceDirection","separator","scrollable","orientation","disabled","disabledProp","disablePassBorderRadius","disablePassBorderRadiusProp","forceUseItem","restProps","vertical","itemChildrenCount","setItemChildrenCount","useControllableState","defaultProp","isUsingItems","getVariableValue","getTokens","hasRadius","childrenArray","default","Children","toArray","filter","isValidElement","map","child","i","type","Fragment","_child_props_disabled","isFirst","isLast","length","radiusStyles","getBorderRadius","disable","_$props","cloneElementWithPropOrder","indexedChildren","useIndexedChildren","spacedChildren","direction","onItemMount","useCallback","prev","onItemUnmount","flexValue","jsx","scope","flexDirection","wrapScroll","Item","GroupItem","forwardRef","forcePlacement","groupItemProps","cloneElement","childrenProps","treeIndex","useIndex","context","useEffect","Error","index","maxIndex","_childrenProps_disabled","propsToPass","showScrollIndicator","ScrollView","showsVerticalScrollIndicator","horizontal","showsHorizontalScrollIndicator","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"],"sources":["../../src/Group.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/dist/esm/Group.js CHANGED
@@ -1,19 +1,14 @@
1
- import {
2
- getTokens,
3
- getVariableValue,
4
- spacedChildren,
5
- styled,
6
- useProps
7
- } from "@tamagui/core";
1
+ import { getTokens, getVariableValue, styled, useProps } from "@tamagui/core";
8
2
  import { createContextScope } from "@tamagui/create-context";
9
3
  import { withStaticProperties } from "@tamagui/helpers";
10
- import { ThemeableStack } from "@tamagui/stacks";
4
+ import { YStack } from "@tamagui/stacks";
11
5
  import { useControllableState } from "@tamagui/use-controllable-state";
12
6
  import React from "react";
13
7
  import { ScrollView } from "react-native-web";
14
8
  import { useIndex, useIndexedChildren } from "./useIndexedChildren";
9
+ import { spacedChildren } from "@tamagui/spacer";
15
10
  import { jsx } from "react/jsx-runtime";
16
- const GROUP_NAME = "Group", [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME), [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME), GroupFrame = styled(ThemeableStack, {
11
+ const GROUP_NAME = "Group", [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME), [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME), GroupFrame = styled(YStack, {
17
12
  name: "GroupFrame",
18
13
  variants: {
19
14
  unstyled: {
@@ -37,11 +32,11 @@ function createGroup(verticalDefault) {
37
32
  children: childrenProp,
38
33
  space,
39
34
  size = "$true",
35
+ flex,
40
36
  spaceDirection,
41
37
  separator,
42
38
  scrollable,
43
- axis = verticalDefault ? "vertical" : "horizontal",
44
- orientation = axis,
39
+ orientation = verticalDefault ? "vertical" : "horizontal",
45
40
  disabled: disabledProp,
46
41
  disablePassBorderRadius: disablePassBorderRadiusProp,
47
42
  borderRadius,
@@ -76,7 +71,7 @@ function createGroup(verticalDefault) {
76
71
  ), onItemUnmount = React.useCallback(
77
72
  () => setItemChildrenCount((prev) => prev - 1),
78
73
  []
79
- );
74
+ ), flexValue = flex === !0 ? 1 : flex === !1 ? 0 : flex;
80
75
  return /* @__PURE__ */ jsx(
81
76
  GroupProvider,
82
77
  {
@@ -94,8 +89,12 @@ function createGroup(verticalDefault) {
94
89
  size,
95
90
  flexDirection: orientation === "horizontal" ? "row" : "column",
96
91
  borderRadius,
92
+ flex: flexValue,
97
93
  ...restProps,
98
- children: wrapScroll({ ...activeProps, orientation }, indexedChildren)
94
+ children: wrapScroll(
95
+ { ...activeProps, flex: flexValue, orientation },
96
+ indexedChildren
97
+ )
99
98
  }
100
99
  )
101
100
  }
@@ -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,OACK;AAEP,SAAS,0BAA0B;AACnC,SAAS,4BAA4B;AACrC,SAAS,sBAAsB;AAC/B,SAAS,4BAA4B;AACrC,OAAO,WAAW;AAClB,SAAS,kBAAkB;AAC3B,SAAS,UAAU,0BAA0B;AAiKnC;AApJV,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;AAuBD,SAAS,YAAY,iBAA0B;AAC7C,SAAO;AAAA,IACL,WAAW,UAAwC,CAAC,OAAO,QAAQ;AACjE,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,GAEK,eAAe,oBAAoB,GAGnC,SACJ,iBACC,OAAO,iBAAiB,UAAU,EAAE,OAAO,IAAI,CAAC,IAAI,IAAI,SAGrD,0BAA0B,+BAA+B,EAD7C,WAAW,SAGvB,gBAAgB,MAAM,SAAS,QAAQ,YAAY,GACnD,WAAW,eACb,MAAM,SAAS,QAAQ,YAAY,EAAE,OAAO,MAAM,cAAc,IAChE,cAAc,IAAI,CAAC,OAAO,MAAM;AAC9B,YAAI,CAAC,MAAM,eAAe,KAAK,KAAK,MAAM,SAAS,MAAM;AACvD,iBAAO;AAET,cAAM,WACH,MAAM,MAAkC,YAAY,cAEjD,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,GAEDA,SAAQ;AAAA,UACZ;AAAA,UACA,GAAG;AAAA,QACL;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,MAAM;AAAA,EACtB,CACE,OAEA,SACG;AACH,UAAM,EAAE,cAAc,UAAU,eAAe,IAAI,OAC7C,iBAAiB;AAAA,MACrB;AAAA,QACE,UAAU,MAAM,eAAe,QAAQ,IACjC,SAAS,MAAkC,WAC7C;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAEA,WAAI,CAAC,MAAM,eAAe,QAAQ,KAAK,SAAS,SAAS,MAAM,WACtD,WAGF,MAAM,aAAa,UAAU,cAAc;AAAA,EACpD;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,IAGG,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,UACtC,MAAM,aAAa,EAAE,GAAG,OAAO,OAAO,KAAK,GAAG,EAAE,GAAG,MAAM,OAAO,GAAG,MAAM,CAAC;",
4
+ "mappings": "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",
5
5
  "names": ["props"]
6
6
  }
@@ -1,16 +1,17 @@
1
- import { getTokens, getVariableValue, spacedChildren, styled, useProps } from "@tamagui/core";
1
+ import { getTokens, getVariableValue, styled, useProps } from "@tamagui/core";
2
2
  import { createContextScope } from "@tamagui/create-context";
3
3
  import { withStaticProperties } from "@tamagui/helpers";
4
- import { ThemeableStack } from "@tamagui/stacks";
4
+ import { YStack } from "@tamagui/stacks";
5
5
  import { useControllableState } from "@tamagui/use-controllable-state";
6
6
  import React from "react";
7
7
  import { ScrollView } from "react-native-web";
8
8
  import { useIndex, useIndexedChildren } from "./useIndexedChildren.mjs";
9
+ import { spacedChildren } from "@tamagui/spacer";
9
10
  import { jsx } from "react/jsx-runtime";
10
11
  const GROUP_NAME = "Group",
11
12
  [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME),
12
13
  [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME),
13
- GroupFrame = styled(ThemeableStack, {
14
+ GroupFrame = styled(YStack, {
14
15
  name: "GroupFrame",
15
16
  variants: {
16
17
  unstyled: {
@@ -36,11 +37,11 @@ function createGroup(verticalDefault) {
36
37
  children: childrenProp,
37
38
  space,
38
39
  size = "$true",
40
+ flex,
39
41
  spaceDirection,
40
42
  separator,
41
43
  scrollable,
42
- axis = verticalDefault ? "vertical" : "horizontal",
43
- orientation = axis,
44
+ orientation = verticalDefault ? "vertical" : "horizontal",
44
45
  disabled: disabledProp,
45
46
  disablePassBorderRadius: disablePassBorderRadiusProp,
46
47
  borderRadius,
@@ -80,7 +81,8 @@ function createGroup(verticalDefault) {
80
81
  children
81
82
  })),
82
83
  onItemMount = React.useCallback(() => setItemChildrenCount(prev => prev + 1), []),
83
- onItemUnmount = React.useCallback(() => setItemChildrenCount(prev => prev - 1), []);
84
+ onItemUnmount = React.useCallback(() => setItemChildrenCount(prev => prev - 1), []),
85
+ flexValue = flex === !0 ? 1 : flex === !1 ? 0 : flex;
84
86
  return /* @__PURE__ */jsx(GroupProvider, {
85
87
  disablePassBorderRadius,
86
88
  vertical: orientation === "vertical",
@@ -94,9 +96,11 @@ function createGroup(verticalDefault) {
94
96
  size,
95
97
  flexDirection: orientation === "horizontal" ? "row" : "column",
96
98
  borderRadius,
99
+ flex: flexValue,
97
100
  ...restProps,
98
101
  children: wrapScroll({
99
102
  ...activeProps,
103
+ flex: flexValue,
100
104
  orientation
101
105
  }, indexedChildren)
102
106
  })
@@ -1 +1 @@
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
+ {"version":3,"names":["getTokens","getVariableValue","styled","useProps","createContextScope","withStaticProperties","YStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","spacedChildren","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","flex","spaceDirection","separator","scrollable","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","flexValue","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,16 +1,17 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- import { getTokens, getVariableValue, spacedChildren, styled, useProps } from "@tamagui/core";
2
+ import { getTokens, getVariableValue, styled, useProps } from "@tamagui/core";
3
3
  import { createContextScope } from "@tamagui/create-context";
4
4
  import { withStaticProperties } from "@tamagui/helpers";
5
- import { ThemeableStack } from "@tamagui/stacks";
5
+ import { YStack } from "@tamagui/stacks";
6
6
  import { useControllableState } from "@tamagui/use-controllable-state";
7
7
  import React from "react";
8
8
  import { ScrollView } from "react-native";
9
9
  import { useIndex, useIndexedChildren } from "./useIndexedChildren.native.js";
10
+ import { spacedChildren } from "@tamagui/spacer";
10
11
  var GROUP_NAME = "Group",
11
12
  [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME),
12
13
  [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME),
13
- GroupFrame = styled(ThemeableStack, {
14
+ GroupFrame = styled(YStack, {
14
15
  name: "GroupFrame",
15
16
  variants: {
16
17
  unstyled: {
@@ -42,11 +43,11 @@ function createGroup(verticalDefault) {
42
43
  children: childrenProp,
43
44
  space,
44
45
  size = "$true",
46
+ flex,
45
47
  spaceDirection,
46
48
  separator,
47
49
  scrollable,
48
- axis = verticalDefault ? "vertical" : "horizontal",
49
- orientation = axis,
50
+ orientation = verticalDefault ? "vertical" : "horizontal",
50
51
  disabled: disabledProp,
51
52
  disablePassBorderRadius: disablePassBorderRadiusProp,
52
53
  borderRadius,
@@ -96,7 +97,8 @@ function createGroup(verticalDefault) {
96
97
  return setItemChildrenCount(function (prev) {
97
98
  return prev - 1;
98
99
  });
99
- }, []);
100
+ }, []),
101
+ flexValue = flex === !0 ? 1 : flex === !1 ? 0 : flex;
100
102
  return /* @__PURE__ */_jsx(GroupProvider, {
101
103
  disablePassBorderRadius,
102
104
  vertical: orientation === "vertical",
@@ -111,9 +113,11 @@ function createGroup(verticalDefault) {
111
113
  size,
112
114
  flexDirection: orientation === "horizontal" ? "row" : "column",
113
115
  borderRadius,
116
+ flex: flexValue,
114
117
  ...restProps,
115
118
  children: wrapScroll({
116
119
  ...activeProps,
120
+ flex: flexValue,
117
121
  orientation
118
122
  }, indexedChildren)
119
123
  })
@@ -1 +1 @@
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":[]}
1
+ {"version":3,"names":["jsx","_jsx","getTokens","getVariableValue","styled","useProps","createContextScope","withStaticProperties","YStack","useControllableState","React","ScrollView","useIndex","useIndexedChildren","spacedChildren","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","flex","spaceDirection","separator","scrollable","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","flexValue","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,19 +1,14 @@
1
- import {
2
- getTokens,
3
- getVariableValue,
4
- spacedChildren,
5
- styled,
6
- useProps
7
- } from "@tamagui/core";
1
+ import { getTokens, getVariableValue, styled, useProps } from "@tamagui/core";
8
2
  import { createContextScope } from "@tamagui/create-context";
9
3
  import { withStaticProperties } from "@tamagui/helpers";
10
- import { ThemeableStack } from "@tamagui/stacks";
4
+ import { YStack } from "@tamagui/stacks";
11
5
  import { useControllableState } from "@tamagui/use-controllable-state";
12
6
  import React from "react";
13
7
  import { ScrollView } from "react-native-web";
14
8
  import { useIndex, useIndexedChildren } from "./useIndexedChildren";
9
+ import { spacedChildren } from "@tamagui/spacer";
15
10
  import { jsx } from "react/jsx-runtime";
16
- const GROUP_NAME = "Group", [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME), [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME), GroupFrame = styled(ThemeableStack, {
11
+ const GROUP_NAME = "Group", [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME), [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME), GroupFrame = styled(YStack, {
17
12
  name: "GroupFrame",
18
13
  variants: {
19
14
  unstyled: {
@@ -37,11 +32,11 @@ function createGroup(verticalDefault) {
37
32
  children: childrenProp,
38
33
  space,
39
34
  size = "$true",
35
+ flex,
40
36
  spaceDirection,
41
37
  separator,
42
38
  scrollable,
43
- axis = verticalDefault ? "vertical" : "horizontal",
44
- orientation = axis,
39
+ orientation = verticalDefault ? "vertical" : "horizontal",
45
40
  disabled: disabledProp,
46
41
  disablePassBorderRadius: disablePassBorderRadiusProp,
47
42
  borderRadius,
@@ -76,7 +71,7 @@ function createGroup(verticalDefault) {
76
71
  ), onItemUnmount = React.useCallback(
77
72
  () => setItemChildrenCount((prev) => prev - 1),
78
73
  []
79
- );
74
+ ), flexValue = flex === !0 ? 1 : flex === !1 ? 0 : flex;
80
75
  return /* @__PURE__ */ jsx(
81
76
  GroupProvider,
82
77
  {
@@ -94,8 +89,12 @@ function createGroup(verticalDefault) {
94
89
  size,
95
90
  flexDirection: orientation === "horizontal" ? "row" : "column",
96
91
  borderRadius,
92
+ flex: flexValue,
97
93
  ...restProps,
98
- children: wrapScroll({ ...activeProps, orientation }, indexedChildren)
94
+ children: wrapScroll(
95
+ { ...activeProps, flex: flexValue, orientation },
96
+ indexedChildren
97
+ )
99
98
  }
100
99
  )
101
100
  }