@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.
- package/dist/cjs/Group.cjs +9 -5
- package/dist/cjs/Group.js +11 -7
- package/dist/cjs/Group.js.map +1 -1
- package/dist/cjs/Group.native.js +9 -5
- package/dist/cjs/Group.native.js.map +1 -1
- package/dist/esm/Group.js +12 -13
- package/dist/esm/Group.js.map +1 -1
- package/dist/esm/Group.mjs +10 -6
- package/dist/esm/Group.mjs.map +1 -1
- package/dist/esm/Group.native.js +10 -6
- package/dist/esm/Group.native.js.map +1 -1
- package/dist/jsx/Group.js +12 -13
- package/dist/jsx/Group.js.map +1 -1
- package/dist/jsx/Group.mjs +10 -6
- package/dist/jsx/Group.mjs.map +1 -1
- package/dist/jsx/Group.native.js +9 -5
- package/dist/jsx/Group.native.js.map +1 -1
- package/package.json +8 -7
- package/src/Group.tsx +15 -17
- package/types/Group.d.ts +215 -295
- package/types/Group.d.ts.map +1 -1
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
|
|
4
|
+
"mappings": "AACA,SAAS,WAAW,kBAAkB,QAAQ,gBAAgB;AAE9D,SAAS,0BAA0B;AACnC,SAAS,4BAA4B;AACrC,SAAS,cAAc;AACvB,SAAS,4BAA4B;AACrC,OAAO,WAAW;AAClB,SAAS,kBAAkB;AAC3B,SAAS,UAAU,0BAA0B;AAC7C,SAAS,sBAAuC;AAgKtC;AAnJV,MAAM,aAAa,SAGb,CAAC,oBAAoB,gBAAgB,IAAI,mBAAmB,UAAU,GACtE,CAAC,eAAe,eAAe,IAAI,mBAAsC,UAAU,GAE5E,aAAa,OAAO,QAAQ;AAAA,EACvC,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;AAmBD,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;AAAA,QACA,cAAc,kBAAkB,aAAa;AAAA,QAC7C,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,GAGM,YAAa,SAAS,KAAO,IAAI,SAAS,KAAQ,IAAI;AAE5D,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,cACA,MAAM;AAAA,cACL,GAAG;AAAA,cAEH;AAAA,gBACC,EAAE,GAAG,aAAa,MAAM,WAAW,YAAY;AAAA,gBAC/C;AAAA,cACF;AAAA;AAAA,UACF;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;",
|
|
5
5
|
"names": ["props"]
|
|
6
6
|
}
|
package/dist/jsx/Group.mjs
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import { getTokens, getVariableValue,
|
|
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 {
|
|
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(
|
|
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
|
-
|
|
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
|
})
|
package/dist/jsx/Group.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getTokens","getVariableValue","
|
|
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":"AACA,SAASA,SAAA,EAAWC,gBAAA,EAAkBC,MAAA,EAAQC,QAAA,QAAgB;AAE9D,SAASC,kBAAA,QAA0B;AACnC,SAASC,oBAAA,QAA4B;AACrC,SAASC,MAAA,QAAc;AACvB,SAASC,oBAAA,QAA4B;AACrC,OAAOC,KAAA,MAAW;AAClB,SAASC,UAAA,QAAkB;AAC3B,SAASC,QAAA,EAAUC,kBAAA,QAA0B;AAC7C,SAASC,cAAA,QAAuC;AAgKtC,SAAAC,GAAA;AAnJV,MAAMC,UAAA,GAAa;EAGb,CAACC,kBAAA,EAAoBC,gBAAgB,IAAIZ,kBAAA,CAAmBU,UAAU;EACtE,CAACG,aAAA,EAAeC,eAAe,IAAIH,kBAAA,CAAsCD,UAAU;EAE5EK,UAAA,GAAajB,MAAA,CAAOI,MAAA,EAAQ;IACvCc,IAAA,EAAM;IAENC,QAAA,EAAU;MACRC,QAAA,EAAU;QACRC,KAAA,EAAO;UACLC,IAAA,EAAM;QACR;MACF;MAEAA,IAAA,EAAMA,CAACC,GAAA,EAAK;QAAEC;MAAO,OAEZ;QACLC,YAAA,EAFmBD,MAAA,CAAOE,MAAA,CAAOH,GAAG,KAAKA,GAAA,IAAOC,MAAA,CAAOE,MAAA,CAAOC;MAGhE;IAEJ;IAEAC,eAAA,EAAiB;MACfR,QAAA,EAAUS,OAAA,CAAQC,GAAA,CAAIC,gBAAA,KAAqB;IAC7C;EACF,CAAC;AAmBD,SAASC,YAAYC,eAAA,EAA0B;EAC7C,OAAO9B,oBAAA,CACLc,UAAA,CAAWiB,SAAA,CAAwC,CAACC,KAAA,EAAOC,GAAA,KAAQ;IACjE,MAAMC,WAAA,GAAcpC,QAAA,CAASkC,KAAK;MAE5B;QACJG,YAAA;QACAC,QAAA,EAAUC,YAAA;QACVC,KAAA;QACAnB,IAAA,GAAO;QACPoB,IAAA;QACAC,cAAA;QACAC,SAAA;QACAC,UAAA;QACAC,WAAA,GAAcb,eAAA,GAAkB,aAAa;QAC7Cc,QAAA,EAAUC,YAAA;QACVC,uBAAA,EAAyBC,2BAAA;QACzBzB,YAAA;QACA0B,YAAA;QACA,GAAGC;MACL,IAAIf,WAAA;MAEEgB,QAAA,GAAWP,WAAA,KAAgB;MAC3B,CAACQ,iBAAA,EAAmBC,oBAAoB,IAAIlD,oBAAA,CAAqB;QACrEmD,WAAA,EAAaL,YAAA,GAAe,IAAI;MAClC,CAAC;MAEKM,YAAA,GAAeH,iBAAA,GAAoB;MAGnC5B,MAAA,GACJD,YAAA,KACCH,IAAA,GAAOvB,gBAAA,CAAiBD,SAAA,CAAU,EAAE4B,MAAA,CAAOJ,IAAI,CAAC,IAAI,IAAI;MAGrD2B,uBAAA,GAA0BC,2BAAA,IAA+B,EAD7CxB,MAAA,KAAW;MAGvBgC,aAAA,GAAgBpD,KAAA,CAAMqD,QAAA,CAASC,OAAA,CAAQpB,YAAY;MACnDD,QAAA,GAAWkB,YAAA,GACbnD,KAAA,CAAMqD,QAAA,CAASC,OAAA,CAAQpB,YAAY,EAAEqB,MAAA,CAAOvD,KAAA,CAAMwD,cAAc,IAChEJ,aAAA,CAAcK,GAAA,CAAI,CAACC,KAAA,EAAOC,CAAA,KAAM;QAC9B,IAAI,CAAC3D,KAAA,CAAMwD,cAAA,CAAeE,KAAK,KAAKA,KAAA,CAAME,IAAA,KAAS5D,KAAA,CAAM6D,QAAA,EACvD,OAAOH,KAAA;QAET,MAAMjB,QAAA,GACHiB,KAAA,CAAM7B,KAAA,CAAkCY,QAAA,IAAYC,YAAA;UAEjDoB,OAAA,GAAUH,CAAA,KAAM;UAChBI,MAAA,GAASJ,CAAA,KAAMP,aAAA,CAAcY,MAAA,GAAS;UAEtCC,YAAA,GACJtB,uBAAA,KAA4B,KACxB,OACAuB,eAAA,CAAgB;YACdJ,OAAA;YACAC,MAAA;YACA3C,MAAA;YACA2B,QAAA;YACAoB,OAAA,EAASxB;UACX,CAAC;UAEDyB,MAAA,GAAQ;YACZ3B,QAAA;YACA,GAAGwB;UACL;QAEA,OAAOI,yBAAA,CAA0BX,KAAA,EAAOU,MAAK;MAC/C,CAAC;MAECE,eAAA,GAAkBnE,kBAAA,CACtBC,cAAA,CAAe;QACbmE,SAAA,EAAWlC,cAAA;QACXC,SAAA;QACAH,KAAA;QACAF;MACF,CAAC,CACH;MAEMuC,WAAA,GAAcxE,KAAA,CAAMyE,WAAA,CACxB,MAAMxB,oBAAA,CAAsByB,IAAA,IAASA,IAAA,GAAO,CAAC,GAC7C,EACF;MACMC,aAAA,GAAgB3E,KAAA,CAAMyE,WAAA,CAC1B,MAAMxB,oBAAA,CAAsByB,IAAA,IAASA,IAAA,GAAO,CAAC,GAC7C,EACF;MAGME,SAAA,GAAaxC,IAAA,KAAS,KAAO,IAAIA,IAAA,KAAS,KAAQ,IAAIA,IAAA;IAE5D,OACE,eAAA/B,GAAA,CAACI,aAAA;MACCkC,uBAAA;MACAI,QAAA,EAAUP,WAAA,KAAgB;MAE1BpB,MAAA;MACAqB,QAAA,EAAUC,YAAA;MACV8B,WAAA;MACAG,aAAA;MACAE,KAAA,EAAO7C,YAAA;MAEPC,QAAA,iBAAA5B,GAAA,CAACM,UAAA;QACCmB,GAAA;QACAd,IAAA;QACA8D,aAAA,EAAetC,WAAA,KAAgB,eAAe,QAAQ;QACtDrB,YAAA;QACAiB,IAAA,EAAMwC,SAAA;QACL,GAAG9B,SAAA;QAEHb,QAAA,EAAA8C,UAAA,CACC;UAAE,GAAGhD,WAAA;UAAaK,IAAA,EAAMwC,SAAA;UAAWpC;QAAY,GAC/C8B,eACF;MAAA,CACF;IAAA,CACF;EAEJ,CAAC,GACD;IACEU,IAAA,EAAMC;EACR,CACF;AACF;AAUA,MAAMA,SAAA,GAAYjF,KAAA,CAAMkF,UAAA,CACtB,CACErD,KAAA,EAEAsD,IAAA,KACG;IACH,MAAM;QAAEnD,YAAA;QAAcC,QAAA;QAAUmD;MAAe,IAAIvD,KAAA;MAC7CwD,cAAA,GAAiBC,YAAA,CACrB;QACE7C,QAAA,EAAUzC,KAAA,CAAMwD,cAAA,CAAevB,QAAQ,IACjCA,QAAA,CAASJ,KAAA,CAAkCY,QAAA,GAC7C;MACN,GACA2C,cAAA,EACApD,YACF;IAEA,OAAI,CAAChC,KAAA,CAAMwD,cAAA,CAAevB,QAAQ,KAAKA,QAAA,CAAS2B,IAAA,KAAS5D,KAAA,CAAM6D,QAAA,GACtD5B,QAAA,GAGFjC,KAAA,CAAMuF,YAAA,CAAatD,QAAA,EAAUoD,cAAc;EACpD,CACF;EAEaC,YAAA,GAAeA,CAC1BE,aAAA,EACAJ,cAAA,EACApD,YAAA,KACG;IACH,MAAMyD,SAAA,GAAYvF,QAAA,CAAS;MACrBwF,OAAA,GAAUhF,eAAA,CAAgB,aAAasB,YAAY;IASzD,IAPAhC,KAAA,CAAM2F,SAAA,CAAU,OACdD,OAAA,CAAQlB,WAAA,CAAY,GACb,MAAM;MACXkB,OAAA,CAAQf,aAAA,CAAc;IACxB,IACC,EAAE,GAED,CAACc,SAAA,EACH,MAAMG,KAAA,CAAM,qDAAqD;IAGnE,MAAM9B,OAAA,GACJsB,cAAA,KAAmB,WAAYA,cAAA,KAAmB,UAAUK,SAAA,CAAUI,KAAA,KAAU;MAC5E9B,MAAA,GACJqB,cAAA,KAAmB,UAClBA,cAAA,KAAmB,WAAWK,SAAA,CAAUI,KAAA,KAAUJ,SAAA,CAAUK,QAAA;IAI/D,IAAIC,WAAA,GAAmC;MACrCtD,QAAA,EAHe+C,aAAA,CAAc/C,QAAA,IAAYiD,OAAA,CAAQjD;IAInD;IAEA,IAAIiD,OAAA,CAAQ/C,uBAAA,KAA4B,IAAM;MAC5C,MAAMxB,YAAA,GAAe+C,eAAA,CAAgB;QACnC9C,MAAA,EAAQsE,OAAA,CAAQtE,MAAA;QAChB0C,OAAA;QACAC,MAAA;QACAhB,QAAA,EAAU2C,OAAA,CAAQ3C,QAAA;QAClBoB,OAAA,EAASuB,OAAA,CAAQ/C;MACnB,CAAC;MACD,OAAO;QAAE,GAAGoD,WAAA;QAAa,GAAG5E;MAAa;IAC3C;IACA,OAAO4E,WAAA;EACT;EAEaC,KAAA,GAAQtE,WAAA,CAAY,EAAI;EACxBuE,MAAA,GAASD,KAAA;EACTE,MAAA,GAASxE,WAAA,CAAY,EAAK;EAEjCqD,UAAA,GAAaA,CACjB;IAAExC,UAAA;IAAYC,WAAA;IAAa2D,mBAAA,GAAsB;EAAM,GACvDlE,QAAA,KAEIM,UAAA,GAEA,eAAAlC,GAAA,CAACJ,UAAA;IACE,IAAIuC,WAAA,KAAgB,cAAc;MACjC4D,4BAAA,EAA8BD;IAChC;IACC,IAAI3D,WAAA,KAAgB,gBAAgB;MACnC6D,UAAA,EAAY;MACZC,8BAAA,EAAgCH;IAClC;IAEClE;EAAA,CACH,IAGGA,QAAA;EAGHiC,eAAA,GAAkBA,CAAC;IACvBJ,OAAA;IACAC,MAAA;IACA3C,MAAA;IACA2B,QAAA;IACAoB;EACF,OAQS;IACLoC,mBAAA,EAAqBzC,OAAA,IAAWK,OAAA,KAAY,SAASA,OAAA,KAAY,UAAU/C,MAAA,GAAS;IACpFoF,oBAAA,EACErC,OAAA,KAAY,SACZA,OAAA,KAAY,UACVpB,QAAA,IAAYe,OAAA,IAAa,CAACf,QAAA,IAAYgB,MAAA,IACpC3C,MAAA,GACA;IACNqF,sBAAA,EACEtC,OAAA,KAAY,YACZA,OAAA,KAAY,YACVpB,QAAA,IAAYgB,MAAA,IAAY,CAAChB,QAAA,IAAYe,OAAA,IACnC1C,MAAA,GACA;IACNsF,uBAAA,EACE3C,MAAA,IAAUI,OAAA,KAAY,YAAYA,OAAA,KAAY,QAAQ/C,MAAA,GAAS;EACnE;EAGIiD,yBAAA,GAA4BA,CAACX,KAAA,EAAY7B,KAAA,KACtC7B,KAAA,CAAMuF,YAAA,CAAa;IAAE,GAAG7B,KAAA;IAAO7B,KAAA,EAAO;EAAK,GAAG;IAAE,GAAG6B,KAAA,CAAM7B,KAAA;IAAO,GAAGA;EAAM,CAAC","ignoreList":[]}
|
package/dist/jsx/Group.native.js
CHANGED
|
@@ -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.
|
|
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
|
-
|
|
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,
|
|
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":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","Group_exports","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","import_react_native","import_useIndexedChildren","GROUP_NAME","createGroupContext","createGroupScope","createContextScope","GroupProvider","useGroupContext","styled","
|
|
1
|
+
{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","Group_exports","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","import_react_native","import_useIndexedChildren","import_spacer","GROUP_NAME","createGroupContext","createGroupScope","createContextScope","GroupProvider","useGroupContext","styled","YStack","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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/group",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0-001",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"*.css"
|
|
@@ -39,14 +39,15 @@
|
|
|
39
39
|
}
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@tamagui/core": "
|
|
43
|
-
"@tamagui/create-context": "
|
|
44
|
-
"@tamagui/helpers": "
|
|
45
|
-
"@tamagui/
|
|
46
|
-
"@tamagui/
|
|
42
|
+
"@tamagui/core": "2.0.0-001",
|
|
43
|
+
"@tamagui/create-context": "2.0.0-001",
|
|
44
|
+
"@tamagui/helpers": "2.0.0-001",
|
|
45
|
+
"@tamagui/spacer": "2.0.0-001",
|
|
46
|
+
"@tamagui/stacks": "2.0.0-001",
|
|
47
|
+
"@tamagui/use-controllable-state": "2.0.0-001"
|
|
47
48
|
},
|
|
48
49
|
"devDependencies": {
|
|
49
|
-
"@tamagui/build": "
|
|
50
|
+
"@tamagui/build": "2.0.0-001",
|
|
50
51
|
"react": "*",
|
|
51
52
|
"react-native": "0.81.5"
|
|
52
53
|
},
|
package/src/Group.tsx
CHANGED
|
@@ -1,19 +1,14 @@
|
|
|
1
1
|
import type { GetProps, UnionableString, Variable } from '@tamagui/core'
|
|
2
|
-
import {
|
|
3
|
-
getTokens,
|
|
4
|
-
getVariableValue,
|
|
5
|
-
spacedChildren,
|
|
6
|
-
styled,
|
|
7
|
-
useProps,
|
|
8
|
-
} from '@tamagui/core'
|
|
2
|
+
import { getTokens, getVariableValue, styled, useProps } from '@tamagui/core'
|
|
9
3
|
import type { Scope } from '@tamagui/create-context'
|
|
10
4
|
import { createContextScope } from '@tamagui/create-context'
|
|
11
5
|
import { withStaticProperties } from '@tamagui/helpers'
|
|
12
|
-
import {
|
|
6
|
+
import { YStack } from '@tamagui/stacks'
|
|
13
7
|
import { useControllableState } from '@tamagui/use-controllable-state'
|
|
14
8
|
import React from 'react'
|
|
15
9
|
import { ScrollView } from 'react-native'
|
|
16
10
|
import { useIndex, useIndexedChildren } from './useIndexedChildren'
|
|
11
|
+
import { spacedChildren, type SpaceProps } from '@tamagui/spacer'
|
|
17
12
|
|
|
18
13
|
type DisablePassBorderRadius = boolean | 'bottom' | 'top' | 'start' | 'end'
|
|
19
14
|
|
|
@@ -32,7 +27,7 @@ type ScopedProps<P> = P & { __scopeGroup?: Scope }
|
|
|
32
27
|
const [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME)
|
|
33
28
|
const [GroupProvider, useGroupContext] = createGroupContext<GroupContextValue>(GROUP_NAME)
|
|
34
29
|
|
|
35
|
-
export const GroupFrame = styled(
|
|
30
|
+
export const GroupFrame = styled(YStack, {
|
|
36
31
|
name: 'GroupFrame',
|
|
37
32
|
|
|
38
33
|
variants: {
|
|
@@ -55,11 +50,7 @@ export const GroupFrame = styled(ThemeableStack, {
|
|
|
55
50
|
},
|
|
56
51
|
})
|
|
57
52
|
|
|
58
|
-
export type GroupExtraProps = {
|
|
59
|
-
/**
|
|
60
|
-
* @deprecated use `orientation` instead
|
|
61
|
-
*/
|
|
62
|
-
axis?: 'horizontal' | 'vertical'
|
|
53
|
+
export type GroupExtraProps = SpaceProps & {
|
|
63
54
|
orientation?: 'horizontal' | 'vertical'
|
|
64
55
|
scrollable?: boolean
|
|
65
56
|
/**
|
|
@@ -86,11 +77,11 @@ function createGroup(verticalDefault: boolean) {
|
|
|
86
77
|
children: childrenProp,
|
|
87
78
|
space,
|
|
88
79
|
size = '$true',
|
|
80
|
+
flex,
|
|
89
81
|
spaceDirection,
|
|
90
82
|
separator,
|
|
91
83
|
scrollable,
|
|
92
|
-
|
|
93
|
-
orientation = axis,
|
|
84
|
+
orientation = verticalDefault ? 'vertical' : 'horizontal',
|
|
94
85
|
disabled: disabledProp,
|
|
95
86
|
disablePassBorderRadius: disablePassBorderRadiusProp,
|
|
96
87
|
borderRadius,
|
|
@@ -163,6 +154,9 @@ function createGroup(verticalDefault: boolean) {
|
|
|
163
154
|
[]
|
|
164
155
|
)
|
|
165
156
|
|
|
157
|
+
// TODO improve type
|
|
158
|
+
const flexValue = (flex === true ? 1 : flex === false ? 0 : flex) as any
|
|
159
|
+
|
|
166
160
|
return (
|
|
167
161
|
<GroupProvider
|
|
168
162
|
disablePassBorderRadius={disablePassBorderRadius}
|
|
@@ -179,9 +173,13 @@ function createGroup(verticalDefault: boolean) {
|
|
|
179
173
|
size={size}
|
|
180
174
|
flexDirection={orientation === 'horizontal' ? 'row' : 'column'}
|
|
181
175
|
borderRadius={borderRadius}
|
|
176
|
+
flex={flexValue}
|
|
182
177
|
{...restProps}
|
|
183
178
|
>
|
|
184
|
-
{wrapScroll(
|
|
179
|
+
{wrapScroll(
|
|
180
|
+
{ ...activeProps, flex: flexValue, orientation },
|
|
181
|
+
indexedChildren
|
|
182
|
+
)}
|
|
185
183
|
</GroupFrame>
|
|
186
184
|
</GroupProvider>
|
|
187
185
|
)
|