@cdx-ui/components 0.0.1-beta.7 → 0.0.1-beta.70

package/src/components/CLAUDE.md

@@ -0,0 +1,194 @@
+# Components — authoring & styling conventions
+
+Auto-loaded when working in `packages/components/src/components/**`. Covers both the
+styled component files (`index.tsx`) and their co-located CVA variant files (`styles.ts`).
+
+---
+
+## Component Authoring (`index.tsx`)
+
+Styled components in `@cdx-ui/components` follow a consistent pattern. Read the full guides before making changes:
+
+- `docs/internal/practices/composition.md` — compound component pattern, naming conventions
+- `docs/internal/practices/types.md` — prop types, `I*Props` vs `*Props`, exporting
+- `docs/internal/practices/styling.md` — `cn()`, CVA, token classes, `Platform.select()`
+- `docs/internal/practices/state.md` — `useControllableState`, `composeEventHandlers`
+- `docs/internal/practices/data-attributes.md` — `data-[state]`, `data-slot`, and `data-icon` conventions
+- `docs/internal/practices/as-child.md` — styled-layer `asChild` via re-exported `Slot`
+
+## Six standards (Standards 4–6 apply here)
+
+Standards 1–3 govern primitive-layer authoring (see `packages/primitives/src/CLAUDE.md`).
+Standards 4–6 govern the styled layer:
+
+### Standard 4 — `data-slot` attributes
+
+Every public styled slot emits a stable `data-slot="<component>-<part>"` attribute on its outermost rendered element. The convention is lowercase, kebab-case, `<component>` then `-<slot>` if not the root.
+
+| Slot               | Attribute                    |
+| ------------------ | ---------------------------- |
+| `<Button>` root    | `data-slot="button"`         |
+| `<Button.Label>`   | `data-slot="button-label"`   |
+| `<Button.Icon>`    | `data-slot="button-icon"`    |
+| `<Button.Spinner>` | `data-slot="button-spinner"` |
+| `<Button.Group>`   | `data-slot="button-group"`   |
+| `<IconButton>`     | `data-slot="icon-button"`    |
+| `<Dialog.Content>` | `data-slot="dialog-content"` |
+
+Use `dataAttributes({ slot: '<component>-<part>' })` from `@cdx-ui/primitives` so the helper handles native (flat `data-*` keys) and web (RNW `dataSet`) correctly.
+
+#### Combining multiple data-attribute sources — use `mergeDataAttributes`
+
+When the same element receives `data-*` from more than one source (e.g. a slot identifier plus a position hint, or consumer-supplied data attrs flowing in through props), do **not** chain multiple `{...dataAttributes(...)}` spreads — on web each call returns `{ dataSet: {...} }` and a plain JSX spread replaces the `dataSet` key entirely, so the second source wipes out the first. Use `mergeDataAttributes(...)` from `@cdx-ui/primitives` to combine sources; later args win on key conflicts:
+
+```tsx
+import { dataAttributes, mergeDataAttributes } from '@cdx-ui/primitives';
+
+<Element
+  ref={ref}
+  className={...}
+  style={style}
+  {...props}
+  {...mergeDataAttributes(
+    props,                 // pulls in any consumer-supplied data attrs
+    dataAttributes({ slot: '<component>-<part>' }),
+    positionToDataIcon(position),                      // optional, may be undefined
+  )}
+/>
+```
+
+Spread `{...props}` first, then the merge — so any keys that `mergeDataAttributes` produces overwrite their counterparts in props with the merged values.
+
+When the styled component renders a primitive Root, the primitive Root applies the same pattern internally — incoming data attrs (slot from the styled layer) are merged with the primitive's own interaction-state data attrs and emitted once. The styled layer doesn't need to do anything special; just pass `data-slot` through and the primitive's merge does the rest.
+
+### Standard 5 — Static design variants vs. interaction state
+
+Variant functions take only static design inputs (`variant`/`color`/`size`/`fullWidth`/etc.). Interaction states (`hover`/`focus`/`active`/`disabled`/`focus-visible`) are expressed as `data-[...]:` selectors **inside** CVA variant strings, never as variant inputs.
+
+- CSS-layer state changes are free of React work: when the primitive flips `data-hover=true`, the CSS engine (web) and Uniwind's native style layer reconcile styles without re-rendering React, re-running CVA, or invoking `cn()`/`tailwind-merge`.
+- Variant-input state changes cascade React work: CVA re-runs, `cn()` re-merges, and className-prop reconciliation cascades through the tree.
+- Sub-slots can react to root state via parent selectors (`data-[hover=true]:`) without each slot subscribing to context (per Standard 1).
+
+### Standard 6 — Position hints (`data-icon="inline-start|inline-end"`)
+
+Icon-/spinner-bearing styled slots accept an optional `position?: 'leading' | 'trailing'` prop that emits `data-icon="inline-start|inline-end"`. Spacing rules in CVA target the `data-icon` attribute via logical-property utilities (`me-*`/`ms-*`) so RTL is handled for free.
+
+Mapping (via the shared `positionToDataIcon` helper at `packages/components/src/utils/positionToDataIcon.ts`):
+
+- `position="leading"` → `data-icon="inline-start"`
+- `position="trailing"` → `data-icon="inline-end"`
+- `position` omitted → no `data-icon` attribute, baseline spacing applies
+
+```tsx
+import { positionToDataIcon, type IconSlotPosition } from '../../utils/positionToDataIcon';
+
+interface ButtonIconProps {
+  position?: IconSlotPosition;
+  // ...
+}
+
+<Icon {...positionToDataIcon(position)} {...props} />;
+```
+
+```tsx
+<Button>
+  <Button.Icon as={CheckIcon} position="leading" />
+  <Button.Label>Confirm</Button.Label>
+</Button>
+```
+
+CVA expresses padding via logical-property selectors:
+
+```ts
+cva(['data-[icon=inline-start]:me-1.5 data-[icon=inline-end]:ms-1.5'], { ... });
+```
+
+Where: **styled layer.** Pure styling hint with no behavior or a11y semantics — fails Standard 3, so no primitive involvement.
+
+## Canonical reference
+
+`packages/components/src/components/Button/index.tsx` + `Button/styles.ts` is the canonical example for Standards 4–6:
+
+- `data-slot` on `Button`, `Button.Label`, `Button.Icon`, `Button.Spinner`, `Button.Group`
+- `asChild` re-uses `Slot` from `@cdx-ui/primitives` — no new primitive needed for sub-slots
+- `buttonIconVariants` / `buttonSpinnerVariants` carry `data-[icon=inline-start]:me-1.5 data-[icon=inline-end]:ms-1.5` so leading/trailing padding works without per-call overrides
+
+`packages/components/src/components/IconButton/index.tsx` shows the second axis of Standard 1: a styled-layer slot (the glyph) is the place that opts into `useButtonContext()` when its styling reacts to interaction state. The pattern is the same as the primitive Root — call `useButtonContext()`, spread `dataAttributes({ ... })` — only it lives in the styled layer.
+
+### Pattern summary
+
+Each component follows this structure (see `Button/index.tsx`):
+
+1. **Imports** — RN base components, primitive `Root` and `Slot` from `@cdx-ui/primitives`, `cn` + style context from `@cdx-ui/utils`, variant functions from `./styles`
+2. **Scope constant** — `const SCOPE = 'COMPONENT_NAME'` for `withStyleContext` / `useStyleContext` (or a `ParentContext.Provider` wrapper for static variant context)
+3. **Root component** — renders the primitive Root (or a host element directly when no primitive exists), spreads `dataAttributes({ slot: '<component>' })`
+4. **Sub-slots** — each accepts `asChild`, renders a host element via `const Comp = asChild ? Slot : DefaultElement`, spreads `dataAttributes({ slot: '<component>-<slot>' })`. Sub-slots **do not** call `useButtonContext()` (or its equivalent) unless their own styling reacts to interaction state.
+5. **Position-aware sub-slots** — icon/spinner-style slots accept `position?: 'leading' | 'trailing'` and emit `data-icon` via `dataAttributes({ icon: '...' })`.
+6. **Compound export** — `Object.assign(RootComponent, { Sub1, Sub2 }) as CompoundType`
+
+### Key rules
+
+- Props interface extends RN base props + primitive `I*Props` + CVA `VariantProps` + `{ className?: string }`
+- Always accept and spread `style` alongside `className`
+- Variant defaults in destructuring must match CVA `defaultVariants`
+- `displayName` set on every exported sub-component
+- `className` is merged last via `cn()` so consumer overrides always win
+- Never hardcode colors — use semantic token classes (`bg-surface-*`, `text-content-*`, `border-stroke-*`)
+- Event handlers composed via `composeEventHandlers` from `@cdx-ui/utils`
+- Third-party libraries fully abstracted — no adopted library types leak to consumers
+- **`data-slot`** emitted on every styled slot via `dataAttributes({ slot: '<component>-<part>' })`
+- **`asChild`** supported on every styled slot — `const Comp = asChild ? Slot : DefaultElement`
+- **`position`** prop on icon/spinner-style slots maps to `data-icon="inline-start|inline-end"`
+
+---
+
+## Styling Conventions (`styles.ts`)
+
+Variant definitions live in co-located `styles.ts` files using CVA. Read the full guides before making changes:
+
+- `docs/internal/practices/styling.md` — `cn()`, CVA, token architecture, dark mode, `Platform.select()`
+- `docs/internal/practices/data-attributes.md` — `data-[state]` and `data-icon` selectors
+
+### Pattern summary
+
+Each `styles.ts` exports CVA variant functions and their derived `VariantProps` types (see `Button/styles.ts` as the canonical example):
+
+```ts
+import { Platform } from 'react-native';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { DISABLED_CURSOR, TRANSITION_COLORS } from '../../styles/primitives';
+
+export const componentRootVariants = cva(
+  [
+    /* base classes + interaction state selectors (data-[hover=true]:..., data-[active=true]:...) */
+  ],
+  {
+    variants: {
+      /* static design axes only — variant, color, size, fullWidth, etc. */
+    },
+    compoundVariants: [
+      /* variant × variant combinations */
+    ],
+    defaultVariants: {
+      /* defaults matching the component's destructured defaults */
+    },
+  },
+);
+
+export type ComponentVariantProps = VariantProps<typeof componentRootVariants>;
+```
+
+### Key rules
+
+- **Semantic token classes only** — use `bg-surface-action-strong`, `text-content-primary`, `border-stroke-primary`, etc. Never hardcode hex colors, `bg-white`, `text-black`, or raw Tailwind color scales for themed values.
+- **`data-[state]` selectors** — use `data-[disabled=true]:`, `data-[hover=true]:`, `data-[active=true]:`, `data-[focus-visible=true]:` for interaction states. Primitives emit these data attributes (Standard 1). **Interaction state is never a CVA variant input** (Standard 5).
+- **`data-[icon=inline-start|inline-end]` selectors** for icon/spinner position spacing (Standard 6) — pair with logical-property utilities (`me-*`/`ms-*`) so RTL flips automatically.
+- **`Platform.select()`** for platform-specific classes — web gets `data-[hover=true]` styles (hover exists on web); native responds only to `data-[active=true]` (press). Always set `default` (native) and `web` keys.
+- **Shared style primitives** — import `DISABLED_CURSOR`, `TRANSITION_COLORS`, etc. from `../../styles/primitives` for cross-component consistency.
+- **`web:` prefix** for web-only utilities — e.g., `web:outline-none`, `web:focus-visible:ring-2`.
+- **`compoundVariants`** for variant × variant combinations where simple variant merging is insufficient.
+- **`defaultVariants`** must match the destructured defaults in the component's `index.tsx`.
+- **One `cva()` per sub-component** — root, text, icon, spinner, etc. each get their own variant function.
+- **Export `VariantProps` types** — derived via `VariantProps<typeof variantFn>` for the component layer to consume.
+- **No dynamic string construction** — all Tailwind class names must be statically detectable by the Tailwind scanner.
+- **CSS variables for token values** — use `rounded-[var(--border-radius-button)]` syntax when referencing design tokens not mapped to Tailwind utilities.

package/src/components/Card/index.tsx

@@ -1,31 +1,48 @@
 import { forwardRef, type ReactNode } from 'react';
 import { View, type ViewProps } from 'react-native';
-import { cn } from '@cdx-ui/utils';
+import { cn, useStyleContext, withStyleContext } from '@cdx-ui/utils';
 import {
   cardContentVariants,
   cardFooterVariants,
   cardHeaderVariants,
   cardRootVariants,
+  type CardContentVariantProps,
+  type CardFooterVariantProps,
+  type CardVariantProps,
 } from './styles';
 
 // =============================================================================
 // STYLED ROOT COMPONENT
 // =============================================================================
 
-export interface CardProps extends ViewProps {
+const SCOPE = 'CARD';
+
+const Root = withStyleContext(View, SCOPE);
+
+const useCardStyleContext = () => useStyleContext(SCOPE) as CardVariantProps;
+
+export interface CardProps extends ViewProps, CardVariantProps {
   className?: string;
   children?: ReactNode;
 }
 
-const CardRoot = forwardRef<View, CardProps>(({ className, children, style, ...props }, ref) => {
-  const computedClassName = cn(cardRootVariants(), className);
+const CardRoot = forwardRef<View, CardProps>(
+  ({ className, children, style, fullBleed, ...props }, ref) => {
+    const computedClassName = cn(cardRootVariants(), className);
 
-  return (
-    <View ref={ref} className={computedClassName} style={style} {...props}>
-      {children}
-    </View>
-  );
-});
+    return (
+      <Root
+        ref={ref}
+        className={computedClassName}
+        style={style}
+        context={{ fullBleed }}
+        {...props}
+      >
+        {children}
+      </Root>
+    );
+  },
+);
 
 CardRoot.displayName = 'Card';
 
@@ -56,14 +73,18 @@ CardHeader.displayName = 'Card.Header';
 // STYLED CONTENT COMPONENT
 // =============================================================================
 
-export interface CardContentProps extends ViewProps {
+export interface CardContentProps extends ViewProps, CardContentVariantProps {
   className?: string;
   children?: ReactNode;
 }
 
 const CardContent = forwardRef<View, CardContentProps>(
-  ({ className, children, style, ...props }, ref) => {
-    const computedClassName = cn(cardContentVariants(), className);
+  ({ className, children, style, fullBleed, ...props }, ref) => {
+    const { fullBleed: fullBleedFromContext } = useCardStyleContext();
+    const computedClassName = cn(
+      cardContentVariants({ fullBleed: fullBleed ?? fullBleedFromContext }),
+      className,
+    );
 
     return (
       <View ref={ref} className={computedClassName} style={style} {...props}>
@@ -79,14 +100,18 @@ CardContent.displayName = 'Card.Content';
 // STYLED FOOTER COMPONENT
 // =============================================================================
 
-export interface CardFooterProps extends ViewProps {
+export interface CardFooterProps extends ViewProps, CardFooterVariantProps {
   className?: string;
   children?: ReactNode;
 }
 
 const CardFooter = forwardRef<View, CardFooterProps>(
-  ({ className, children, style, ...props }, ref) => {
-    const computedClassName = cn(cardFooterVariants(), className);
+  ({ className, children, style, fullBleed, ...props }, ref) => {
+    const { fullBleed: fullBleedFromContext } = useCardStyleContext();
+    const computedClassName = cn(
+      cardFooterVariants({ fullBleed: fullBleed ?? fullBleedFromContext }),
+      className,
+    );
 
     return (
       <View ref={ref} className={computedClassName} style={style} {...props}>

package/src/components/Card/styles.ts

@@ -1,20 +1,31 @@
-import { cva } from 'class-variance-authority';
+import { cva, VariantProps } from 'class-variance-authority';
 
 // ── Root ────────────────────────────────────────────────────
 
-export const cardRootVariants = cva([
-  'bg-surface-primary',
-  'border border-stroke-secondary',
-  'rounded-[var(--border-radius-default)]',
-  'overflow-hidden',
-]);
+export const cardRootVariants = cva(
+  [
+    'bg-surface-primary',
+    'border border-stroke-secondary',
+    'rounded-[var(--border-radius-default)]',
+    'overflow-hidden',
+  ],
+  {
+    variants: {
+      fullBleed: {
+        true: '',
+        false: '',
+      },
+    },
+  },
+);
 
 // ── Header ──────────────────────────────────────────────────
 
 export const cardHeaderVariants = cva([
-  'flex-row items-center justify-between p-4',
   'border-t-8 border-t-surface-brand-strong',
-  'border-b border-b-solid border-b-stroke-secondary',
+  'border-b border-solid border-b-stroke-secondary',
+  'flex-row items-center justify-between gap-0.5',
+  'px-5 py-3',
 ]);
 
 // ── Title ───────────────────────────────────────────────────
@@ -23,12 +34,28 @@ export const cardTitleVariants = cva(['flex-1']);
 
 // ── Content ─────────────────────────────────────────────────
 
-export const cardContentVariants = cva(['text-content-primary', 'p-4']);
+export const cardContentVariants = cva(['text-content-primary', 'p-5'], {
+  variants: {
+    fullBleed: {
+      true: 'p-0',
+    },
+  },
+});
 
 // ── Footer ──────────────────────────────────────────────────
 
-export const cardFooterVariants = cva([
-  'p-4 border-t',
-  'border-stroke-secondary',
-  'flex-row items-center gap-2',
-]);
+export const cardFooterVariants = cva(['flex-col items-stretch gap-2'], {
+  variants: {
+    fullBleed: {
+      true: 'p-5',
+      false: 'px-5 pb-5 pt-0',
+    },
+  },
+  defaultVariants: {
+    fullBleed: false,
+  },
+});
+
+export type CardVariantProps = VariantProps<typeof cardRootVariants>;
+export type CardContentVariantProps = VariantProps<typeof cardContentVariants>;
+export type CardFooterVariantProps = VariantProps<typeof cardFooterVariants>;

package/src/components/Checkbox/index.tsx

@@ -1,11 +1,18 @@
 import { forwardRef, type ReactNode } from 'react';
-import { Pressable, Text, type TextProps, View, type ViewProps } from 'react-native';
+import { Text, View, type TextProps, type ViewProps } from 'react-native';
 import { Check, CheckIndeterminateSmall } from '@cdx-ui/icons';
-import { createCheckbox, type ICheckboxProps } from '@cdx-ui/primitives';
-import { cn, useStyleContext, withStyleContext } from '@cdx-ui/utils';
+import {
+  CheckboxRoot as CheckboxRootPrimitive,
+  CheckboxGroup as CheckboxGroupPrimitive,
+  Slot,
+  dataAttributes,
+  mergeDataAttributes,
+  useCheckboxContext,
+  type ICheckboxProps,
+} from '@cdx-ui/primitives';
+import { cn } from '@cdx-ui/utils';
 import { Icon, IconProps } from '../Icon';
 import {
-  type CheckboxVariantProps,
   checkboxGroupVariants,
   checkboxIconVariants,
   checkboxIndicatorVariants,
@@ -13,49 +20,33 @@ import {
   checkboxRootVariants,
 } from './styles';
 
-const SCOPE = 'CHECKBOX';
-
-const Root = withStyleContext(Pressable, SCOPE);
-
-const useCheckboxStyleContext = () => useStyleContext(SCOPE) as CheckboxVariantProps;
-
-const CheckboxPrimitive = createCheckbox({
-  Root,
-  Indicator: View,
-  Icon: View,
-  Label: Text,
-  Group: View,
-});
-
 // =============================================================================
 // CHECKBOX ROOT
 // =============================================================================
 
-export interface CheckboxProps extends ICheckboxProps, CheckboxVariantProps {
+export interface CheckboxProps extends ICheckboxProps {
   className?: string;
   children?: ReactNode;
 }
 
 const CheckboxRoot = forwardRef<View, CheckboxProps>(
-  ({ size = 'default', className, isIndeterminate, children, style, ...props }, ref) => {
-    const computedClassName = cn(checkboxRootVariants({ size }), className);
+  ({ className, isIndeterminate, children, style, ...props }, ref) => {
+    const computedClassName = cn(checkboxRootVariants(), className);
 
     return (
-      <CheckboxPrimitive
+      <CheckboxRootPrimitive
         ref={ref as any}
         className={computedClassName}
         isIndeterminate={isIndeterminate}
         style={style}
-        context={{ size }}
         {...props}
+        {...mergeDataAttributes(props, dataAttributes({ slot: 'checkbox' }))}
       >
         <CheckboxIndicator>
-          <CheckboxPrimitive.Icon>
-            <CheckboxIcon as={isIndeterminate ? CheckIndeterminateSmall : Check} />
-          </CheckboxPrimitive.Icon>
+          <CheckboxIconSlot isIndeterminate={isIndeterminate} />
         </CheckboxIndicator>
         {children}
-      </CheckboxPrimitive>
+      </CheckboxRootPrimitive>
     );
   },
 );
@@ -63,28 +54,56 @@ const CheckboxRoot = forwardRef<View, CheckboxProps>(
 CheckboxRoot.displayName = 'Checkbox';
 
 // =============================================================================
-// CHECKBOX INDICATOR
+// CHECKBOX INDICATOR (styled-only, reads context for data-* styling)
 // =============================================================================
 
 export interface CheckboxIndicatorProps extends ViewProps {
+  asChild?: boolean;
   className?: string;
   children?: ReactNode;
 }
 
 const CheckboxIndicator = forwardRef<View, CheckboxIndicatorProps>(
-  ({ className, children, style, ...props }, ref) => {
-    const { size } = useCheckboxStyleContext();
-    const computedClassName = cn(checkboxIndicatorVariants({ size }), className);
+  ({ asChild, className, children, style, ...props }, ref) => {
+    const {
+      isChecked,
+      isDisabled,
+      isHovered,
+      isInvalid,
+      isReadOnly,
+      isPressed,
+      isFocused,
+      isIndeterminate,
+      isFocusVisible,
+    } = useCheckboxContext();
+
+    const computedClassName = cn(checkboxIndicatorVariants(), className);
+    const Comp = asChild ? Slot : View;
 
     return (
-      <CheckboxPrimitive.Indicator
-        ref={ref as any}
+      <Comp
+        ref={ref}
         className={computedClassName}
         style={style}
         {...props}
+        {...mergeDataAttributes(
+          props,
+          dataAttributes({
+            slot: 'checkbox-indicator',
+            hover: isHovered,
+            checked: isChecked,
+            disabled: isDisabled,
+            focusVisible: isFocusVisible,
+            invalid: isInvalid,
+            readonly: isReadOnly,
+            active: isPressed,
+            focused: isFocused,
+            indeterminate: isIndeterminate,
+          }),
+        )}
       >
         {children}
-      </CheckboxPrimitive.Indicator>
+      </Comp>
     );
   },
 );
@@ -92,43 +111,74 @@ const CheckboxIndicator = forwardRef<View, CheckboxIndicatorProps>(
 CheckboxIndicator.displayName = 'Checkbox.Indicator';
 
 // =============================================================================
-// CHECKBOX ICON
+// CHECKBOX ICON (styled-only, reads context for conditional mount)
 // =============================================================================
 
 export interface CheckboxIconProps extends Omit<IconProps, 'children'> {}
 
 const CheckboxIcon = ({ className, style, ...props }: CheckboxIconProps) => {
-  const { size } = useCheckboxStyleContext();
-  const computedClassName = cn(checkboxIconVariants({ size }), className);
-
-  return <Icon className={computedClassName} style={style} {...props} />;
+  const computedClassName = cn(checkboxIconVariants(), className);
+
+  return (
+    <Icon
+      className={computedClassName}
+      style={style}
+      {...props}
+      {...mergeDataAttributes(props, dataAttributes({ slot: 'checkbox-icon' }))}
+    />
+  );
 };
 
 CheckboxIcon.displayName = 'Checkbox.Icon';
 
+// Internal helper that reads context for conditional rendering
+const CheckboxIconSlot = ({
+  isIndeterminate: isIndeterminateProp,
+}: {
+  isIndeterminate?: boolean;
+}) => {
+  const { isChecked, isIndeterminate } = useCheckboxContext();
+  const showIcon = isChecked || isIndeterminateProp || isIndeterminate;
+
+  if (!showIcon) return null;
+
+  return (
+    <CheckboxIcon as={isIndeterminate || isIndeterminateProp ? CheckIndeterminateSmall : Check} />
+  );
+};
+
 // =============================================================================
-// CHECKBOX LABEL
+// CHECKBOX LABEL (styled-only)
 // =============================================================================
 
 export interface CheckboxLabelProps extends TextProps {
+  asChild?: boolean;
   className?: string;
   children?: ReactNode;
 }
 
 const CheckboxLabel = forwardRef<Text, CheckboxLabelProps>(
-  ({ className, children, style, ...props }, ref) => {
-    const { size } = useCheckboxStyleContext();
-    const computedClassName = cn(checkboxLabelVariants({ size }), className);
+  ({ asChild, className, children, style, ...props }, ref) => {
+    const { isDisabled } = useCheckboxContext();
+    const computedClassName = cn(checkboxLabelVariants(), className);
+    const Comp = asChild ? Slot : Text;
 
     return (
-      <CheckboxPrimitive.Label
-        ref={ref as any}
+      <Comp
+        ref={ref}
         className={computedClassName}
         style={style}
         {...props}
+        {...mergeDataAttributes(
+          props,
+          dataAttributes({
+            slot: 'checkbox-label',
+            disabled: isDisabled,
+          }),
+        )}
       >
         {children}
-      </CheckboxPrimitive.Label>
+      </Comp>
     );
   },
 );
@@ -136,7 +186,7 @@ const CheckboxLabel = forwardRef<Text, CheckboxLabelProps>(
 CheckboxLabel.displayName = 'Checkbox.Label';
 
 // =============================================================================
-// CHECKBOX GROUP
+// CHECKBOX GROUP (wraps the primitive)
 // =============================================================================
 
 export interface CheckboxGroupProps extends ViewProps {
@@ -169,8 +219,8 @@ const CheckboxGroup = forwardRef<View, CheckboxGroupProps>(
     const computedClassName = cn(checkboxGroupVariants({ direction }), className);
 
     return (
-      <CheckboxPrimitive.Group
-        ref={ref as any}
+      <CheckboxGroupPrimitive
+        ref={ref}
         className={computedClassName}
         style={style}
         value={value ?? []}
@@ -178,10 +228,10 @@ const CheckboxGroup = forwardRef<View, CheckboxGroupProps>(
         isDisabled={isDisabled}
         isInvalid={isInvalid}
         isReadOnly={isReadOnly}
-        {...viewProps}
+        {...mergeDataAttributes(viewProps, dataAttributes({ slot: 'checkbox-group' }))}
       >
         {children}
-      </CheckboxPrimitive.Group>
+      </CheckboxGroupPrimitive>
     );
   },
 );