@womp/kookie-ui 0.18.0 → 0.20.0

package/src/components/alert-dialog.tsx

@@ -7,6 +7,7 @@ import { Heading } from './heading.js';
 import { Text } from './text.js';
 import { Theme } from './theme.js';
 import { extractProps } from '../helpers/extract-props.js';
+import { useThemeSizeProps } from '../helpers/theme-size.js';
 import { requireReactElement } from '../helpers/require-react-element.js';
 
 import type { AlertDialogContentOwnProps } from './alert-dialog.props.js';
@@ -51,7 +52,8 @@ interface AlertDialogContentProps
   container?: React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Portal>['container'];
 }
 const AlertDialogContent = React.forwardRef<AlertDialogContentElement, AlertDialogContentProps>(
-  ({ align, ...props }, forwardedRef) => {
+  ({ align, ...ownProps }, forwardedRef) => {
+    const props = useThemeSizeProps(ownProps, contentPropDefs.size);
     const { className: alignClassName } = extractProps({ align }, alignPropDefs);
 
     const {

package/src/components/avatar.css

@@ -134,63 +134,63 @@
       --avatar-size: var(--control-height-1);
       --avatar-fallback-one-letter-font-size: var(--font-size-2);
       --avatar-fallback-two-letters-font-size: var(--font-size-1);
-      border-radius: var(--radius-pill-1);
+      border-radius: var(--radius-control-1);
       letter-spacing: var(--letter-spacing-1);
     }
     &:where(.rt-r-size-2) {
       --avatar-size: var(--control-height-2);
       --avatar-fallback-one-letter-font-size: var(--font-size-3);
       --avatar-fallback-two-letters-font-size: var(--font-size-2);
-      border-radius: var(--radius-pill-2);
+      border-radius: var(--radius-control-2);
       letter-spacing: var(--letter-spacing-2);
     }
     &:where(.rt-r-size-3) {
       --avatar-size: var(--control-height-3);
       --avatar-fallback-one-letter-font-size: var(--font-size-4);
       --avatar-fallback-two-letters-font-size: var(--font-size-3);
-      border-radius: var(--radius-pill-3);
+      border-radius: var(--radius-control-3);
       letter-spacing: var(--letter-spacing-3);
     }
     &:where(.rt-r-size-4) {
       --avatar-size: var(--control-height-4);
       --avatar-fallback-one-letter-font-size: var(--font-size-5);
       --avatar-fallback-two-letters-font-size: var(--font-size-4);
-      border-radius: var(--radius-pill-4);
+      border-radius: max(var(--radius-control-4), var(--radius-full));
       letter-spacing: var(--letter-spacing-4);
     }
     &:where(.rt-r-size-5) {
       --avatar-size: calc(56px * var(--scale));
       --avatar-fallback-one-letter-font-size: var(--font-size-6);
       --avatar-fallback-two-letters-font-size: var(--font-size-5);
-      border-radius: var(--radius-pill-5);
+      border-radius: max(var(--radius-control-4), var(--radius-full));
       letter-spacing: var(--letter-spacing-5);
     }
     &:where(.rt-r-size-6) {
       --avatar-size: var(--space-10);
       --avatar-fallback-one-letter-font-size: var(--font-size-7);
       --avatar-fallback-two-letters-font-size: var(--font-size-6);
-      border-radius: var(--radius-pill-6);
+      border-radius: max(var(--radius-control-4), var(--radius-full));
       letter-spacing: var(--letter-spacing-6);
     }
     &:where(.rt-r-size-7) {
       --avatar-size: calc(80px * var(--scale));
       --avatar-fallback-one-letter-font-size: var(--font-size-7);
       --avatar-fallback-two-letters-font-size: var(--font-size-6);
-      border-radius: var(--radius-pill-7);
+      border-radius: max(var(--radius-control-4), var(--radius-full));
       letter-spacing: var(--letter-spacing-7);
     }
     &:where(.rt-r-size-8) {
       --avatar-size: calc(96px * var(--scale));
-      --avatar-fallback-one-letter-font-size: var(--font-size-8);
+      --avatar-fallback-one-letter-font-size: var(--font-size-7);
       --avatar-fallback-two-letters-font-size: var(--font-size-7);
-      border-radius: var(--radius-pill-8);
-      letter-spacing: var(--letter-spacing-8);
+      border-radius: max(var(--radius-control-4), var(--radius-full));
+      letter-spacing: var(--letter-spacing-7);
     }
     &:where(.rt-r-size-9) {
       --avatar-size: var(--space-12);
       --avatar-fallback-one-letter-font-size: var(--font-size-9);
-      --avatar-fallback-two-letters-font-size: var(--font-size-8);
-      border-radius: var(--radius-pill-9);
+      --avatar-fallback-two-letters-font-size: var(--font-size-7);
+      border-radius: max(var(--radius-control-4), var(--radius-full));
       letter-spacing: var(--letter-spacing-9);
     }
   }

package/src/components/badge.css

@@ -37,9 +37,9 @@
 @breakpoints {
   .rt-Badge {
     &:where(.rt-r-size-1) {
-      font-size: var(--font-size-0);
-      line-height: var(--line-height-0);
-      letter-spacing: var(--letter-spacing-0);
+      font-size: var(--font-size-1);
+      line-height: var(--line-height-1);
+      letter-spacing: var(--letter-spacing-1);
       padding: var(--space-1) var(--space-2);
       gap: var(--space-2);
       border-radius: max(calc(var(--radius-1) * var(--spacing-multiplier-medium)), var(--radius-full));
@@ -50,7 +50,7 @@
       letter-spacing: var(--letter-spacing-1);
       padding: var(--space-2) var(--space-3);
       gap: var(--space-2);
-      border-radius: var(--radius-pill-1);
+      border-radius: var(--radius-control-1);
 
       &:where(.rt-variant-ghost) {
         padding: var(--space-1) var(--space-2);
@@ -62,7 +62,7 @@
       letter-spacing: var(--letter-spacing-2);
       padding: var(--space-2) var(--space-4);
       gap: var(--space-3);
-      border-radius: var(--radius-pill-2);
+      border-radius: var(--radius-control-2);
 
       &:where(.rt-variant-ghost) {
         padding: var(--space-1) var(--space-3);
@@ -75,7 +75,7 @@
       letter-spacing: var(--letter-spacing-3);
       padding: var(--space-2) var(--space-4);
       gap: var(--space-3);
-      border-radius: var(--radius-pill-3);
+      border-radius: var(--radius-control-3);
 
       &:where(.rt-variant-ghost) {
         padding: var(--space-2) var(--space-3);

package/src/components/blockquote.props.tsx

@@ -7,7 +7,7 @@ import { weightPropDef } from '../props/weight.prop.js';
 
 import type { PropDef } from '../props/prop-def.js';
 
-const sizes = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'] as const;
+const sizes = ['1', '2', '3', '4', '5', '6', '7', '8', '9'] as const;
 
 const blockquotePropDefs = {
   ...asChildPropDef,

package/src/components/card.css

@@ -7,6 +7,17 @@
 .rt-Card {
   --base-card-border-width: var(--card-border-width);
 
+  /*
+   * A Card is a nesting surface (rt-SurfaceNest, tokens/radius.css): it pads by its own
+   * --kui-sf-p and draws --kui-sf-r, which inside another surface is the outer corner minus
+   * the outer padding, so a Card in a Card stays concentric.
+   */
+  --base-card-padding-top: var(--kui-sf-p);
+  --base-card-padding-right: var(--kui-sf-p);
+  --base-card-padding-bottom: var(--kui-sf-p);
+  --base-card-padding-left: var(--kui-sf-p);
+  --base-card-border-radius: var(--kui-sf-r);
+
   &:where(:focus-visible) {
     outline: 2px solid var(--focus-8);
     outline-offset: -1px;
@@ -21,5 +32,3 @@
     }
   }
 }
-
-

package/src/components/card.props.tsx

@@ -2,20 +2,17 @@ import { asChildPropDef } from '../props/as-child.prop.js';
 
 import type { PropDef } from '../props/prop-def.js';
 
-const sizes = ['1', '2', '3', '4', '5'] as const;
+const sizes = ['1', '2', '3', '4'] as const;
 const variants = ['raised', 'surface', 'outline', 'ghost', 'soft'] as const;
 
 const cardPropDefs = {
   ...asChildPropDef,
-  size: { type: 'enum', className: 'rt-r-size', values: sizes, default: '1', responsive: true },
+  /** Padding --surface-p-N and corner --radius-surface-N. Unset, it follows the Theme size. */
+  size: { type: 'enum', className: 'rt-r-size', values: sizes, default: '2', responsive: true },
   variant: { type: 'enum', className: 'rt-variant', values: variants, default: 'raised' },
-  flush: { type: 'boolean', default: false },
-  inset: { type: 'boolean', default: false },
 } satisfies {
   size: PropDef<(typeof sizes)[number]>;
   variant: PropDef<(typeof variants)[number]>;
-  flush: PropDef<boolean>;
-  inset: PropDef<boolean>;
 };
 
 export { cardPropDefs };

package/src/components/card.tsx

@@ -1,9 +1,12 @@
+'use client';
+
 import * as React from 'react';
 import classNames from 'classnames';
 import { Slot } from 'radix-ui';
 
 import { cardPropDefs } from './card.props.js';
 import { extractProps } from '../helpers/extract-props.js';
+import { useThemeSizeProps } from '../helpers/theme-size.js';
 import { marginPropDefs } from '../props/margin.props.js';
 
 import type { MarginProps } from '../props/margin.props.js';
@@ -13,20 +16,15 @@ import type { GetPropDefTypes } from '../props/prop-def.js';
 type CardElement = React.ElementRef<'div'>;
 type CardOwnProps = GetPropDefTypes<typeof cardPropDefs>;
 interface CardProps extends ComponentPropsWithout<'div', RemovedProps>, MarginProps, CardOwnProps {}
-const Card = React.forwardRef<CardElement, CardProps>((props, forwardedRef) => {
-  const { asChild, className, flush, inset, ...cardProps } = extractProps(
-    props,
-    cardPropDefs,
-    marginPropDefs,
-  );
+const Card = React.forwardRef<CardElement, CardProps>((ownProps, forwardedRef) => {
+  const props = useThemeSizeProps(ownProps, cardPropDefs.size);
+  const { asChild, className, ...cardProps } = extractProps(props, cardPropDefs, marginPropDefs);
   const Comp = asChild ? Slot.Root : 'div';
   return (
     <Comp
       ref={forwardedRef}
       {...cardProps}
-      data-flush={flush ? 'true' : undefined}
-      data-inset={inset ? 'true' : undefined}
-      className={classNames('rt-reset', 'rt-BaseCard', 'rt-Card', className)}
+      className={classNames('rt-reset', 'rt-BaseCard', 'rt-Card', 'rt-SurfaceNest', className)}
     />
   );
 });

package/src/components/chatbar.css

@@ -210,7 +210,7 @@
 @breakpoints {
   .rt-ChatbarRoot:where(.rt-r-size-1) .rt-ChatbarBox {
     /* Map Chatbar size 1 to Card size 2 */
-    border-radius: min(var(--radius-surface-6), calc(var(--radius-surface-2) + var(--space-3)));
+    border-radius: var(--radius-surface-2);
     padding: var(--space-4);
   }
   .rt-ChatbarRoot:where(.rt-r-size-1) .rt-ChatbarInput {
@@ -220,7 +220,7 @@
   }
   .rt-ChatbarRoot:where(.rt-r-size-2) .rt-ChatbarBox {
     /* Map Chatbar size 2 to Card size 3 */
-    border-radius: min(var(--radius-surface-7), calc(var(--radius-surface-3) + var(--space-4)));
+    border-radius: var(--radius-surface-3);
     padding: var(--space-5);
   }
   .rt-ChatbarRoot:where(.rt-r-size-2) .rt-ChatbarInput {
@@ -230,7 +230,7 @@
   }
   .rt-ChatbarRoot:where(.rt-r-size-3) .rt-ChatbarBox {
     /* Custom Chatbar size 3, different to Card size 4 */
-    border-radius: min(var(--radius-surface-7), calc(var(--radius-surface-3) + var(--space-4)));
+    border-radius: var(--radius-surface-3);
     padding: var(--space-5);
   }
   .rt-ChatbarRoot:where(.rt-r-size-3) .rt-ChatbarInput {
@@ -256,13 +256,13 @@
 /* Reduced radius when collapsed (scale down by 1) */
 @breakpoints {
   .rt-ChatbarRoot:where([data-state='closed'].rt-r-size-1) .rt-ChatbarBox {
-    border-radius: min(var(--radius-surface-5), calc(var(--radius-surface-1) + var(--space-2)));
+    border-radius: var(--radius-surface-1);
   }
   .rt-ChatbarRoot:where([data-state='closed'].rt-r-size-2) .rt-ChatbarBox {
-    border-radius: min(var(--radius-surface-6), calc(var(--radius-surface-2) + var(--space-3)));
+    border-radius: var(--radius-surface-2);
   }
   .rt-ChatbarRoot:where([data-state='closed'].rt-r-size-3) .rt-ChatbarBox {
-    border-radius: min(var(--radius-surface-6), calc(var(--radius-surface-2) + var(--space-3)));
+    border-radius: var(--radius-surface-2);
   }
 }
 

package/src/components/checkbox-cards.css

@@ -51,8 +51,6 @@
 /*                                     */
 /* * * * * * * * * * * * * * * * * * * */
 
-
-
 @breakpoints {
   .rt-CheckboxCardsRoot {
     /* Size 1 */
@@ -61,17 +59,15 @@
       --line-height: var(--line-height-2);
       --letter-spacing: var(--letter-spacing-2);
       /* keep in sync with checkbox */
-      --checkbox-cards-item-checkbox-size: calc(var(--space-5) * var(--spacing-multiplier-medium));
+      --checkbox-cards-item-checkbox-size: var(--mark-1, calc(16px * var(--scale)));
     }
-    
-
     /* Size 2 */
     &:where(.rt-r-size-2) {
       font-size: var(--font-size-2);
       --line-height: var(--line-height-2);
       --letter-spacing: var(--letter-spacing-2);
       /* keep in sync with checkbox */
-      --checkbox-cards-item-checkbox-size: var(--space-5);
+      --checkbox-cards-item-checkbox-size: var(--mark-2, calc(20px * var(--scale)));
     }
     /* Size 3 */
     &:where(.rt-r-size-3) {
@@ -79,7 +75,7 @@
       --line-height: var(--line-height-3);
       --letter-spacing: var(--letter-spacing-3);
       /* keep in sync with checkbox */
-      --checkbox-cards-item-checkbox-size: calc(var(--space-5) * var(--spacing-multiplier-large));
+      --checkbox-cards-item-checkbox-size: var(--mark-3, calc(24px * var(--scale)));
     }
     /* Size 4 */
     &:where(.rt-r-size-4) {
@@ -87,21 +83,11 @@
       --line-height: var(--line-height-3);
       --letter-spacing: var(--letter-spacing-3);
       /* keep in sync with checkbox */
-      --checkbox-cards-item-checkbox-size: calc(var(--space-5) * var(--spacing-multiplier-large));
-    }
-    /* Size 5 */
-    &:where(.rt-r-size-5) {
-      font-size: var(--font-size-4);
-      --line-height: var(--line-height-4);
-      --letter-spacing: var(--letter-spacing-4);
-      /* keep in sync with checkbox */
-      --checkbox-cards-item-checkbox-size: calc(var(--space-6) * var(--spacing-multiplier-medium));
+      --checkbox-cards-item-checkbox-size: var(--mark-4, calc(26px * var(--scale)));
     }
   }
 }
 
-
-
 /* * * * * * * * * * * * * * * * * * * */
 /*                                     */
 /*         All tap highlights          */
@@ -136,33 +122,3 @@
     background-color: var(--gray-a5);
   }
 }
-
-/*
- * Pin the item shell to the control channel.
- *
- * These are selection controls that happen to be card-shaped, not surfaces:
- * they sit in a row of choices and read as one large target each. Inheriting
- * BaseCard's damped surface radius made them square off while every other
- * control in the same form stayed round, so they take the control channel
- * instead — the same formulas BaseCard used before the surface split. The
- * mark inside keeps its own radius.
- */
-@breakpoints {
-  .rt-CheckboxCardsItem {
-    &:where(.rt-r-size-1) {
-      --base-card-border-radius: min(var(--radius-5), calc(var(--radius-1) + var(--space-2)));
-    }
-    &:where(.rt-r-size-2) {
-      --base-card-border-radius: min(var(--radius-6), calc(var(--radius-2) + var(--space-3)));
-    }
-    &:where(.rt-r-size-3) {
-      --base-card-border-radius: min(var(--radius-7), calc(var(--radius-3) + var(--space-4)));
-    }
-    &:where(.rt-r-size-4) {
-      --base-card-border-radius: min(var(--radius-8), calc(var(--radius-4) + var(--space-5)));
-    }
-    &:where(.rt-r-size-5) {
-      --base-card-border-radius: min(var(--radius-9), calc(var(--radius-5) + var(--space-6)));
-    }
-  }
-}

package/src/components/checkbox-cards.props.tsx

@@ -5,12 +5,13 @@ import { gridPropDefs } from './grid.props.js';
 
 import type { PropDef } from '../props/prop-def.js';
 
-const sizes = ['1', '2', '3', '4', '5'] as const;
+const sizes = ['1', '2', '3', '4'] as const;
 // The same list as Card: a selectable card looks like any other card.
 const variants = cardPropDefs.variant.values;
 
 const checkboxCardsRootPropDefs = {
   ...asChildPropDef,
+  /** The Card surface ladder: padding --surface-p-N, corner --radius-surface-N. Unset, it follows the Theme size. */
   size: { type: 'enum', className: 'rt-r-size', values: sizes, default: '2', responsive: true },
   variant: { type: 'enum', className: 'rt-variant', values: variants, default: 'raised' },
   ...colorPropDef,

package/src/components/checkbox-cards.tsx

@@ -11,6 +11,7 @@ import { baseCheckboxPropDefs } from './_internal/base-checkbox.props.js';
 import { Grid } from './grid.js';
 import { ThickCheckIcon } from './icons.js';
 import { extractProps } from '../helpers/extract-props.js';
+import { useThemeSizeProps } from '../helpers/theme-size.js';
 import { marginPropDefs } from '../props/margin.props.js';
 
 import type { ComponentPropsWithout, RemovedProps } from '../helpers/component-props.js';
@@ -43,7 +44,8 @@ interface CheckboxCardsRootProps
     MarginProps,
     CheckboxCardsRootOwnProps {}
 const CheckboxCardsRoot = React.forwardRef<CheckboxCardsRootElement, CheckboxCardsRootProps>(
-  (props: ScopedProps<CheckboxCardsRootProps>, forwardedRef) => {
+  (ownProps: ScopedProps<CheckboxCardsRootProps>, forwardedRef) => {
+    const props = useThemeSizeProps(ownProps, checkboxCardsRootPropDefs.size);
     const {
       __scopeCheckboxCards,
       className,
@@ -54,7 +56,7 @@ const CheckboxCardsRoot = React.forwardRef<CheckboxCardsRootElement, CheckboxCar
     return (
       <CheckboxCardsProvider
         scope={__scopeCheckboxCards}
-        size={props.size}
+        size={props.size ?? checkboxCardsRootPropDefs.size.default}
         variant={props.variant}
       >
         <Grid asChild>
@@ -93,7 +95,11 @@ const CheckboxCardsItem = React.forwardRef<
     baseCheckboxPropDefs,
   );
   const variantClass = context?.variant ? `rt-variant-${context.variant}` : undefined;
-  const sizeClass = context?.size ? `rt-r-size-${context.size}` : undefined;
+  // extractProps writes the responsive size classes (`md:rt-r-size-3`) a template string cannot.
+  const { className: sizeClass } = extractProps(
+    { size: context?.size },
+    { size: checkboxCardsRootPropDefs.size },
+  );
 
   return (
     <label

package/src/components/code.css

@@ -2,9 +2,8 @@
 /* Disable selector-max-type rule to target individual element types. */
 
 .rt-Code {
-  --code-variant-font-size-adjust: calc(var(--code-font-size-adjust) * 0.95);
   font-family: var(--code-font-family);
-  font-size: calc(var(--code-variant-font-size-adjust) * 1em);
+  font-size: calc(var(--mono-scale) * 1em);
   font-style: var(--code-font-style);
   font-weight: var(--code-font-weight);
   line-height: 1.25;
@@ -33,71 +32,51 @@
 
 @breakpoints {
   .rt-Code {
-    &:where(.rt-r-size-0) {
-      font-size: calc(var(--font-size-0) * var(--code-variant-font-size-adjust));
-      line-height: var(--line-height-0);
-      --letter-spacing: var(--letter-spacing-0);
-    }
     &:where(.rt-r-size-1) {
-      font-size: calc(var(--font-size-1) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-1) * var(--mono-scale));
       line-height: var(--line-height-1);
       --letter-spacing: var(--letter-spacing-1);
     }
     &:where(.rt-r-size-2) {
-      font-size: calc(var(--font-size-2) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-2) * var(--mono-scale));
       line-height: var(--line-height-2);
       --letter-spacing: var(--letter-spacing-2);
     }
     &:where(.rt-r-size-3) {
-      font-size: calc(var(--font-size-3) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-3) * var(--mono-scale));
       line-height: var(--line-height-3);
       --letter-spacing: var(--letter-spacing-3);
     }
     &:where(.rt-r-size-4) {
-      font-size: calc(var(--font-size-4) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-4) * var(--mono-scale));
       line-height: var(--line-height-4);
       --letter-spacing: var(--letter-spacing-4);
     }
     &:where(.rt-r-size-5) {
-      font-size: calc(var(--font-size-5) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-5) * var(--mono-scale));
       line-height: var(--line-height-5);
       --letter-spacing: var(--letter-spacing-5);
     }
     &:where(.rt-r-size-6) {
-      font-size: calc(var(--font-size-6) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-6) * var(--mono-scale));
       line-height: var(--line-height-6);
       --letter-spacing: var(--letter-spacing-6);
     }
     &:where(.rt-r-size-7) {
-      font-size: calc(var(--font-size-7) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-7) * var(--mono-scale));
       line-height: var(--line-height-7);
       --letter-spacing: var(--letter-spacing-7);
     }
     &:where(.rt-r-size-8) {
-      font-size: calc(var(--font-size-8) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-8) * var(--mono-scale));
       line-height: var(--line-height-8);
       --letter-spacing: var(--letter-spacing-8);
     }
     &:where(.rt-r-size-9) {
-      font-size: calc(var(--font-size-9) * var(--code-variant-font-size-adjust));
+      font-size: calc(var(--font-size-9) * var(--mono-scale));
       line-height: var(--line-height-9);
       --letter-spacing: var(--letter-spacing-9);
     }
-    &:where(.rt-r-size-10) {
-      font-size: calc(var(--font-size-10) * var(--code-variant-font-size-adjust));
-      line-height: var(--line-height-10);
-      --letter-spacing: var(--letter-spacing-10);
-    }
-    &:where(.rt-r-size-11) {
-      font-size: calc(var(--font-size-11) * var(--code-variant-font-size-adjust));
-      line-height: var(--line-height-11);
-      --letter-spacing: var(--letter-spacing-11);
-    }
-    &:where(.rt-r-size-12) {
-      font-size: calc(var(--font-size-12) * var(--code-variant-font-size-adjust));
-      line-height: var(--line-height-12);
-      --letter-spacing: var(--letter-spacing-12);
-    }
   }
 }
 
@@ -110,7 +89,6 @@
 /* ghost */
 
 .rt-Code:where(.rt-variant-ghost) {
-  --code-variant-font-size-adjust: var(--code-font-size-adjust);
   padding: 0;
 
   /* Same ladder as Text. No colour and no emphasis inherits the surrounding colour. */

package/src/components/code.props.tsx

@@ -7,7 +7,7 @@ import { weightPropDef } from '../props/weight.prop.js';
 
 import type { PropDef } from '../props/prop-def.js';
 
-const sizes = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'] as const;
+const sizes = ['1', '2', '3', '4', '5', '6', '7', '8', '9'] as const;
 const variants = ['solid', 'soft', 'outline', 'ghost'] as const;
 
 const codePropDefs = {

package/src/components/combobox.css

@@ -66,15 +66,6 @@
   cursor: var(--cursor-menu-item);
 }
 
-/* Room for the check indicator on every size */
-.rt-BaseMenuContent:where(.rt-r-size-1) :where(.rt-ComboboxItem, .rt-ComboboxLabel) {
-  --base-menu-item-padding-left: calc(var(--space-6) / 1.2);
-}
-
-.rt-BaseMenuContent:where(.rt-r-size-2, .rt-r-size-3) :where(.rt-ComboboxItem, .rt-ComboboxLabel) {
-  --base-menu-item-padding-left: var(--space-6);
-}
-
 /* Search row: shares the surface background, no second panel */
 .rt-ComboboxSearch {
   padding: var(--base-menu-content-padding);

package/src/components/combobox.props.tsx

@@ -42,7 +42,7 @@ const comboboxTriggerPropDefs = {
 };
 
 // The list is a menu, and menus stop at size 3.
-const contentSizes = ['1', '2', '3'] as const;
+const contentSizes = ['1', '2', '3', '4'] as const;
 
 /**
  * Styling props for the dropdown surface rendered by Combobox.Content.

package/src/components/dialog.css

@@ -1 +1,5 @@
 @import './_internal/base-dialog.css';
+
+.rt-DialogContent {
+  max-width: var(--overlay-w);
+}

package/src/components/dialog.props.tsx

@@ -20,12 +20,13 @@ const dialogContentPropDefs = {
     type: 'enum',
     className: 'rt-r-size',
     values: contentSizes,
-    default: '3',
+    default: '2',
     responsive: true,
   },
   width: widthPropDefs.width,
   minWidth: widthPropDefs.minWidth,
-  maxWidth: { ...widthPropDefs.maxWidth, default: '600px' },
+  // No default: the size's --overlay-w is the max width until a maxWidth is given.
+  maxWidth: widthPropDefs.maxWidth,
   ...heightPropDefs,
 } satisfies {
   align: PropDef<(typeof alignValues)[number]>;

package/src/components/dialog.tsx

@@ -7,6 +7,7 @@ import { Heading } from './heading.js';
 import { Text } from './text.js';
 import { Theme } from './theme.js';
 import { extractProps } from '../helpers/extract-props.js';
+import { useThemeSizeProps } from '../helpers/theme-size.js';
 import { requireReactElement } from '../helpers/require-react-element.js';
 import { useBodyPointerEventsCleanup } from '../hooks/use-body-pointer-events-cleanup.js';
 
@@ -49,7 +50,8 @@ interface DialogContentProps
   container?: React.ComponentPropsWithoutRef<typeof DialogPrimitive.Portal>['container'];
 }
 const DialogContent = React.forwardRef<DialogContentElement, DialogContentProps>(
-  ({ align, ...props }, forwardedRef) => {
+  ({ align, ...ownProps }, forwardedRef) => {
+    const props = useThemeSizeProps(ownProps, contentPropDefs.size);
     const { className: alignClassName } = extractProps({ align }, alignPropDefs);
 
     const {