tamagui 1.5.18 → 1.5.20

package/dist/cjs/views/Group.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Group_exports = {};
 __export(Group_exports, {
+  Group: () => Group,
   GroupFrame: () => GroupFrame,
   XGroup: () => XGroup,
   YGroup: () => YGroup
@@ -35,14 +36,25 @@ __export(Group_exports, {
 module.exports = __toCommonJS(Group_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_core = require("@tamagui/core");
+var import_create_context = require("@tamagui/create-context");
 var import_stacks = require("@tamagui/stacks");
+var import_use_controllable_state = require("@tamagui/use-controllable-state");
 var import_react = __toESM(require("react"));
 var import_react_native = require("react-native");
+var import_reforest = require("reforest");
+const GROUP_NAME = "Group";
+const [createGroupContext, createGroupScope] = (0, import_create_context.createContextScope)(GROUP_NAME);
+const [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME);
 const GroupFrame = (0, import_core.styled)(import_stacks.ThemeableStack, {
   name: "GroupFrame",
-  backgroundColor: "$background",
-  y: 0,
   variants: {
+    unstyled: {
+      false: {
+        y: 0,
+        backgroundColor: "$background",
+        size: "$true"
+      }
+    },
     size: (val, { tokens }) => {
       const borderRadius = tokens.radius[val] ?? val ?? tokens.radius["$true"];
       return {
@@ -51,97 +63,153 @@ const GroupFrame = (0, import_core.styled)(import_stacks.ThemeableStack, {
     }
   },
   defaultVariants: {
-    size: "$true"
+    unstyled: false
   }
 });
 function createGroup(verticalDefault) {
-  return (0, import_react.forwardRef)((props, ref) => {
-    const activeProps = (0, import_core.useMediaPropsActive)(props);
-    const {
-      children: childrenProp,
-      space,
-      size = "$true",
-      spaceDirection,
-      separator,
-      scrollable,
-      vertical = verticalDefault,
-      disabled: disabledProp,
-      disablePassBorderRadius: disablePassBorderRadiusProp,
-      borderRadius,
-      ...restProps
-    } = (0, import_core.getExpandedShorthands)(activeProps);
-    const radius = borderRadius ?? (size ? (0, import_core.getVariableValue)((0, import_core.getTokens)().radius[size]) - 1 : void 0);
-    const hasRadius = radius !== void 0;
-    const disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius;
-    const childrens = import_react.Children.toArray(childrenProp);
-    const children = childrens.map((child, i) => {
-      if (!(0, import_react.isValidElement)(child))
-        return child;
-      const disabled = child.props.disabled ?? disabledProp;
-      const isFirst = i === 0;
-      const isLast = i === childrens.length - 1;
-      const radiusStyles = disablePassBorderRadius ? null : {
-        borderTopLeftRadius: 0,
-        borderTopRightRadius: 0,
-        borderBottomLeftRadius: 0,
-        borderBottomRightRadius: 0,
-        ...hasRadius && {
-          ...isFirst && !vertical && {
-            borderTopLeftRadius: radius,
-            borderBottomLeftRadius: radius
-          },
-          ...isFirst && vertical && {
-            borderTopLeftRadius: radius,
-            borderTopRightRadius: radius
-          },
-          ...isLast && !vertical && {
-            borderTopRightRadius: radius,
-            borderBottomRightRadius: radius
-          },
-          ...isLast && vertical && {
-            borderBottomLeftRadius: radius,
-            borderBottomRightRadius: radius
-          }
+  return (0, import_core.withStaticProperties)(
+    (0, import_react.forwardRef)((props, ref) => {
+      const activeProps = (0, import_core.useMediaPropsActive)(props);
+      const {
+        __scopeGroup,
+        children: childrenProp,
+        space,
+        size = "$true",
+        spaceDirection,
+        separator,
+        scrollable,
+        axis = verticalDefault ? "vertical" : "horizontal",
+        disabled: disabledProp,
+        disablePassBorderRadius: disablePassBorderRadiusProp,
+        borderRadius,
+        forceUseItem,
+        ...restProps
+      } = (0, import_core.getExpandedShorthands)(activeProps);
+      const vertical = axis === "vertical";
+      const [itemChildrenCount, setItemChildrenCount] = (0, import_use_controllable_state.useControllableState)({
+        defaultProp: forceUseItem ? 1 : 0
+      });
+      const isUsingItems = itemChildrenCount > 0;
+      const radius = borderRadius ?? (size ? (0, import_core.getVariableValue)((0, import_core.getTokens)().radius[size]) - 1 : void 0);
+      const hasRadius = radius !== void 0;
+      const disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius;
+      const childrenArray = import_react.Children.toArray(childrenProp);
+      const children = isUsingItems ? childrenProp : childrenArray.map((child, i) => {
+        if (!(0, import_react.isValidElement)(child)) {
+          return child;
         }
-      };
-      const props2 = {
-        disabled,
-        ...(0, import_core.isTamaguiElement)(child) ? radiusStyles : { style: radiusStyles }
-      };
-      return cloneElementWithPropOrder(child, props2);
+        const disabled = child.props.disabled ?? disabledProp;
+        const isFirst = i === 0;
+        const isLast = i === childrenArray.length - 1;
+        const radiusStyles = disablePassBorderRadius ? null : getBorderRadius({ isFirst, isLast, radius, vertical });
+        const props2 = {
+          disabled,
+          ...(0, import_core.isTamaguiElement)(child) ? radiusStyles : { style: radiusStyles }
+        };
+        return cloneElementWithPropOrder(child, props2);
+      });
+      const indexedChildren = (0, import_reforest.useIndexedChildren)(
+        (0, import_core.spacedChildren)({
+          direction: spaceDirection,
+          separator,
+          space,
+          children
+        })
+      );
+      const onItemMount = import_react.default.useCallback(
+        () => setItemChildrenCount((prev) => prev + 1),
+        []
+      );
+      const onItemUnmount = import_react.default.useCallback(
+        () => setItemChildrenCount((prev) => prev - 1),
+        []
+      );
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        GroupProvider,
+        {
+          disablePassBorderRadius,
+          vertical: axis === "vertical",
+          radius,
+          disabled: disabledProp,
+          onItemMount,
+          onItemUnmount,
+          scope: __scopeGroup,
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+            GroupFrame,
+            {
+              ref,
+              size,
+              flexDirection: axis === "horizontal" ? "row" : "column",
+              borderRadius,
+              ...restProps,
+              children: wrapScroll(activeProps, indexedChildren)
+            }
+          )
+        }
+      );
+    }),
+    {
+      Item: GroupItem
+    }
+  );
+}
+const GroupItem = (props) => {
+  var _a;
+  const { __scopeGroup, children } = props;
+  const treeIndex = (0, import_reforest.useIndex)();
+  const context = useGroupContext("GroupItem", __scopeGroup);
+  import_react.default.useEffect(() => {
+    context.onItemMount();
+    return () => {
+      context.onItemUnmount();
+    };
+  }, []);
+  if (!(0, import_react.isValidElement)(children)) {
+    return children;
+  }
+  const disabled = children.props.disabled ?? context.disabled;
+  if (!treeIndex) {
+    throw Error("<Group.Item/> should only be used within a <Group/>");
+  }
+  const isFirst = treeIndex.index === 0;
+  const isLast = treeIndex.index === treeIndex.maxIndex;
+  let propsToPass = {
+    disabled
+  };
+  if (!context.disablePassBorderRadius) {
+    const radiusStyles = getBorderRadius({
+      radius: context.radius,
+      isFirst,
+      isLast,
+      vertical: context.vertical
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      GroupFrame,
-      {
-        ref,
-        size,
-        flexDirection: !vertical ? "row" : "column",
-        borderRadius,
-        ...restProps,
-        children: wrapScroll(
-          activeProps,
-          (0, import_core.spacedChildren)({
-            direction: spaceDirection,
-            separator,
-            space,
-            children
-          })
-        )
-      }
-    );
+    if ((0, import_core.isTamaguiElement)(children)) {
+      propsToPass = { ...propsToPass, ...radiusStyles };
+    } else {
+      propsToPass.style = radiusStyles;
+    }
+  }
+  return (0, import_react.cloneElement)(children, {
+    ...propsToPass,
+    // @ts-ignore
+    style: {
+      ...(_a = children.props) == null ? void 0 : _a["style"],
+      ...propsToPass.style
+    }
   });
-}
-const YGroup = createGroup(true);
+};
+const Group = createGroup(true);
+const YGroup = Group;
 const XGroup = createGroup(false);
-const wrapScroll = ({ scrollable, vertical, showScrollIndicator = false }, children) => {
+const wrapScroll = ({ scrollable, axis, showScrollIndicator = false }, children) => {
   if (scrollable)
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       import_react_native.ScrollView,
       {
-        ...vertical && {
+        ...axis === "vertical" && {
           showsVerticalScrollIndicator: showScrollIndicator
         },
-        ...!vertical && {
+        ...axis === "horizontal" && {
           horizontal: true,
           showsHorizontalScrollIndicator: showScrollIndicator
         },
@@ -150,12 +218,26 @@ const wrapScroll = ({ scrollable, vertical, showScrollIndicator = false }, child
     );
   return children;
 };
+const getBorderRadius = ({
+  isFirst,
+  isLast,
+  radius,
+  vertical
+}) => {
+  return {
+    borderTopLeftRadius: isFirst ? radius : 0,
+    borderTopRightRadius: vertical && isFirst || !vertical && isLast ? radius : 0,
+    borderBottomLeftRadius: vertical && isLast || !vertical && isFirst ? radius : 0,
+    borderBottomRightRadius: isLast ? radius : 0
+  };
+};
 const cloneElementWithPropOrder = (child, props) => {
   const next = (0, import_core.mergeProps)(child.props, props, false, (0, import_core.getConfig)().shorthands)[0];
   return import_react.default.cloneElement({ ...child, props: null }, next);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  Group,
   GroupFrame,
   XGroup,
   YGroup

package/dist/cjs/views/Group.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Group.tsx"],
-  "sourcesContent": ["import {\n  GetProps,\n  TamaguiElement,\n  getConfig,\n  getExpandedShorthands,\n  getTokens,\n  getVariableValue,\n  isTamaguiElement,\n  mergeProps,\n  spacedChildren,\n  styled,\n  useMediaPropsActive,\n} from '@tamagui/core'\nimport { ThemeableStack } from '@tamagui/stacks'\nimport React, { Children, forwardRef, isValidElement } from 'react'\nimport { ScrollView } from 'react-native'\n\nexport const GroupFrame = styled(ThemeableStack, {\n  name: 'GroupFrame',\n  backgroundColor: '$background',\n  y: 0,\n\n  variants: {\n    size: (val, { tokens }) => {\n      const borderRadius = tokens.radius[val] ?? val ?? tokens.radius['$true']\n      return {\n        borderRadius,\n      }\n    },\n  } as const,\n\n  defaultVariants: {\n    size: '$true',\n  },\n})\n\nexport type GroupProps = GetProps<typeof GroupFrame> & {\n  scrollable?: boolean\n  /**\n   * @default false\n   */\n  showScrollIndicator?: boolean\n  disabled?: boolean\n  vertical?: boolean\n  disablePassBorderRadius?: boolean\n}\n\nfunction createGroup(verticalDefault: boolean) {\n  return forwardRef<TamaguiElement, GroupProps>((props, ref) => {\n    const activeProps = useMediaPropsActive(props)\n\n    const {\n      children: childrenProp,\n      space,\n      size = '$true',\n      spaceDirection,\n      separator,\n      scrollable,\n      vertical = verticalDefault,\n      disabled: disabledProp,\n      disablePassBorderRadius: disablePassBorderRadiusProp,\n      borderRadius,\n      ...restProps\n    } = getExpandedShorthands(activeProps)\n\n    const radius =\n      borderRadius ?? (size ? getVariableValue(getTokens().radius[size]) - 1 : undefined)\n\n    const hasRadius = radius !== undefined\n    const disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius\n    const childrens = Children.toArray(childrenProp)\n    const children = childrens.map((child, i) => {\n      if (!isValidElement(child)) return child\n      const disabled = child.props.disabled ?? disabledProp\n\n      const isFirst = i === 0\n      const isLast = i === childrens.length - 1\n\n      const radiusStyles = disablePassBorderRadius\n        ? null\n        : {\n            borderTopLeftRadius: 0,\n            borderTopRightRadius: 0,\n            borderBottomLeftRadius: 0,\n            borderBottomRightRadius: 0,\n            ...(hasRadius && {\n              ...(isFirst &&\n                !vertical && {\n                  borderTopLeftRadius: radius,\n                  borderBottomLeftRadius: radius,\n                }),\n              ...(isFirst &&\n                vertical && {\n                  borderTopLeftRadius: radius,\n                  borderTopRightRadius: radius,\n                }),\n              ...(isLast &&\n                !vertical && {\n                  borderTopRightRadius: radius,\n                  borderBottomRightRadius: radius,\n                }),\n              ...(isLast &&\n                vertical && {\n                  borderBottomLeftRadius: radius,\n                  borderBottomRightRadius: radius,\n                }),\n            }),\n          }\n\n      const props = {\n        disabled,\n        ...(isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }),\n      }\n\n      return cloneElementWithPropOrder(child, props)\n    })\n\n    return (\n      <GroupFrame\n        ref={ref}\n        size={size}\n        flexDirection={!vertical ? 'row' : 'column'}\n        borderRadius={borderRadius}\n        {...restProps}\n      >\n        {wrapScroll(\n          activeProps,\n          spacedChildren({\n            direction: spaceDirection,\n            separator,\n            space,\n            children,\n          })\n        )}\n      </GroupFrame>\n    )\n  })\n}\n\nexport const YGroup = createGroup(true)\nexport const XGroup = createGroup(false)\n\nconst wrapScroll = (\n  { scrollable, vertical, showScrollIndicator = false }: GroupProps,\n  children: any\n) => {\n  if (scrollable)\n    return (\n      <ScrollView\n        {...(vertical && {\n          showsVerticalScrollIndicator: showScrollIndicator,\n        })}\n        {...(!vertical && {\n          horizontal: true,\n          showsHorizontalScrollIndicator: showScrollIndicator,\n        })}\n      >\n        {children}\n      </ScrollView>\n    )\n  return children\n}\n\nconst cloneElementWithPropOrder = (child: any, props: Object) => {\n  const next = mergeProps(child.props, props, false, getConfig().shorthands)[0]\n  return React.cloneElement({ ...child, props: null }, next)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import {\n  GetProps,\n  TamaguiElement,\n  UnionableString,\n  Variable,\n  getConfig,\n  getExpandedShorthands,\n  getTokens,\n  getVariableValue,\n  isTamaguiElement,\n  mergeProps,\n  spacedChildren,\n  styled,\n  useMediaPropsActive,\n  withStaticProperties,\n} from '@tamagui/core'\nimport { Scope, createContextScope } from '@tamagui/create-context'\nimport { ThemeableStack } from '@tamagui/stacks'\nimport { useControllableState } from '@tamagui/use-controllable-state'\nimport React, { Children, cloneElement, forwardRef, isValidElement } from 'react'\nimport { ScrollView } from 'react-native'\nimport { useIndex, useIndexedChildren } from 'reforest'\n\ninterface GroupContextValue {\n  vertical: boolean\n  disablePassBorderRadius: boolean\n  onItemMount: () => void\n  onItemUnmount: () => void\n  radius?: number | UnionableString | Variable<any>\n  disabled?: boolean\n}\n\nconst GROUP_NAME = 'Group'\n\ntype ScopedProps<P> = P & { __scopeGroup?: Scope }\nconst [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME)\nconst [GroupProvider, useGroupContext] = createGroupContext<GroupContextValue>(GROUP_NAME)\n\nexport const GroupFrame = styled(ThemeableStack, {\n  name: 'GroupFrame',\n\n  variants: {\n    unstyled: {\n      false: {\n        y: 0,\n        backgroundColor: '$background',\n        size: '$true',\n      },\n    },\n\n    size: (val, { tokens }) => {\n      const borderRadius = tokens.radius[val] ?? val ?? tokens.radius['$true']\n      return {\n        borderRadius,\n      }\n    },\n  } as const,\n\n  defaultVariants: {\n    unstyled: false,\n  },\n})\n\nexport type GroupProps = GetProps<typeof GroupFrame> & {\n  axis?: 'horizontal' | 'vertical'\n\n  scrollable?: boolean\n  /**\n   * @default false\n   */\n  showScrollIndicator?: boolean\n  disabled?: boolean\n  disablePassBorderRadius?: boolean\n  /**\n   * forces the group to use the Group.Item API\n   */\n  forceUseItem?: boolean\n}\n\nfunction createGroup(verticalDefault: boolean) {\n  return withStaticProperties(\n    forwardRef<TamaguiElement, ScopedProps<GroupProps>>((props, ref) => {\n      const activeProps = useMediaPropsActive(props)\n\n      const {\n        __scopeGroup,\n        children: childrenProp,\n        space,\n        size = '$true',\n        spaceDirection,\n        separator,\n        scrollable,\n        axis = verticalDefault ? 'vertical' : 'horizontal',\n        disabled: disabledProp,\n        disablePassBorderRadius: disablePassBorderRadiusProp,\n        borderRadius,\n        forceUseItem,\n        ...restProps\n      } = getExpandedShorthands(activeProps)\n\n      const vertical = axis === 'vertical'\n      const [itemChildrenCount, setItemChildrenCount] = useControllableState({\n        defaultProp: forceUseItem ? 1 : 0,\n      })\n      const isUsingItems = itemChildrenCount > 0\n\n      // 1 off given border to adjust for border radius? This should be user controllable\n      const radius =\n        borderRadius ??\n        (size ? getVariableValue(getTokens().radius[size]) - 1 : undefined)\n\n      const hasRadius = radius !== undefined\n      const disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius\n\n      const childrenArray = Children.toArray(childrenProp)\n      const children = isUsingItems\n        ? childrenProp\n        : childrenArray.map((child, i) => {\n            if (!isValidElement(child)) {\n              return child\n            }\n            const disabled = child.props.disabled ?? disabledProp\n\n            const isFirst = i === 0\n            const isLast = i === childrenArray.length - 1\n\n            const radiusStyles = disablePassBorderRadius\n              ? null\n              : getBorderRadius({ isFirst, isLast, radius, vertical })\n            const props = {\n              disabled,\n              ...(isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }),\n            }\n\n            return cloneElementWithPropOrder(child, props)\n          })\n\n      const indexedChildren = useIndexedChildren(\n        spacedChildren({\n          direction: spaceDirection,\n          separator,\n          space,\n          children,\n        })\n      )\n\n      const onItemMount = React.useCallback(\n        () => setItemChildrenCount((prev) => prev + 1),\n        []\n      )\n      const onItemUnmount = React.useCallback(\n        () => setItemChildrenCount((prev) => prev - 1),\n        []\n      )\n\n      return (\n        <GroupProvider\n          disablePassBorderRadius={disablePassBorderRadius}\n          vertical={axis === 'vertical'}\n          radius={radius}\n          disabled={disabledProp}\n          onItemMount={onItemMount}\n          onItemUnmount={onItemUnmount}\n          scope={__scopeGroup}\n        >\n          <GroupFrame\n            ref={ref}\n            size={size}\n            flexDirection={axis === 'horizontal' ? 'row' : 'column'}\n            borderRadius={borderRadius}\n            {...restProps}\n          >\n            {wrapScroll(activeProps, indexedChildren)}\n          </GroupFrame>\n        </GroupProvider>\n      )\n    }),\n    {\n      Item: GroupItem,\n    }\n  )\n}\n\nconst GroupItem = (props: ScopedProps<{ children: React.ReactNode }>) => {\n  const { __scopeGroup, children } = props\n  const treeIndex = useIndex()\n  const context = useGroupContext('GroupItem', __scopeGroup)\n\n  React.useEffect(() => {\n    context.onItemMount()\n    return () => {\n      context.onItemUnmount()\n    }\n  }, [])\n\n  if (!isValidElement(children)) {\n    return children as any\n  }\n\n  const disabled = children.props.disabled ?? context.disabled\n\n  if (!treeIndex) {\n    throw Error('<Group.Item/> should only be used within a <Group/>')\n  }\n\n  const isFirst = treeIndex.index === 0\n  const isLast = treeIndex.index === treeIndex.maxIndex\n\n  let propsToPass: Record<string, any> = {\n    disabled,\n  }\n\n  if (!context.disablePassBorderRadius) {\n    const radiusStyles = getBorderRadius({\n      radius: context.radius,\n      isFirst,\n      isLast,\n      vertical: context.vertical,\n    })\n    if (isTamaguiElement(children)) {\n      propsToPass = { ...propsToPass, ...radiusStyles }\n    } else {\n      propsToPass.style = radiusStyles\n    }\n  }\n\n  return cloneElement(children, {\n    ...propsToPass,\n    // @ts-ignore\n    style: {\n      ...children.props?.['style'],\n      ...propsToPass.style,\n    },\n  })\n}\n\nexport const Group = createGroup(true)\nexport const YGroup = Group\nexport const XGroup = createGroup(false)\n\nconst wrapScroll = (\n  { scrollable, axis, showScrollIndicator = false }: GroupProps,\n  children: any\n) => {\n  if (scrollable)\n    return (\n      <ScrollView\n        {...(axis === 'vertical' && {\n          showsVerticalScrollIndicator: showScrollIndicator,\n        })}\n        {...(axis === 'horizontal' && {\n          horizontal: true,\n          showsHorizontalScrollIndicator: showScrollIndicator,\n        })}\n      >\n        {children}\n      </ScrollView>\n    )\n  return children\n}\n\nconst getBorderRadius = ({\n  isFirst,\n  isLast,\n  radius,\n  vertical,\n}: {\n  radius: any\n  vertical: boolean\n  isFirst: boolean\n  isLast: boolean\n}) => {\n  // TODO: RTL support would be nice here\n  return {\n    borderTopLeftRadius: isFirst ? radius : 0,\n    borderTopRightRadius: (vertical && isFirst) || (!vertical && isLast) ? radius : 0,\n    borderBottomLeftRadius: (vertical && isLast) || (!vertical && isFirst) ? radius : 0,\n    borderBottomRightRadius: isLast ? radius : 0,\n  }\n}\n\nconst cloneElementWithPropOrder = (child: any, props: Object) => {\n  const next = mergeProps(child.props, props, false, getConfig().shorthands)[0]\n  return React.cloneElement({ ...child, props: null }, next)\n}\n"],
+  "mappings": "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",
   "names": ["props", "React"]
 }

package/dist/esm/views/Group.js

@@ -8,16 +8,28 @@ import {
   mergeProps,
   spacedChildren,
   styled,
-  useMediaPropsActive
+  useMediaPropsActive,
+  withStaticProperties
 } from "@tamagui/core";
+import { createContextScope } from "@tamagui/create-context";
 import { ThemeableStack } from "@tamagui/stacks";
-import React, { Children, forwardRef, isValidElement } from "react";
+import { useControllableState } from "@tamagui/use-controllable-state";
+import React, { Children, cloneElement, forwardRef, isValidElement } from "react";
 import { ScrollView } from "react-native";
+import { useIndex, useIndexedChildren } from "reforest";
+const GROUP_NAME = "Group";
+const [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME);
+const [GroupProvider, useGroupContext] = createGroupContext(GROUP_NAME);
 const GroupFrame = styled(ThemeableStack, {
   name: "GroupFrame",
-  backgroundColor: "$background",
-  y: 0,
   variants: {
+    unstyled: {
+      false: {
+        y: 0,
+        backgroundColor: "$background",
+        size: "$true"
+      }
+    },
     size: (val, { tokens }) => {
       const borderRadius = tokens.radius[val] ?? val ?? tokens.radius["$true"];
       return {
@@ -26,97 +38,153 @@ const GroupFrame = styled(ThemeableStack, {
     }
   },
   defaultVariants: {
-    size: "$true"
+    unstyled: false
   }
 });
 function createGroup(verticalDefault) {
-  return forwardRef((props, ref) => {
-    const activeProps = useMediaPropsActive(props);
-    const {
-      children: childrenProp,
-      space,
-      size = "$true",
-      spaceDirection,
-      separator,
-      scrollable,
-      vertical = verticalDefault,
-      disabled: disabledProp,
-      disablePassBorderRadius: disablePassBorderRadiusProp,
-      borderRadius,
-      ...restProps
-    } = getExpandedShorthands(activeProps);
-    const radius = borderRadius ?? (size ? getVariableValue(getTokens().radius[size]) - 1 : void 0);
-    const hasRadius = radius !== void 0;
-    const disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius;
-    const childrens = Children.toArray(childrenProp);
-    const children = childrens.map((child, i) => {
-      if (!isValidElement(child))
-        return child;
-      const disabled = child.props.disabled ?? disabledProp;
-      const isFirst = i === 0;
-      const isLast = i === childrens.length - 1;
-      const radiusStyles = disablePassBorderRadius ? null : {
-        borderTopLeftRadius: 0,
-        borderTopRightRadius: 0,
-        borderBottomLeftRadius: 0,
-        borderBottomRightRadius: 0,
-        ...hasRadius && {
-          ...isFirst && !vertical && {
-            borderTopLeftRadius: radius,
-            borderBottomLeftRadius: radius
-          },
-          ...isFirst && vertical && {
-            borderTopLeftRadius: radius,
-            borderTopRightRadius: radius
-          },
-          ...isLast && !vertical && {
-            borderTopRightRadius: radius,
-            borderBottomRightRadius: radius
-          },
-          ...isLast && vertical && {
-            borderBottomLeftRadius: radius,
-            borderBottomRightRadius: radius
-          }
+  return withStaticProperties(
+    forwardRef((props, ref) => {
+      const activeProps = useMediaPropsActive(props);
+      const {
+        __scopeGroup,
+        children: childrenProp,
+        space,
+        size = "$true",
+        spaceDirection,
+        separator,
+        scrollable,
+        axis = verticalDefault ? "vertical" : "horizontal",
+        disabled: disabledProp,
+        disablePassBorderRadius: disablePassBorderRadiusProp,
+        borderRadius,
+        forceUseItem,
+        ...restProps
+      } = getExpandedShorthands(activeProps);
+      const vertical = axis === "vertical";
+      const [itemChildrenCount, setItemChildrenCount] = useControllableState({
+        defaultProp: forceUseItem ? 1 : 0
+      });
+      const isUsingItems = itemChildrenCount > 0;
+      const radius = borderRadius ?? (size ? getVariableValue(getTokens().radius[size]) - 1 : void 0);
+      const hasRadius = radius !== void 0;
+      const disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius;
+      const childrenArray = Children.toArray(childrenProp);
+      const children = isUsingItems ? childrenProp : childrenArray.map((child, i) => {
+        if (!isValidElement(child)) {
+          return child;
         }
-      };
-      const props2 = {
-        disabled,
-        ...isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }
-      };
-      return cloneElementWithPropOrder(child, props2);
+        const disabled = child.props.disabled ?? disabledProp;
+        const isFirst = i === 0;
+        const isLast = i === childrenArray.length - 1;
+        const radiusStyles = disablePassBorderRadius ? null : getBorderRadius({ isFirst, isLast, radius, vertical });
+        const props2 = {
+          disabled,
+          ...isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }
+        };
+        return cloneElementWithPropOrder(child, props2);
+      });
+      const indexedChildren = useIndexedChildren(
+        spacedChildren({
+          direction: spaceDirection,
+          separator,
+          space,
+          children
+        })
+      );
+      const onItemMount = React.useCallback(
+        () => setItemChildrenCount((prev) => prev + 1),
+        []
+      );
+      const onItemUnmount = React.useCallback(
+        () => setItemChildrenCount((prev) => prev - 1),
+        []
+      );
+      return /* @__PURE__ */ jsx(
+        GroupProvider,
+        {
+          disablePassBorderRadius,
+          vertical: axis === "vertical",
+          radius,
+          disabled: disabledProp,
+          onItemMount,
+          onItemUnmount,
+          scope: __scopeGroup,
+          children: /* @__PURE__ */ jsx(
+            GroupFrame,
+            {
+              ref,
+              size,
+              flexDirection: axis === "horizontal" ? "row" : "column",
+              borderRadius,
+              ...restProps,
+              children: wrapScroll(activeProps, indexedChildren)
+            }
+          )
+        }
+      );
+    }),
+    {
+      Item: GroupItem
+    }
+  );
+}
+const GroupItem = (props) => {
+  var _a;
+  const { __scopeGroup, children } = props;
+  const treeIndex = useIndex();
+  const context = useGroupContext("GroupItem", __scopeGroup);
+  React.useEffect(() => {
+    context.onItemMount();
+    return () => {
+      context.onItemUnmount();
+    };
+  }, []);
+  if (!isValidElement(children)) {
+    return children;
+  }
+  const disabled = children.props.disabled ?? context.disabled;
+  if (!treeIndex) {
+    throw Error("<Group.Item/> should only be used within a <Group/>");
+  }
+  const isFirst = treeIndex.index === 0;
+  const isLast = treeIndex.index === treeIndex.maxIndex;
+  let propsToPass = {
+    disabled
+  };
+  if (!context.disablePassBorderRadius) {
+    const radiusStyles = getBorderRadius({
+      radius: context.radius,
+      isFirst,
+      isLast,
+      vertical: context.vertical
     });
-    return /* @__PURE__ */ jsx(
-      GroupFrame,
-      {
-        ref,
-        size,
-        flexDirection: !vertical ? "row" : "column",
-        borderRadius,
-        ...restProps,
-        children: wrapScroll(
-          activeProps,
-          spacedChildren({
-            direction: spaceDirection,
-            separator,
-            space,
-            children
-          })
-        )
-      }
-    );
+    if (isTamaguiElement(children)) {
+      propsToPass = { ...propsToPass, ...radiusStyles };
+    } else {
+      propsToPass.style = radiusStyles;
+    }
+  }
+  return cloneElement(children, {
+    ...propsToPass,
+    // @ts-ignore
+    style: {
+      ...(_a = children.props) == null ? void 0 : _a["style"],
+      ...propsToPass.style
+    }
   });
-}
-const YGroup = createGroup(true);
+};
+const Group = createGroup(true);
+const YGroup = Group;
 const XGroup = createGroup(false);
-const wrapScroll = ({ scrollable, vertical, showScrollIndicator = false }, children) => {
+const wrapScroll = ({ scrollable, axis, showScrollIndicator = false }, children) => {
   if (scrollable)
     return /* @__PURE__ */ jsx(
       ScrollView,
       {
-        ...vertical && {
+        ...axis === "vertical" && {
           showsVerticalScrollIndicator: showScrollIndicator
         },
-        ...!vertical && {
+        ...axis === "horizontal" && {
           horizontal: true,
           showsHorizontalScrollIndicator: showScrollIndicator
         },
@@ -125,11 +193,25 @@ const wrapScroll = ({ scrollable, vertical, showScrollIndicator = false }, child
     );
   return children;
 };
+const getBorderRadius = ({
+  isFirst,
+  isLast,
+  radius,
+  vertical
+}) => {
+  return {
+    borderTopLeftRadius: isFirst ? radius : 0,
+    borderTopRightRadius: vertical && isFirst || !vertical && isLast ? radius : 0,
+    borderBottomLeftRadius: vertical && isLast || !vertical && isFirst ? radius : 0,
+    borderBottomRightRadius: isLast ? radius : 0
+  };
+};
 const cloneElementWithPropOrder = (child, props) => {
   const next = mergeProps(child.props, props, false, getConfig().shorthands)[0];
   return React.cloneElement({ ...child, props: null }, next);
 };
 export {
+  Group,
   GroupFrame,
   XGroup,
   YGroup