@cdx-ui/components 0.0.1-beta.18 → 0.0.1-beta.180

package/src/components/Chip/index.tsx

@@ -1,32 +1,120 @@
-import { forwardRef, type ReactNode } from 'react';
-import { View, Text as RNText, type ViewProps, type TextProps } from 'react-native';
-import { cn, useStyleContext, withStyleContext } from '@cdx-ui/utils';
+import { forwardRef, useEffect, useMemo, type ReactNode } from 'react';
+import { Text, View, type TextProps } from 'react-native';
+import {
+  ChipRoot as ChipRootPrimitive,
+  Slot,
+  dataAttributes,
+  mergeDataAttributes,
+  type IChipProps,
+} from '@cdx-ui/primitives';
+import { cn, ParentContext, useParentContext, useStyleContext } from '@cdx-ui/utils';
+import { Avatar, type AvatarProps } from '../Avatar';
 import { Icon, type IconProps } from '../Icon';
-import { chipRootVariants, chipLabelVariants, chipIconVariants, ChipVariants } from './styles';
+import { positionToDataIcon, type IconSlotPosition } from '../../utils/positionToDataIcon';
+import {
+  chipAvatarVariants,
+  chipIconVariants,
+  chipLabelVariants,
+  chipRootVariants,
+  type ChipVariantProps,
+} from './styles';
 
 const SCOPE = 'CHIP';
 
-const Root = withStyleContext(View, SCOPE);
-
-const useChipStyleContext = () => useStyleContext(SCOPE) as ChipVariants;
+const useChipStyleContext = () => useStyleContext(SCOPE) as ChipVariantProps;
 
 // =============================================================================
-// STYLED ROOT COMPONENT
+// ROOT
 // =============================================================================
 
-export interface ChipProps extends ViewProps, ChipVariants {
-  children?: ReactNode;
+export type ChipVariant = 'subtle' | 'outline';
+
+/** @deprecated Use {@link ChipVariant} (`'subtle'`) instead. */
+export type ChipVariantTint = 'tint';
+
+export type ChipColor = 'neutral' | 'action' | 'danger' | 'warning' | 'success' | 'info';
+
+/** @deprecated Use {@link ChipColor} (`'neutral'`) instead. */
+export type ChipColorDefault = 'default';
+
+let hasWarnedChipTintVariant = false;
+let hasWarnedChipDefaultColor = false;
+
+export interface ChipProps extends IChipProps, Omit<ChipVariantProps, 'variant' | 'color'> {
+  /**
+   * Visual style variant.
+   * @default 'subtle'
+   */
+  variant?:
+    | ChipVariant
+    /** @deprecated Use `'subtle'` instead. */
+    | 'tint';
+  /**
+   * Color theme applied to the chip surface and content.
+   * @default 'neutral'
+   */
+  color?:
+    | ChipColor
+    /** @deprecated Use `'neutral'` instead. */
+    | 'default';
   className?: string;
+  children?: ReactNode;
 }
 
 const ChipRoot = forwardRef<View, ChipProps>(
-  ({ children, color = 'default', className, style, ...props }, ref) => {
-    const computedClassName = cn(chipRootVariants({ color }), className);
+  (
+    {
+      children,
+      variant: variantProp = 'subtle',
+      size = 'default',
+      color: colorProp = 'neutral',
+      className,
+      style,
+      ...props
+    },
+    ref,
+  ) => {
+    useEffect(() => {
+      if (__DEV__ && variantProp === 'tint' && !hasWarnedChipTintVariant) {
+        hasWarnedChipTintVariant = true;
+        console.warn(
+          '[Chip] The `tint` variant is deprecated and will be removed in a future major release. Use `subtle` instead.',
+        );
+      }
+    }, [variantProp]);
+
+    useEffect(() => {
+      if (__DEV__ && colorProp === 'default' && !hasWarnedChipDefaultColor) {
+        hasWarnedChipDefaultColor = true;
+        console.warn(
+          '[Chip] The `default` color is deprecated and will be removed in a future major release. Use `neutral` instead.',
+        );
+      }
+    }, [colorProp]);
+
+    const variant = variantProp === 'tint' ? 'subtle' : variantProp;
+    const color = colorProp === 'default' ? 'neutral' : colorProp;
+
+    const parent = useParentContext();
+    const ctx = useMemo(
+      () => ({ ...parent, [SCOPE]: { variant, size, color } }),
+      [parent, variant, size, color],
+    );
+
+    const computedClassName = cn(chipRootVariants({ variant, size, color }), className);
 
     return (
-      <Root ref={ref} className={computedClassName} style={style} context={{ color }} {...props}>
-        {children}
-      </Root>
+      <ParentContext.Provider value={ctx}>
+        <ChipRootPrimitive
+          ref={ref}
+          className={computedClassName}
+          style={style}
+          {...props}
+          {...mergeDataAttributes(props, dataAttributes({ slot: 'chip' }))}
+        >
+          {children}
+        </ChipRootPrimitive>
+      </ParentContext.Provider>
     );
   },
 );
@@ -34,24 +122,31 @@ const ChipRoot = forwardRef<View, ChipProps>(
 ChipRoot.displayName = 'Chip';
 
 // =============================================================================
-// STYLED LABEL COMPONENT
+// LABEL
 // =============================================================================
 
 export interface ChipLabelProps extends TextProps {
+  asChild?: boolean;
   className?: string;
   children?: ReactNode;
 }
 
-const ChipLabel = forwardRef<RNText, ChipLabelProps>(
-  ({ className, children, style, ...props }, ref) => {
-    const { color } = useChipStyleContext();
-
-    const computedClassName = cn(chipLabelVariants({ color }), className);
+const ChipLabel = forwardRef<Text, ChipLabelProps>(
+  ({ asChild, className, children, style, ...props }, ref) => {
+    const { size, variant, color } = useChipStyleContext();
+    const computedClassName = cn(chipLabelVariants({ size, variant, color }), className);
+    const Comp = asChild ? Slot : Text;
 
     return (
-      <RNText ref={ref} className={computedClassName} style={style} {...props}>
+      <Comp
+        ref={ref}
+        className={computedClassName}
+        style={style}
+        {...props}
+        {...mergeDataAttributes(props, dataAttributes({ slot: 'chip-label' }))}
+      >
         {children}
-      </RNText>
+      </Comp>
     );
   },
 );
@@ -59,33 +154,100 @@ const ChipLabel = forwardRef<RNText, ChipLabelProps>(
 ChipLabel.displayName = 'Chip.Label';
 
 // =============================================================================
-// STYLED ICON COMPONENT
+// ICON
 // =============================================================================
 
-export interface ChipIconProps extends Omit<IconProps, 'children'> {}
-
-const ChipIcon = ({ className, style, as, ...props }: ChipIconProps) => {
-  const { color } = useChipStyleContext();
+export interface ChipIconProps extends Omit<IconProps, 'children' | 'as'> {
+  asChild?: boolean;
+  /**
+   * Forge icon component to render. Required unless `asChild` is set, in which
+   * case the consumer's substituted element is rendered instead.
+   */
+  as?: IconProps['as'];
+  /**
+   * Position hint that emits `data-icon="inline-start"` or `data-icon="inline-end"`.
+   * CVA uses this attribute to apply leading/trailing margin offsets logically
+   * (RTL-aware). Omit when the icon is freely positioned within a custom layout.
+   */
+  position?: IconSlotPosition;
+}
 
-  const computedClassName = cn(chipIconVariants({ color }), className);
+const ChipIcon = ({ asChild, className, style, as, position, ...props }: ChipIconProps) => {
+  const { size, color } = useChipStyleContext();
+  const computedClassName = cn(chipIconVariants({ size, color }), className);
 
-  return <Icon as={as} className={computedClassName} style={style} {...props} />;
+  if (asChild) {
+    return (
+      <Slot
+        className={computedClassName}
+        style={style}
+        {...props}
+        {...mergeDataAttributes(
+          props,
+          dataAttributes({ slot: 'chip-icon' }),
+          positionToDataIcon(position),
+        )}
+      />
+    );
+  }
+
+  if (!as) {
+    return null;
+  }
+
+  return (
+    <Icon
+      as={as}
+      className={computedClassName}
+      style={style}
+      {...props}
+      {...mergeDataAttributes(
+        props,
+        dataAttributes({ slot: 'chip-icon' }),
+        positionToDataIcon(position),
+      )}
+    />
+  );
 };
 
 ChipIcon.displayName = 'Chip.Icon';
 
 // =============================================================================
-// COMPOUND COMPONENT EXPORT
+// AVATAR
+// =============================================================================
+
+export interface ChipAvatarProps extends Omit<AvatarProps, 'size'> {}
+
+const ChipAvatar = ({ className, style, children, ...props }: ChipAvatarProps) => {
+  const { size } = useChipStyleContext();
+  // chipAvatarVariants sets w/h and the leading-edge negative margin.
+  // Avatar renders with size="sm" (its smallest named size) but chipAvatarVariants
+  // overrides the w/h via tailwind-merge so the chip size wins.
+  const computedClassName = cn(chipAvatarVariants({ size }), className);
+
+  return (
+    <Avatar size="sm" className={computedClassName} style={style} {...props}>
+      {children}
+    </Avatar>
+  );
+};
+
+ChipAvatar.displayName = 'Chip.Avatar';
+
+// =============================================================================
+// COMPOUND EXPORT
 // =============================================================================
 
 type ChipCompoundComponent = typeof ChipRoot & {
   Label: typeof ChipLabel;
   Icon: typeof ChipIcon;
+  Avatar: typeof ChipAvatar;
 };
 
 export const Chip = Object.assign(ChipRoot, {
   Label: ChipLabel,
   Icon: ChipIcon,
+  Avatar: ChipAvatar,
 }) as ChipCompoundComponent;
 
-export { type ChipVariants } from './styles';
+export { type ChipVariantProps } from './styles';

package/src/components/Chip/styles.ts

@@ -1,52 +1,254 @@
-import { cva, type VariantProps } from 'class-variance-authority';
+import { Platform } from 'react-native';
+import { cva, type VariantProps } from '@cdx-ui/utils';
+import { DISABLED_CURSOR, TRANSITION_COLORS } from '../../styles/constants';
+
+const chipInteractiveRoot = [
+  TRANSITION_COLORS,
+  'data-[disabled=true]:opacity-[var(--opacity-disabled)]',
+  DISABLED_CURSOR,
+  Platform.select({
+    web: [
+      'outline-none',
+      'web:data-[focus-visible=true]:ring-2 web:data-[focus-visible=true]:ring-stroke-focus web:data-[focus-visible=true]:ring-offset-2',
+    ].join(' '),
+    default: '',
+  }),
+];
 
 export const chipRootVariants = cva(
-  ['flex-row items-center justify-center rounded-full px-2 py-1 gap-1.5 self-start'],
+  ['flex-row items-center justify-center self-start overflow-hidden', ...chipInteractiveRoot],
   {
     variants: {
+      variant: {
+        subtle: [],
+        outline: ['bg-transparent', 'border'],
+      },
       color: {
-        default: 'bg-surface-neutral-tint',
-        error: 'bg-surface-danger-tint',
-        info: 'bg-surface-info-tint',
-        success: 'bg-surface-success-tint',
-        warning: 'bg-surface-warning-tint',
+        neutral: [],
+        action: [],
+        danger: [],
+        warning: [],
+        success: [],
+        info: [],
+      },
+      size: {
+        default: 'h-8 max-h-8 min-h-8 gap-1.5 px-3 rounded-lg',
+        small: 'h-6 max-h-6 min-h-6 gap-1 px-1.5 rounded-md',
+        xsmall: 'h-4 max-h-4 min-h-4 gap-0.5 px-1 rounded-sm',
       },
     },
+    compoundVariants: [
+      // ── subtle × color ────────────────────────────────────────────────────
+      {
+        variant: 'subtle',
+        color: 'neutral',
+        className: [
+          'bg-surface-neutral-subtle',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-neutral-subtle-active',
+            web: 'data-[hover=true]:bg-surface-neutral-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-neutral-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'subtle',
+        color: 'action',
+        className: [
+          'bg-surface-action-subtle',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-action-subtle-active',
+            web: 'data-[hover=true]:bg-surface-action-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-action-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'subtle',
+        color: 'danger',
+        className: [
+          'bg-surface-danger-subtle',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-danger-subtle-active',
+            web: 'data-[hover=true]:bg-surface-danger-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-danger-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'subtle',
+        color: 'warning',
+        className: [
+          'bg-surface-warning-subtle',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-warning-subtle-active',
+            web: 'data-[hover=true]:bg-surface-warning-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-warning-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'subtle',
+        color: 'success',
+        className: [
+          'bg-surface-success-subtle',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-success-subtle-active',
+            web: 'data-[hover=true]:bg-surface-success-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-success-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'subtle',
+        color: 'info',
+        className: [
+          'bg-surface-info-subtle',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-info-subtle-active',
+            web: 'data-[hover=true]:bg-surface-info-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-info-subtle-active',
+          }),
+        ],
+      },
+
+      // ── outline × color ───────────────────────────────────────────────────
+      {
+        variant: 'outline',
+        color: 'neutral',
+        className: [
+          'border-stroke-primary',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-neutral-subtle',
+            web: 'data-[hover=true]:bg-surface-neutral-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-neutral-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'outline',
+        color: 'action',
+        className: [
+          'border-stroke-action',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-action-subtle',
+            web: 'data-[hover=true]:bg-surface-action-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-action-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'outline',
+        color: 'danger',
+        className: [
+          'border-stroke-danger',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-danger-subtle',
+            web: 'data-[hover=true]:bg-surface-danger-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-danger-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'outline',
+        color: 'warning',
+        className: [
+          'border-stroke-warning',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-warning-subtle',
+            web: 'data-[hover=true]:bg-surface-warning-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-warning-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'outline',
+        color: 'success',
+        className: [
+          'border-stroke-success',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-success-subtle',
+            web: 'data-[hover=true]:bg-surface-success-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-success-subtle-active',
+          }),
+        ],
+      },
+      {
+        variant: 'outline',
+        color: 'info',
+        className: [
+          'border-stroke-info',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-info-subtle',
+            web: 'data-[hover=true]:bg-surface-info-subtle-hover data-[active=true]:data-[hover=true]:bg-surface-info-subtle-active',
+          }),
+        ],
+      },
+    ],
     defaultVariants: {
-      color: 'default',
+      variant: 'subtle',
+      color: 'neutral',
+      size: 'default',
     },
   },
 );
 
-// TODO: letter-spacing values (tracking-wider) are not working on web, but the font-mono-medium is.
-export const chipLabelVariants = cva(['label-sm font-mono-medium'], {
+export const chipLabelVariants = cva(['font-medium'], {
   variants: {
+    variant: {
+      subtle: 'text-content-primary',
+      outline: 'text-content-primary',
+    },
     color: {
-      default: 'text-content-primary',
-      error: 'text-content-primary',
-      info: 'text-content-primary',
-      success: 'text-content-primary',
-      warning: 'text-content-primary',
+      neutral: [],
+      action: [],
+      danger: [],
+      warning: [],
+      success: [],
+      info: [],
+    },
+    size: {
+      default: 'body-md',
+      small: 'body-sm',
+      xsmall: 'body-xs',
     },
   },
+  compoundVariants: [
+    { variant: 'outline', color: 'action', className: 'text-content-action' },
+    { variant: 'outline', color: 'danger', className: 'text-content-danger' },
+    { variant: 'outline', color: 'warning', className: 'text-content-warning' },
+    { variant: 'outline', color: 'success', className: 'text-content-success' },
+    { variant: 'outline', color: 'info', className: 'text-content-info' },
+  ],
   defaultVariants: {
-    color: 'default',
+    variant: 'subtle',
+    color: 'neutral',
+    size: 'default',
   },
 });
 
-export const chipIconVariants = cva(['size-4'], {
+export const chipIconVariants = cva(['shrink-0'], {
   variants: {
+    size: {
+      default: 'size-5 data-[icon=inline-start]:-ms-1.5 data-[icon=inline-end]:-me-1.5',
+      small: 'size-4 data-[icon=inline-start]:-ms-0.5 data-[icon=inline-end]:-me-0.5',
+      xsmall: 'size-2.5 data-[icon=inline-start]:-ms-px data-[icon=inline-end]:-me-px',
+    },
     color: {
-      default: 'text-content-primary',
-      error: 'text-content-danger',
-      info: 'text-content-info',
-      success: 'text-content-success',
+      neutral: 'text-content-primary',
+      action: 'text-content-action',
+      danger: 'text-content-danger',
       warning: 'text-content-warning',
+      success: 'text-content-success',
+      info: 'text-content-info',
+    },
+  },
+  defaultVariants: {
+    size: 'default',
+    color: 'neutral',
+  },
+});
+
+export const chipAvatarVariants = cva(['shrink-0 rounded-full overflow-hidden'], {
+  variants: {
+    size: {
+      default: 'size-5 -ms-1.5',
+      small: 'size-4 -ms-0.5',
+      xsmall: 'size-2.5 -ms-px',
     },
   },
   defaultVariants: {
-    color: 'default',
+    size: 'default',
   },
 });
 
-export type ChipVariants = VariantProps<typeof chipRootVariants>;
+export type ChipVariantProps = VariantProps<typeof chipRootVariants>;