@cdx-ui/components 0.0.1-beta.3 → 0.0.1-beta.31

package/src/components/Checkbox/index.tsx

@@ -2,10 +2,9 @@ import { forwardRef, type ReactNode } from 'react';
 import { Pressable, Text, type TextProps, View, 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 { cn } from '@cdx-ui/utils';
 import { Icon, IconProps } from '../Icon';
 import {
-  type CheckboxVariantProps,
   checkboxGroupVariants,
   checkboxIconVariants,
   checkboxIndicatorVariants,
@@ -13,14 +12,8 @@ import {
   checkboxRootVariants,
 } from './styles';
 
-const SCOPE = 'CHECKBOX';
-
-const Root = withStyleContext(Pressable, SCOPE);
-
-const useCheckboxStyleContext = () => useStyleContext(SCOPE) as CheckboxVariantProps;
-
 const CheckboxPrimitive = createCheckbox({
-  Root,
+  Root: Pressable,
   Indicator: View,
   Icon: View,
   Label: Text,
@@ -31,14 +24,14 @@ const CheckboxPrimitive = createCheckbox({
 // 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
@@ -46,7 +39,6 @@ const CheckboxRoot = forwardRef<View, CheckboxProps>(
         className={computedClassName}
         isIndeterminate={isIndeterminate}
         style={style}
-        context={{ size }}
         {...props}
       >
         <CheckboxIndicator>
@@ -73,8 +65,7 @@ export interface CheckboxIndicatorProps extends ViewProps {
 
 const CheckboxIndicator = forwardRef<View, CheckboxIndicatorProps>(
   ({ className, children, style, ...props }, ref) => {
-    const { size } = useCheckboxStyleContext();
-    const computedClassName = cn(checkboxIndicatorVariants({ size }), className);
+    const computedClassName = cn(checkboxIndicatorVariants(), className);
 
     return (
       <CheckboxPrimitive.Indicator
@@ -98,8 +89,7 @@ CheckboxIndicator.displayName = 'Checkbox.Indicator';
 export interface CheckboxIconProps extends Omit<IconProps, 'children'> {}
 
 const CheckboxIcon = ({ className, style, ...props }: CheckboxIconProps) => {
-  const { size } = useCheckboxStyleContext();
-  const computedClassName = cn(checkboxIconVariants({ size }), className);
+  const computedClassName = cn(checkboxIconVariants(), className);
 
   return <Icon className={computedClassName} style={style} {...props} />;
 };
@@ -117,8 +107,7 @@ export interface CheckboxLabelProps extends TextProps {
 
 const CheckboxLabel = forwardRef<Text, CheckboxLabelProps>(
   ({ className, children, style, ...props }, ref) => {
-    const { size } = useCheckboxStyleContext();
-    const computedClassName = cn(checkboxLabelVariants({ size }), className);
+    const computedClassName = cn(checkboxLabelVariants(), className);
 
     return (
       <CheckboxPrimitive.Label

package/src/components/Checkbox/styles.ts

@@ -1,92 +1,90 @@
 import { Platform } from 'react-native';
-import { cva, type VariantProps } from 'class-variance-authority';
-import {
-  COLOR_BG_PRIMARY,
-  COLOR_BORDER_STRONG,
-  COLOR_TEXT_PRIMARY,
-  DISABLED_CURSOR,
-  DISABLED_OPACITY,
-  TRANSITION_COLORS,
-} from '../../styles/primitives';
+import { cva } from 'class-variance-authority';
+import { DISABLED_CURSOR, DISABLED_OPACITY, TRANSITION_COLORS } from '../../styles/primitives';
 
-export const checkboxRootVariants = cva(
-  ['flex-row items-center', DISABLED_OPACITY, DISABLED_CURSOR],
-  {
-    variants: {
-      size: {
-        small: 'gap-2',
-        default: 'gap-2.5',
-      },
-    },
-    defaultVariants: {
-      size: 'default',
-    },
-  },
-);
+export const checkboxRootVariants = cva([
+  'flex-row items-center gap-2.5',
+  DISABLED_OPACITY,
+  DISABLED_CURSOR,
+  // Suppress stray outline on the Pressable/label wrapper; focus ring is drawn on Checkbox.Indicator (Radio pattern).
+  'web:outline-none web:focus:outline-none web:focus-visible:outline-none',
+]);
 
-export const checkboxIndicatorVariants = cva(
-  [
-    'items-center justify-center',
-    'rounded',
-    'border-2',
-    COLOR_BORDER_STRONG,
-    COLOR_BG_PRIMARY,
-    'data-[checked=true]:bg-slate-900 data-[checked=true]:border-slate-900',
-    'data-[indeterminate=true]:bg-slate-900 data-[indeterminate=true]:border-slate-900',
-    'data-[disabled=true]:opacity-50',
-    'data-[invalid=true]:border-red-500',
-    'data-[checked=true]:data-[invalid=true]:bg-red-500 data-[checked=true]:data-[invalid=true]:border-red-500',
-    'data-[indeterminate=true]:data-[invalid=true]:bg-red-500 data-[indeterminate=true]:data-[invalid=true]:border-red-500',
-    Platform.select({
-      web: [
-        TRANSITION_COLORS,
-        'data-[hover=true]:data-[checked=false]:data-[indeterminate=false]:border-slate-400 data-[hover=true]:data-[checked=false]:data-[indeterminate=false]:bg-slate-50',
-        'data-[focus-visible=true]:ring-2 data-[focus-visible=true]:ring-slate-400/50 data-[focus-visible=true]:ring-offset-2',
-        'data-[invalid=true]:data-[hover=true]:border-red-400',
-        'data-[invalid=true]:data-[focus-visible=true]:ring-red-400/50',
-      ].join(' '),
-      default: '',
-    }),
-  ],
-  {
-    variants: {
-      size: {
-        small: 'h-4 w-4',
-        default: 'h-5 w-5',
-      },
-    },
-    defaultVariants: {
-      size: 'default',
-    },
-  },
-);
+export const checkboxIndicatorVariants = cva([
+  'items-center justify-center',
+  'h-5 w-5',
+  'rounded',
+  'border-2 border-solid',
+  'data-[disabled=true]:opacity-50',
+  // Background — layered by specificity. checked=false acts as an explicit reset so the base bg
+  // reasserts when transitioning from checked/indeterminate on native (where absent attributes
+  // break data-[attr=false] selectors).
+  // IMPORTANT: On native (Uniwind), only the LAST data-[] condition in a compound chain is
+  // effectively evaluated. Place the most discriminating condition last to avoid false matches.
+  'data-[checked=false]:bg-surface-primary',
+  'data-[checked=true]:bg-surface-action-strong',
+  'data-[indeterminate=true]:bg-surface-action-strong',
+  // Border — invalid (later) beats checked/indeterminate.
+  'data-[checked=false]:border-content-secondary',
+  'data-[checked=true]:border-stroke-action',
+  'data-[indeterminate=true]:border-stroke-action',
+  'data-[invalid=true]:border-stroke-danger',
+  Platform.select({
+    web: [
+      // Invalid bg — compound selectors evaluate correctly on web.
+      'data-[invalid=true]:data-[checked=true]:bg-surface-danger-strong',
+      'data-[invalid=true]:data-[indeterminate=true]:bg-surface-danger-strong',
+      TRANSITION_COLORS,
+      // Hover — unchecked (Figma: border unchanged, bg overlay at opacity/hover)
+      'data-[hover=true]:data-[checked=false]:data-[indeterminate=false]:bg-content-secondary/[0.08]',
+      // Hover — unchecked + invalid (overlay uses danger token)
+      'data-[hover=true]:data-[invalid=true]:data-[checked=false]:data-[indeterminate=false]:bg-surface-danger-strong/[0.08]',
+      // Hover — checked / indeterminate (bg + border darken together)
+      'data-[hover=true]:data-[checked=true]:bg-surface-action-strong-hover',
+      'data-[hover=true]:data-[checked=true]:border-[--color-surface-action-strong-hover]',
+      'data-[hover=true]:data-[indeterminate=true]:bg-surface-action-strong-hover',
+      'data-[hover=true]:data-[indeterminate=true]:border-[--color-surface-action-strong-hover]',
+      'data-[hover=true]:data-[checked=true]:data-[invalid=true]:bg-surface-danger-strong-hover',
+      'data-[hover=true]:data-[checked=true]:data-[invalid=true]:border-[--color-surface-danger-strong-hover]',
+      'data-[hover=true]:data-[indeterminate=true]:data-[invalid=true]:bg-surface-danger-strong-hover',
+      'data-[hover=true]:data-[indeterminate=true]:data-[invalid=true]:border-[--color-surface-danger-strong-hover]',
+      // Active — CSS :active pseudo-class (web root does not track press via data-active).
+      // data-[hover=true] guard ensures active beats hover by specificity (0,3,0 > 0,2,0).
+      'web:active:data-[hover=true]:data-[checked=true]:bg-surface-action-strong-active',
+      'web:active:data-[hover=true]:data-[checked=true]:border-[--color-surface-action-strong-active]',
+      'web:active:data-[hover=true]:data-[indeterminate=true]:bg-surface-action-strong-active',
+      'web:active:data-[hover=true]:data-[indeterminate=true]:border-[--color-surface-action-strong-active]',
+      'web:active:data-[hover=true]:data-[checked=true]:data-[invalid=true]:bg-surface-danger-strong-active',
+      'web:active:data-[hover=true]:data-[checked=true]:data-[invalid=true]:border-[--color-surface-danger-strong-active]',
+      'web:active:data-[hover=true]:data-[indeterminate=true]:data-[invalid=true]:bg-surface-danger-strong-active',
+      'web:active:data-[hover=true]:data-[indeterminate=true]:data-[invalid=true]:border-[--color-surface-danger-strong-active]',
+      // Focus ring
+      'web:data-[focus-visible=true]:outline-none',
+      'web:data-[focus-visible=true]:ring-2 web:data-[focus-visible=true]:ring-[--color-stroke-ring] web:data-[focus-visible=true]:ring-offset-2',
+    ].join(' '),
+    default: [
+      // Invalid bg is NOT styled on native. Compound data-[] selectors cannot express
+      // "invalid AND checked" without false-matching other states (Uniwind only evaluates
+      // the last condition). Invalid state is communicated via border-stroke-danger (single
+      // condition, always correct). The fill stays action-strong for checked/indeterminate.
+      //
+      // Active — native tracks press via data-[active] from usePress.
+      // Place data-[active=true] last so the rule only fires during press.
+      // 'data-[checked=false]:data-[invalid=true]:bg-transparent',
+      'data-[checked=true]:data-[invalid=true]:bg-surface-danger-strong',
+      'data-[checked=true]:data-[active=true]:bg-surface-action-strong-active',
+      'data-[checked=true]:data-[active=true]:data-[invalid=true]:bg-surface-danger-strong-active',
+      'data-[indeterminate=true]:data-[active=true]:bg-surface-action-strong-active',
+    ].join(' '),
+  }),
+]);
 
-export const checkboxIconVariants = cva(['text-white'], {
-  variants: {
-    size: {
-      small: 'h-3 w-3',
-      default: 'h-3.5 w-3.5',
-    },
-  },
-  defaultVariants: {
-    size: 'default',
-  },
-});
+export const checkboxIconVariants = cva(['text-white', 'h-5 w-5']);
 
-export const checkboxLabelVariants = cva(
-  [COLOR_TEXT_PRIMARY, 'data-[disabled=true]:text-slate-400'],
-  {
-    variants: {
-      size: {
-        small: 'text-sm',
-        default: 'text-base',
-      },
-    },
-    defaultVariants: {
-      size: 'default',
-    },
-  },
-);
+export const checkboxLabelVariants = cva([
+  'text-content-primary text-base',
+  'data-[disabled=true]:text-content-tertiary',
+]);
 
 export const checkboxGroupVariants = cva([], {
   variants: {
@@ -99,5 +97,3 @@ export const checkboxGroupVariants = cva([], {
     direction: 'column',
   },
 });
-
-export type CheckboxVariantProps = VariantProps<typeof checkboxRootVariants>;

package/src/components/Field/FieldLabel.web.tsx

@@ -7,7 +7,7 @@ export type BaseFieldLabelProps = ViewProps & {
   htmlFor?: string;
   children?: ReactNode;
   /** @platform native — ignored on DOM `<label>`; set by form primitive for Uniwind. */
-  dataSet?: Record<string, string>;
+  dataSet?: Record<string, boolean | string>;
 };
 
 /** Real `<label>` so clicking the label focuses the associated control (`htmlFor` → input `id`). */

package/src/components/Field/index.tsx

@@ -8,7 +8,7 @@ import {
   IFieldLabelProps,
   type IFieldRootProps,
 } from '@cdx-ui/primitives';
-import { cn } from '@cdx-ui/utils';
+import { cn, useFormControlContext } from '@cdx-ui/utils';
 import { Icon } from '../Icon';
 import { BaseFieldLabel } from './FieldLabel';
 import {
@@ -70,7 +70,14 @@ export interface FieldLabelProps extends IFieldLabelProps, FieldLabelVariantProp
 
 const FieldLabel = forwardRef<View, FieldLabelProps>(
   ({ className, children, style, htmlFor, ...props }, ref) => {
-    const labelClassName = cn(fieldLabelVariants(), className);
+    const { isLabelFocused, isInvalid } = useFormControlContext();
+    // Native: inject text-content-action via context (group-has CSS handles web).
+    // native: prefix keeps this class inert on web so it never conflicts with text-content-primary.
+    const labelClassName = cn(
+      fieldLabelVariants(),
+      isLabelFocused && !isInvalid && 'native:text-content-action',
+      className,
+    );
 
     return (
       <FieldPrimitive.Label
@@ -79,7 +86,7 @@ const FieldLabel = forwardRef<View, FieldLabelProps>(
         style={style}
         htmlFor={htmlFor}
         requiredIndicator={
-          <Text className="text-red-500" aria-hidden>
+          <Text className="text-content-danger" aria-hidden>
             {' *'}
           </Text>
         }

package/src/components/Field/styles.ts

@@ -1,23 +1,24 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 import { DISABLED_OPACITY } from '../../styles/primitives';
 
-export const fieldRootVariants = cva(['flex-col gap-2', 'web:last:mb-0', DISABLED_OPACITY]);
+export const fieldRootVariants = cva(['group flex-col gap-2', 'web:last:mb-0', DISABLED_OPACITY]);
 
 export const fieldLabelVariants = cva([
   'body-md',
   'font-medium',
   'text-content-primary',
   'flex-row items-center',
-  DISABLED_OPACITY,
+  'overflow-hidden',
   'web:cursor-pointer',
+  'web:group-has-[[data-focus=true]]:data-[invalid=false]:text-content-action',
   'data-[invalid=true]:text-content-danger',
 ]);
 
-export const fieldHelperVariants = cva(['flex-row items-center']);
+export const fieldHelperVariants = cva(['flex-row items-center min-h-4']);
 
 export const fieldHelperTextVariants = cva(['body-sm', 'text-content-tertiary']);
 
-export const fieldErrorVariants = cva(['flex-row items-center gap-1']);
+export const fieldErrorVariants = cva(['flex-row items-center gap-0.5 min-h-4']);
 
 export const fieldErrorTextVariants = cva(['body-sm', 'text-content-danger']);
 

package/src/components/Heading/{styles.tsx → styles.ts}

@@ -5,7 +5,7 @@ export const headingStyle = cva(
   [
     `text-content-primary my-0`,
     Platform.select({
-      web: 'bg-transparent display-inline no-underline',
+      web: 'bg-transparent no-underline',
       default: '',
     }),
   ],

package/src/components/Icon/index.tsx

@@ -1,7 +1,6 @@
 import { withUniwind } from 'uniwind';
 import { cn } from '@cdx-ui/utils';
 import type { CdxIcon, CdxIconProps } from '@cdx-ui/icons';
-import { COLOR_TEXT_PRIMARY } from '../../styles/primitives';
 
 export type IconProps = CdxIconProps & {
   className?: string; // TODO: Why does this need to specified manually?
@@ -47,7 +46,7 @@ export function Icon({ as: IconComponent, className, ...props }: IconProps) {
   return (
     <StyledIcon
       as={IconComponent}
-      className={cn(COLOR_TEXT_PRIMARY, 'size-5', className)}
+      className={cn('text-content-primary size-5', className)}
       {...props}
     />
   );

package/src/components/IconButton/index.tsx

@@ -53,6 +53,7 @@ const IconButtonRoot = forwardRef<View, IconButtonProps>(
   (
     {
       variant = 'solid',
+      color = 'neutral',
       size = 'default',
       className,
       style,
@@ -63,11 +64,11 @@ const IconButtonRoot = forwardRef<View, IconButtonProps>(
     },
     ref,
   ) => {
-    const rootClassName = cn(iconButtonRootVariants({ variant, size }), className);
+    const rootClassName = cn(iconButtonRootVariants({ variant, color, size }), className);
 
     const glyphClassName = cn(
       iconButtonGlyphVariants({ size }),
-      iconButtonIconColorVariants(),
+      iconButtonIconColorVariants({ variant, color }),
       iconClassName,
     );
 

package/src/components/IconButton/styles.ts

@@ -8,35 +8,133 @@ export const iconButtonRootVariants = cva(
     'rounded-[var(--border-radius-round)]',
     'web:outline-none web:focus:outline-none web:focus-visible:outline-none',
     TRANSITION_COLORS,
-    'data-[disabled=true]:opacity-[--opacity-disabled]',
+    'data-[disabled=true]:opacity-[var(--opacity-disabled)]',
     DISABLED_CURSOR,
-    'web:data-[focus-visible=true]:ring-2 web:data-[focus-visible=true]:ring-[--color-stroke-ring] web:data-[focus-visible=true]:ring-offset-2',
+    'web:data-[focus-visible=true]:ring-2 web:data-[focus-visible=true]:ring-[var(--color-stroke-ring)] web:data-[focus-visible=true]:ring-offset-2',
   ],
   {
     variants: {
       variant: {
-        solid: [
+        solid: [],
+        tint: [],
+        ghost: ['bg-transparent'],
+      },
+      color: {
+        neutral: [],
+        action: [],
+        danger: [],
+      },
+      size: {
+        default: 'h-11 w-11 min-w-11 shrink-0 p-2.5',
+        small: 'h-8 w-8 min-w-8 shrink-0 p-1.5',
+      },
+    },
+    compoundVariants: [
+      // ── solid × color ───────────────────────────────────────────────────
+      {
+        variant: 'solid',
+        color: 'neutral',
+        className: [
           'bg-surface-primary border border-stroke-secondary',
           Platform.select({
             default: 'data-[active=true]:bg-surface-primary-active',
             web: 'data-[hover=true]:bg-surface-primary-hover data-[active=true]:data-[hover=true]:bg-surface-secondary-active',
           }),
         ],
-        ghost: [
-          'bg-transparent',
+      },
+      {
+        variant: 'solid',
+        color: 'action',
+        className: [
+          'bg-surface-action-strong',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-action-strong-active',
+            web: 'data-[hover=true]:bg-surface-action-strong-hover data-[active=true]:data-[hover=true]:bg-surface-action-strong-active',
+          }),
+        ],
+      },
+      {
+        variant: 'solid',
+        color: 'danger',
+        className: [
+          'bg-surface-danger-strong',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-danger-strong-active',
+            web: 'data-[hover=true]:bg-surface-danger-strong-hover data-[active=true]:data-[hover=true]:bg-surface-danger-strong-active',
+          }),
+        ],
+      },
+
+      // ── tint × color ─────────────────────────────────────────────────
+      {
+        variant: 'tint',
+        color: 'neutral',
+        className: [
+          'bg-surface-neutral-tint',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-neutral-tint-active',
+            web: 'data-[hover=true]:bg-surface-neutral-tint-hover data-[active=true]:data-[hover=true]:bg-surface-neutral-tint-active',
+          }),
+        ],
+      },
+      {
+        variant: 'tint',
+        color: 'action',
+        className: [
+          'bg-surface-action-tint',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-action-tint-active',
+            web: 'data-[hover=true]:bg-surface-action-tint-hover data-[active=true]:data-[hover=true]:bg-surface-action-tint-active',
+          }),
+        ],
+      },
+      {
+        variant: 'tint',
+        color: 'danger',
+        className: [
+          'bg-surface-danger-tint',
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-danger-tint-active',
+            web: 'data-[hover=true]:bg-surface-danger-tint-hover data-[active=true]:data-[hover=true]:bg-surface-danger-tint-active',
+          }),
+        ],
+      },
+
+      // ── ghost × color ──────────────────────────────────────────────────
+      {
+        variant: 'ghost',
+        color: 'neutral',
+        className: [
           Platform.select({
             default: 'data-[active=true]:bg-surface-primary-active',
             web: 'data-[hover=true]:bg-surface-primary-hover data-[active=true]:data-[hover=true]:bg-surface-secondary-active',
           }),
         ],
       },
-      size: {
-        default: 'h-11 w-11 min-w-11 shrink-0 p-2.5',
-        small: 'h-8 w-8 min-w-8 shrink-0 p-1.5',
+      {
+        variant: 'ghost',
+        color: 'action',
+        className: [
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-action-tint-active',
+            web: 'data-[hover=true]:bg-surface-action-tint-hover data-[active=true]:data-[hover=true]:bg-surface-action-tint-active',
+          }),
+        ],
       },
-    },
+      {
+        variant: 'ghost',
+        color: 'danger',
+        className: [
+          Platform.select({
+            default: 'data-[active=true]:bg-surface-danger-tint-active',
+            web: 'data-[hover=true]:bg-surface-danger-tint-hover data-[active=true]:data-[hover=true]:bg-surface-danger-tint-active',
+          }),
+        ],
+      },
+    ],
     defaultVariants: {
       variant: 'solid',
+      color: 'neutral',
       size: 'default',
     },
   },
@@ -54,6 +152,34 @@ export const iconButtonGlyphVariants = cva([], {
   },
 });
 
-export const iconButtonIconColorVariants = cva(['text-content-primary']);
+export const iconButtonIconColorVariants = cva([], {
+  variants: {
+    variant: {
+      solid: [],
+      tint: [],
+      ghost: [],
+    },
+    color: {
+      neutral: [],
+      action: [],
+      danger: [],
+    },
+  },
+  compoundVariants: [
+    { variant: 'solid', color: 'neutral', className: 'text-content-primary' },
+    { variant: 'solid', color: 'action', className: 'text-content-action-on-strong' },
+    { variant: 'solid', color: 'danger', className: 'text-content-danger-on-strong' },
+    { variant: 'tint', color: 'neutral', className: 'text-content-primary' },
+    { variant: 'tint', color: 'action', className: 'text-content-action-on-subtle' },
+    { variant: 'tint', color: 'danger', className: 'text-content-danger-on-subtle' },
+    { variant: 'ghost', color: 'neutral', className: 'text-content-primary' },
+    { variant: 'ghost', color: 'action', className: 'text-content-action' },
+    { variant: 'ghost', color: 'danger', className: 'text-content-danger' },
+  ],
+  defaultVariants: {
+    variant: 'solid',
+    color: 'neutral',
+  },
+});
 
 export type IconButtonVariantProps = VariantProps<typeof iconButtonRootVariants>;

package/src/components/Input/styles.ts

@@ -3,13 +3,13 @@ import { DISABLED_CURSOR, TRANSITION_COLORS } from '../../styles/primitives';
 
 export const inputRootVariants = cva(
   [
-    'w-full flex-row items-stretch overflow-hidden',
+    'w-full flex-row items-center overflow-hidden',
     'bg-surface-primary',
     'border-solid border-[length:var(--border-width-default)] border-stroke-primary',
     'rounded-[var(--border-radius-default)]',
     TRANSITION_COLORS,
     'data-[disabled=true]:bg-surface-secondary',
-    'data-[disabled=true]:opacity-[--opacity-disabled]',
+    'data-[disabled=true]:opacity-[var(--opacity-disabled)]',
     DISABLED_CURSOR,
     'data-[readonly=true]:cursor-default',
     'data-[readonly=true]:bg-surface-secondary',
@@ -24,11 +24,16 @@ export const inputRootVariants = cva(
         outline: [],
       },
       size: {
-        // TODO: Find a cleaner approach to preventing layout shift when focus border is applied.
-        default: ['h-10 px-4 py-2 gap-2', 'data-[focus=true]:px-[15px] data-[focus=true]:py-[7px]'],
+        default: [
+          'h-11 min-h-11 px-4 py-3 gap-4',
+          // Subtract one hairline from padding when focused so the wider focus border doesn’t shift layout.
+          'data-[focus=true]:px-[calc(var(--spacing-4)-var(--spacing-px))]',
+          'data-[focus=true]:py-[calc(var(--spacing-3)-var(--spacing-px))]',
+        ],
         small: [
-          'h-8 px-3 py-1.5 gap-1.5',
-          'data-[focus=true]:px-[11px] data-[focus=true]:py-[5px]',
+          'h-8 min-h-8 px-3 py-2 gap-1.5',
+          'data-[focus=true]:px-[calc(var(--spacing-3)-var(--spacing-px))]',
+          'data-[focus=true]:py-[calc(var(--spacing-2)-var(--spacing-px))]',
         ],
       },
     },
@@ -42,7 +47,7 @@ export const inputRootVariants = cva(
 export const inputFieldVariants = cva(
   [
     'flex-1 justify-center bg-transparent p-0',
-    'font-body text-content-primary',
+    'text-content-primary',
     'placeholder:text-content-tertiary',
     'web:outline-none',
     'tracking-normal',
@@ -60,7 +65,7 @@ export const inputFieldVariants = cva(
   },
 );
 
-export const inputSlotVariants = cva(['items-center justify-center self-center']);
+export const inputSlotVariants = cva(['items-center justify-center self-center shrink-0']);
 
 export const inputIconVariants = cva(['text-content-tertiary'], {
   variants: {