tamagui 1.5.19 → 1.5.21

package/dist/jsx/views/Group.mjs.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, axis }, 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"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "1.5.19",
+  "version": "1.5.21",
   "sideEffects": [
     "*.css",
     "setup.js"
@@ -40,59 +40,60 @@
     }
   },
   "dependencies": {
-    "@tamagui/adapt": "^1.5.19",
-    "@tamagui/alert-dialog": "^1.5.19",
-    "@tamagui/animate-presence": "^1.5.19",
-    "@tamagui/avatar": "^1.5.19",
-    "@tamagui/button": "^1.5.19",
-    "@tamagui/card": "^1.5.19",
-    "@tamagui/checkbox": "^1.5.19",
-    "@tamagui/compose-refs": "^1.5.19",
-    "@tamagui/core": "^1.5.19",
-    "@tamagui/create-context": "^1.5.19",
-    "@tamagui/dialog": "^1.5.19",
-    "@tamagui/fake-react-native": "^1.5.19",
-    "@tamagui/focusable": "^1.5.19",
-    "@tamagui/font-size": "^1.5.19",
-    "@tamagui/form": "^1.5.19",
-    "@tamagui/get-button-sized": "^1.5.19",
-    "@tamagui/get-font-sized": "^1.5.19",
-    "@tamagui/get-size": "^1.5.19",
-    "@tamagui/helpers": "^1.5.19",
-    "@tamagui/helpers-tamagui": "^1.5.19",
-    "@tamagui/image": "^1.5.19",
-    "@tamagui/label": "^1.5.19",
-    "@tamagui/linear-gradient": "^1.5.19",
-    "@tamagui/list-item": "^1.5.19",
-    "@tamagui/popover": "^1.5.19",
-    "@tamagui/popper": "^1.5.19",
-    "@tamagui/portal": "^1.5.19",
-    "@tamagui/progress": "^1.5.19",
-    "@tamagui/radio-group": "^1.5.19",
-    "@tamagui/react-native-media-driver": "^1.5.19",
-    "@tamagui/scroll-view": "^1.5.19",
-    "@tamagui/select": "^1.5.19",
-    "@tamagui/separator": "^1.5.19",
-    "@tamagui/shapes": "^1.5.19",
-    "@tamagui/sheet": "^1.5.19",
-    "@tamagui/slider": "^1.5.19",
-    "@tamagui/stacks": "^1.5.19",
-    "@tamagui/switch": "^1.5.19",
-    "@tamagui/text": "^1.5.19",
-    "@tamagui/tooltip": "^1.5.19",
-    "@tamagui/use-controllable-state": "^1.5.19",
-    "@tamagui/use-debounce": "^1.5.19",
-    "@tamagui/use-event": "^1.5.19",
-    "@tamagui/use-force-update": "^1.5.19",
-    "@tamagui/use-window-dimensions": "^1.5.19",
-    "@tamagui/visually-hidden": "^1.5.19"
+    "@tamagui/adapt": "^1.5.21",
+    "@tamagui/alert-dialog": "^1.5.21",
+    "@tamagui/animate-presence": "^1.5.21",
+    "@tamagui/avatar": "^1.5.21",
+    "@tamagui/button": "^1.5.21",
+    "@tamagui/card": "^1.5.21",
+    "@tamagui/checkbox": "^1.5.21",
+    "@tamagui/compose-refs": "^1.5.21",
+    "@tamagui/core": "^1.5.21",
+    "@tamagui/create-context": "^1.5.21",
+    "@tamagui/dialog": "^1.5.21",
+    "@tamagui/fake-react-native": "^1.5.21",
+    "@tamagui/focusable": "^1.5.21",
+    "@tamagui/font-size": "^1.5.21",
+    "@tamagui/form": "^1.5.21",
+    "@tamagui/get-button-sized": "^1.5.21",
+    "@tamagui/get-font-sized": "^1.5.21",
+    "@tamagui/get-size": "^1.5.21",
+    "@tamagui/helpers": "^1.5.21",
+    "@tamagui/helpers-tamagui": "^1.5.21",
+    "@tamagui/image": "^1.5.21",
+    "@tamagui/label": "^1.5.21",
+    "@tamagui/linear-gradient": "^1.5.21",
+    "@tamagui/list-item": "^1.5.21",
+    "@tamagui/popover": "^1.5.21",
+    "@tamagui/popper": "^1.5.21",
+    "@tamagui/portal": "^1.5.21",
+    "@tamagui/progress": "^1.5.21",
+    "@tamagui/radio-group": "^1.5.21",
+    "@tamagui/react-native-media-driver": "^1.5.21",
+    "@tamagui/scroll-view": "^1.5.21",
+    "@tamagui/select": "^1.5.21",
+    "@tamagui/separator": "^1.5.21",
+    "@tamagui/shapes": "^1.5.21",
+    "@tamagui/sheet": "^1.5.21",
+    "@tamagui/slider": "^1.5.21",
+    "@tamagui/stacks": "^1.5.21",
+    "@tamagui/switch": "^1.5.21",
+    "@tamagui/text": "^1.5.21",
+    "@tamagui/tooltip": "^1.5.21",
+    "@tamagui/use-controllable-state": "^1.5.21",
+    "@tamagui/use-debounce": "^1.5.21",
+    "@tamagui/use-event": "^1.5.21",
+    "@tamagui/use-force-update": "^1.5.21",
+    "@tamagui/use-window-dimensions": "^1.5.21",
+    "@tamagui/visually-hidden": "^1.5.21",
+    "reforest": "^0.12.1"
   },
   "peerDependencies": {
     "react": "*",
     "react-native-web": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.5.19",
+    "@tamagui/build": "^1.5.21",
     "@types/node": "^16.11.9",
     "@types/react": "^18.0.15",
     "react": "^18.2.0",

package/src/views/Group.tsx

@@ -1,6 +1,8 @@
 import {
   GetProps,
   TamaguiElement,
+  UnionableString,
+  Variable,
   getConfig,
   getExpandedShorthands,
   getTokens,
@@ -10,17 +12,42 @@ import {
   spacedChildren,
   styled,
   useMediaPropsActive,
+  withStaticProperties,
 } from '@tamagui/core'
+import { Scope, 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'
+
+interface GroupContextValue {
+  vertical: boolean
+  disablePassBorderRadius: boolean
+  onItemMount: () => void
+  onItemUnmount: () => void
+  radius?: number | UnionableString | Variable<any>
+  disabled?: boolean
+}
+
+const GROUP_NAME = 'Group'
+
+type ScopedProps<P> = P & { __scopeGroup?: Scope }
+const [createGroupContext, createGroupScope] = createContextScope(GROUP_NAME)
+const [GroupProvider, useGroupContext] = createGroupContext<GroupContextValue>(GROUP_NAME)
 
 export 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 {
@@ -30,127 +57,198 @@ export const GroupFrame = styled(ThemeableStack, {
   } as const,
 
   defaultVariants: {
-    size: '$true',
+    unstyled: false,
   },
 })
 
 export type GroupProps = GetProps<typeof GroupFrame> & {
+  axis?: 'horizontal' | 'vertical'
+
   scrollable?: boolean
   /**
    * @default false
    */
   showScrollIndicator?: boolean
   disabled?: boolean
-  vertical?: boolean
   disablePassBorderRadius?: boolean
+  /**
+   * forces the group to use the Group.Item API
+   */
+  forceUseItem?: boolean
 }
 
 function createGroup(verticalDefault: boolean) {
-  return forwardRef<TamaguiElement, GroupProps>((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 : undefined)
-
-    const hasRadius = radius !== undefined
-    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,
-                }),
-            }),
-          }
-
-      const props = {
-        disabled,
-        ...(isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }),
-      }
+  return withStaticProperties(
+    forwardRef<TamaguiElement, ScopedProps<GroupProps>>((props, ref) => {
+      const activeProps = useMediaPropsActive(props)
 
-      return cloneElementWithPropOrder(child, props)
-    })
+      const {
+        __scopeGroup,
+        children: childrenProp,
+        space,
+        size = '$true',
+        spaceDirection,
+        separator,
+        scrollable,
+        axis = verticalDefault ? 'vertical' : 'horizontal',
+        disabled: disabledProp,
+        disablePassBorderRadius: disablePassBorderRadiusProp,
+        borderRadius,
+        forceUseItem,
+        ...restProps
+      } = getExpandedShorthands(activeProps)
 
-    return (
-      <GroupFrame
-        ref={ref}
-        size={size}
-        flexDirection={!vertical ? 'row' : 'column'}
-        borderRadius={borderRadius}
-        {...restProps}
-      >
-        {wrapScroll(
-          activeProps,
-          spacedChildren({
-            direction: spaceDirection,
-            separator,
-            space,
-            children,
+      const vertical = axis === 'vertical'
+      const [itemChildrenCount, setItemChildrenCount] = useControllableState({
+        defaultProp: forceUseItem ? 1 : 0,
+      })
+      const isUsingItems = itemChildrenCount > 0
+
+      // 1 off given border to adjust for border radius? This should be user controllable
+      const radius =
+        borderRadius ??
+        (size ? getVariableValue(getTokens().radius[size]) - 1 : undefined)
+
+      const hasRadius = radius !== undefined
+      const disablePassBorderRadius = disablePassBorderRadiusProp ?? !hasRadius
+
+      const childrenArray = Children.toArray(childrenProp)
+      const children = isUsingItems
+        ? childrenProp
+        : childrenArray.map((child, i) => {
+            if (!isValidElement(child)) {
+              return child
+            }
+            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 props = {
+              disabled,
+              ...(isTamaguiElement(child) ? radiusStyles : { style: radiusStyles }),
+            }
+
+            return cloneElementWithPropOrder(child, props)
           })
-        )}
-      </GroupFrame>
-    )
+
+      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 (
+        <GroupProvider
+          disablePassBorderRadius={disablePassBorderRadius}
+          vertical={axis === 'vertical'}
+          radius={radius}
+          disabled={disabledProp}
+          onItemMount={onItemMount}
+          onItemUnmount={onItemUnmount}
+          scope={__scopeGroup}
+        >
+          <GroupFrame
+            ref={ref}
+            size={size}
+            flexDirection={axis === 'horizontal' ? 'row' : 'column'}
+            borderRadius={borderRadius}
+            {...restProps}
+          >
+            {wrapScroll({ ...activeProps, axis }, indexedChildren)}
+          </GroupFrame>
+        </GroupProvider>
+      )
+    }),
+    {
+      Item: GroupItem,
+    }
+  )
+}
+
+const GroupItem = (props: ScopedProps<{ children: React.ReactNode }>) => {
+  const { __scopeGroup, children } = props
+  const treeIndex = useIndex()
+  const context = useGroupContext('GroupItem', __scopeGroup)
+
+  React.useEffect(() => {
+    context.onItemMount()
+    return () => {
+      context.onItemUnmount()
+    }
+  }, [])
+
+  if (!isValidElement(children)) {
+    return children as any
+  }
+
+  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: Record<string, any> = {
+    disabled,
+  }
+
+  if (!context.disablePassBorderRadius) {
+    const radiusStyles = getBorderRadius({
+      radius: context.radius,
+      isFirst,
+      isLast,
+      vertical: context.vertical,
+    })
+    if (isTamaguiElement(children)) {
+      propsToPass = { ...propsToPass, ...radiusStyles }
+    } else {
+      propsToPass.style = radiusStyles
+    }
+  }
+
+  return cloneElement(children, {
+    ...propsToPass,
+    // @ts-ignore
+    style: {
+      ...children.props?.['style'],
+      ...propsToPass.style,
+    },
   })
 }
 
-export const YGroup = createGroup(true)
+export const Group = createGroup(true)
+export const YGroup = Group
 export const XGroup = createGroup(false)
 
 const wrapScroll = (
-  { scrollable, vertical, showScrollIndicator = false }: GroupProps,
+  { scrollable, axis, showScrollIndicator = false }: GroupProps,
   children: any
 ) => {
   if (scrollable)
     return (
       <ScrollView
-        {...(vertical && {
+        {...(axis === 'vertical' && {
           showsVerticalScrollIndicator: showScrollIndicator,
         })}
-        {...(!vertical && {
+        {...(axis === 'horizontal' && {
           horizontal: true,
           showsHorizontalScrollIndicator: showScrollIndicator,
         })}
@@ -161,6 +259,26 @@ const wrapScroll = (
   return children
 }
 
+const getBorderRadius = ({
+  isFirst,
+  isLast,
+  radius,
+  vertical,
+}: {
+  radius: any
+  vertical: boolean
+  isFirst: boolean
+  isLast: boolean
+}) => {
+  // TODO: RTL support would be nice here
+  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: any, props: Object) => {
   const next = mergeProps(child.props, props, false, getConfig().shorthands)[0]
   return React.cloneElement({ ...child, props: null }, next)