@dxos/ui-theme 0.8.4-main.fbb7a13 → 0.8.4-staging.ac66bdf99f

package/src/theme/components/button.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import type { ComponentFunction, Density, Elevation, Theme } from '@dxos/ui-types';
+
+import { ghostHover } from '../../fragments';
+import { mx } from '../../util';
+
+export const primaryButtonColors =
+  'text-accent-surface-text bg-accent-surface hover:bg-accent-surface-hover aria-pressed:bg-primary-500 dark:aria-pressed:bg-primary-500 data-[state=open]:bg-primary-500 dark:data-[state=open]:bg-primary-500 aria-checked:bg-primary-500 dark:aria-checked:bg-primary-500 aria-checked:text-primary-100';
+
+export const staticDefaultButtonColors = 'bg-input-surface text-input-surface-text';
+
+export const defaultButtonColors = mx(
+  staticDefaultButtonColors,
+  'data-[state=open]:bg-input-surface aria-pressed:text-accent-text aria-pressed:bg-base-surface aria-checked:text-accent-text aria-checked:bg-base-surface',
+);
+
+export const ghostButtonColors = mx(
+  ghostHover,
+  'hover:text-inherit data-[state=open]:bg-input-surface aria-pressed:text-accent-text aria-pressed:bg-base-surface aria-checked:text-accent-text aria-checked:bg-base-surface',
+);
+
+export type ButtonStyleProps = Partial<{
+  inGroup?: boolean;
+  textWrap?: boolean;
+  density: Density;
+  elevation: Elevation;
+  disabled: boolean;
+  variant: 'default' | 'primary' | 'ghost' | 'outline';
+}>;
+
+const buttonRoot: ComponentFunction<ButtonStyleProps> = (_props, ...etc) => {
+  return mx('dx-button dx-focus-ring group [&_span]:truncate', ...etc);
+};
+
+const buttonGroup: ComponentFunction<{ elevation?: Elevation }> = (_props, ...etc) => {
+  return mx(
+    'inline-flex rounded-xs [&>:first-child]:rounded-w-sm [&>:last-child]:rounded-ie-sm [&>button]:relative',
+    ...etc,
+  );
+};
+
+export const buttonTheme: Theme<ButtonStyleProps> = {
+  root: buttonRoot,
+  group: buttonGroup,
+};

package/src/theme/components/card.ts

@@ -0,0 +1,102 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentFunction, type Density, type Theme } from '@dxos/ui-types';
+
+import { mx } from '../../util';
+
+export type CardStyleProps = {
+  border?: boolean;
+  fullWidth?: boolean;
+  srOnly?: boolean;
+  variant?: 'default' | 'subtitle' | 'description';
+  density?: Density;
+  truncate?: boolean;
+  padding?: boolean;
+};
+
+const cardRoot: ComponentFunction<CardStyleProps> = ({ border, fullWidth }, ...etc) =>
+  mx(
+    'dx-card dx-card-min-width dx-card-max-width min-h-(--dx-rail-item) group/card relative overflow-hidden',
+    border &&
+      'bg-card-surface border border-separator dark:border-subdued-separator rounded-xs dx-focus-ring-group-y-indicator',
+    fullWidth && 'max-w-none!',
+    ...etc,
+  );
+
+const cardToolbar: ComponentFunction<CardStyleProps> = (_, ...etc) =>
+  mx(
+    'dx-card__toolbar dx-density-fine bg-transparent p-0! gap-0! col-span-3 grid! grid-cols-subgrid! [contain:none]',
+    ...etc,
+  );
+
+const cardTitle: ComponentFunction<CardStyleProps> = (_props, ...etc) => mx('dx-card__title grow truncate', ...etc);
+
+const cardContent: ComponentFunction<CardStyleProps> = (_props, ...etc) =>
+  mx('dx-card__content contents pb-1 last:pb-0', ...etc);
+
+const cardHeading: ComponentFunction<CardStyleProps> = ({ variant = 'default' }, ...etc) =>
+  mx(
+    'dx-card__heading',
+    variant === 'default' && 'py-1',
+    variant === 'subtitle' && 'py-2 text-xs text-description font-medium uppercase',
+    ...etc,
+  );
+
+const cardText: ComponentFunction<CardStyleProps> = ({ variant = 'default', truncate: _truncate }, ...etc) =>
+  mx(
+    'dx-card__text items-center overflow-hidden',
+    variant === 'default' && 'py-1',
+    variant === 'description' && 'py-1.5 text-description',
+    ...etc,
+  );
+
+const cardTextSpan: ComponentFunction<CardStyleProps> = ({ variant = 'default', truncate }, ...etc) =>
+  mx(variant === 'description' && 'text-sm text-description line-clamp-3', truncate && 'truncate', ...etc);
+
+const cardPoster: ComponentFunction<CardStyleProps> = (_props, ...etc) =>
+  mx('dx-card__poster col-span-3 max-h-[200px]', ...etc);
+
+const cardPosterIcon: ComponentFunction<CardStyleProps> = (_props, ...etc) =>
+  mx('dx-card__poster-icon col-span-3 grid place-items-center bg-input-surface text-subdued max-h-[200px]', ...etc);
+
+const cardAction: ComponentFunction<CardStyleProps> = (_props, ...etc) =>
+  mx('dx-card__acztion col-span-3 !grid grid-cols-subgrid p-0! w-full text-start overflow-hidden', ...etc);
+
+const cardActionLabel: ComponentFunction<CardStyleProps> = (_props, ...etc) =>
+  mx('dx-card__action-label min-w-0 flex-1 truncate', ...etc);
+
+const cardLink: ComponentFunction<CardStyleProps> = (_props, ...etc) =>
+  mx('dx-card__link col-span-3 !grid grid-cols-subgrid group p-0! dx-button dx-focus-ring min-h-1!', ...etc);
+
+const cardLinkLabel: ComponentFunction<CardStyleProps> = (_props, ...etc) =>
+  mx('dx-card__link-label min-w-0 flex-1 truncate', ...etc);
+
+const cardRow: ComponentFunction<CardStyleProps> = (_, ...etc) =>
+  mx('dx-card__row col-span-3 grid grid-cols-subgrid', ...etc);
+
+const cardIconBlock: ComponentFunction<CardStyleProps> = ({ padding }, ...etc) =>
+  mx(
+    'dx-card__icon-block grid h-[var(--dx-rail-item)] w-[var(--dx-rail-item)] place-items-center',
+    padding && '[&>*]:p-1',
+    ...etc,
+  );
+
+export const cardTheme: Theme<CardStyleProps> = {
+  root: cardRoot,
+  toolbar: cardToolbar,
+  title: cardTitle,
+  content: cardContent,
+  row: cardRow,
+  heading: cardHeading,
+  text: cardText,
+  'text-span': cardTextSpan,
+  poster: cardPoster,
+  'poster-icon': cardPosterIcon,
+  action: cardAction,
+  'action-label': cardActionLabel,
+  link: cardLink,
+  'link-label': cardLinkLabel,
+  'icon-block': cardIconBlock,
+};

package/src/{styles → theme}/components/dialog.ts

@@ -5,15 +5,15 @@
 import { type ComponentFunction, type Elevation, type Theme } from '@dxos/ui-types';
 
 import { mx } from '../../util';
-import { descriptionText } from '../fragments';
+import { withColumn } from '../primitives/column';
 
 export type DialogSize = 'sm' | 'md' | 'lg' | 'xl';
 
 const sizeMap: Record<DialogSize, string> = {
-  sm: 'md:!max-is-[24rem]',
-  md: 'md:!max-is-[32rem]',
-  lg: 'md:!max-is-[40rem]',
-  xl: 'md:!max-is-[60rem]',
+  sm: 'md:max-w-[24rem]',
+  md: 'md:max-w-[32rem]!',
+  lg: 'md:max-w-[40rem]!',
+  xl: 'md:max-w-[60rem]!',
 };
 
 export type DialogStyleProps = {
@@ -25,28 +25,37 @@ export type DialogStyleProps = {
 
 export const dialogOverlay: ComponentFunction<DialogStyleProps> = (_props, ...etc) => mx('dx-dialog__overlay', ...etc);
 
-export const dialogContent: ComponentFunction<DialogStyleProps> = ({ inOverlayLayout, size }, ...etc) => {
+export const dialogContent: ComponentFunction<DialogStyleProps> = ({ inOverlayLayout, size = 'md' }, ...etc) => {
   return mx(
-    '@container dx-dialog__content dx-focus-ring modal-surface density-coarse is-full gap-2',
+    '@container',
+    'dx-dialog__content dx-focus-ring dx-modal-surface dx-density-coarse py-4',
     !inOverlayLayout && 'fixed z-50 top-[50%] left-[50%] -translate-x-[50%] -translate-y-[50%]',
-    size && sizeMap[size],
+    sizeMap[size],
     ...etc,
   );
 };
 
 export const dialogHeader: ComponentFunction<DialogStyleProps> = (_props, ...etc) =>
-  mx('dx-dialog__header flex items-center justify-between', ...etc);
+  mx('dx-dialog__header flex pb-4 items-center justify-between', withColumn.center(), ...etc);
+
+export const dialogBody: ComponentFunction<DialogStyleProps> = (_props, ...etc) =>
+  mx('dx-dialog__body dx-expander', withColumn.propagate(), ...etc);
+
+export const dialogActionBar: ComponentFunction<DialogStyleProps> = (_props, ...etc) =>
+  mx('dx-dialog__actionbar flex items-center pt-4 gap-2 dx-density-coarse', withColumn.center(), ...etc);
 
 export const dialogTitle: ComponentFunction<DialogStyleProps> = ({ srOnly }, ...etc) =>
   mx('dx-dialog__title', srOnly && 'sr-only', ...etc);
 
 export const dialogDescription: ComponentFunction<DialogStyleProps> = ({ srOnly }, ...etc) =>
-  mx('dx-dialog__description', descriptionText, srOnly && 'sr-only', ...etc);
+  mx('dx-dialog__description', 'text-description', srOnly && 'sr-only', ...etc);
 
 export const dialogTheme: Theme<DialogStyleProps> = {
   overlay: dialogOverlay,
   content: dialogContent,
   header: dialogHeader,
+  body: dialogBody,
+  actionbar: dialogActionBar,
   title: dialogTitle,
   description: dialogDescription,
 };

package/src/theme/components/focus.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type ComponentFunction, type Theme } from '@dxos/ui-types';
+
+import { mx } from '../../util';
+
+export type FocusStyleProps = {
+  border?: boolean;
+};
+
+/**
+ * Focus ring styles shared by Focus.Group and Focus.Item.
+ * Uses a `::after` pseudo-element overlay so the ring paints above child content
+ * (inset box-shadow alone is obscured by children with backgrounds).
+ * The pseudo-element is `pointer-events-none` and absolutely positioned over the element.
+ * When `border` is true, a subdued CSS border is always visible (e.g., for grid cell edges).
+ */
+const focusRing: ComponentFunction<FocusStyleProps> = ({ border }, ...etc) =>
+  mx(
+    'dx-ring-pseudo outline-hidden',
+    'focus:after:ring-neutral-focus-indicator',
+    'data-[focus-state=active]:after:ring-neutral-focus-indicator',
+    'data-[focus-state=error]:after:ring-rose-500',
+    border && 'border border-separator',
+    ...etc,
+  );
+
+export const focusTheme: Theme<FocusStyleProps> = {
+  group: focusRing,
+  item: focusRing,
+};

package/src/{styles → theme}/components/icon-button.ts

@@ -5,14 +5,12 @@
 import type { ComponentFunction, Theme } from '@dxos/ui-types';
 
 import { mx } from '../../util';
-
 import { type ButtonStyleProps } from './button';
 
 export type IconButtonStyleProps = ButtonStyleProps & { iconOnly?: boolean };
 
-// TODO(burdon): Gap/font size should depend on density.
 export const iconButtonRoot: ComponentFunction<IconButtonStyleProps> = ({ iconOnly }, ...etc) => {
-  return mx('gap-2', iconOnly && 'p-iconButtonPadding min-bs-0', ...etc);
+  return mx('px-1.5', !iconOnly && 'gap-2', ...etc);
 };
 
 export const iconButtonTheme: Theme<IconButtonStyleProps> = {

package/src/theme/components/icon.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type ComponentFunction, type Size, type Theme } from '@dxos/ui-types';
+
+import { getSize, mx } from '../../util';
+
+export type IconStyleProps = {
+  size?: Size;
+};
+
+/**
+ * Size can be specified directly, or inherited from a container (e.g., toolbar).
+ */
+export const iconRoot: ComponentFunction<IconStyleProps> = ({ size }, etc) => {
+  return mx(
+    'shrink-0 text-[var(--icons-color,currentColor)]',
+    size
+      ? getSize(size)
+      : '[width:var(--icon-size,var(--dx-default-icons-size))] [height:var(--icon-size,var(--dx-default-icons-size))]',
+    etc,
+  );
+};
+
+export const iconTheme: Theme<IconStyleProps> = {
+  root: iconRoot,
+};

package/src/{styles → theme}/components/index.ts

@@ -2,11 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './anchored-overflow';
 export * from './avatar';
 export * from './breadcrumb';
+export * from './card';
 export * from './button';
 export * from './dialog';
+export * from './focus';
 export * from './icon';
 export * from './icon-button';
 export * from './input';
@@ -18,7 +19,9 @@ export * from './message';
 export * from './popover';
 export * from './scroll-area';
 export * from './select';
+export * from './splitter';
 export * from './separator';
+export * from './skeleton';
 export * from './status';
 export * from './tag';
 export * from './toast';

package/src/theme/components/input.ts

@@ -0,0 +1,171 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import {
+  type ComponentFragment,
+  type ComponentFunction,
+  type Density,
+  type Elevation,
+  type MessageValence,
+  type Size,
+} from '@dxos/ui-types';
+
+import { densityDimensions, staticDisabled } from '../../fragments';
+import { getSize, getHeight, getWidth, mx, snapSize, sizeValue, textValence } from '../../util';
+
+export type InputStyleProps = Partial<{
+  variant: 'default' | 'subdued' | 'static';
+  density: Density;
+  disabled: boolean;
+  elevation: Elevation;
+  focused: boolean;
+  validationValence: MessageValence;
+  size: Size;
+  checked: boolean;
+}>;
+
+export type InputMetaStyleProps = Partial<{
+  srOnly: boolean;
+  validationValence: MessageValence;
+}>;
+
+export const inputTextLabel = 'py-1 text-sm text-description';
+
+const textInputSurfaceFocus =
+  'transition-colors bg-input-surface focus:bg-focus-surface border border-separator focus:border-separator';
+
+const textInputSurfaceHover = 'hover:bg-focus-surface';
+
+const booleanInputSurface =
+  'shadow-inner transition-colors bg-un-accent aria-checked:bg-accent-surface aria-[checked=mixed]:bg-accent-surface';
+
+const booleanInputSurfaceHover =
+  'hover:bg-un-accent-hover hover:aria-checked:bg-accent-surface-hover hover:aria-[checked=mixed]:bg-accent-surface-hover';
+
+// TODO(burdon): Replace with semantic tokens.
+const inputValence = (valence?: MessageValence) => {
+  switch (valence) {
+    case 'success':
+      return 'shadow-emerald-500/50 dark:shadow-emerald-600/50';
+    case 'info':
+      return 'shadow-cyan-500/50 dark:shadow-cyan-600/50';
+    case 'warning':
+      return 'shadow-amber-500/50 dark:shadow-amber-600/50';
+    case 'error':
+      return 'shadow-rose-500/50 dark:shadow-rose-600/50';
+  }
+};
+
+const sharedSubduedInputStyles: ComponentFragment<InputStyleProps> = (props) => [
+  '[[data-drag-autoscroll="active"]_&]:pointer-events-none',
+  'py-0 w-full bg-transparent text-current placeholder-placeholder',
+  'dx-focus-subdued',
+  densityDimensions(props.density),
+  props.disabled && staticDisabled,
+];
+
+const sharedDefaultInputStyles: ComponentFragment<InputStyleProps> = (props) => [
+  '[[data-drag-autoscroll="active"]_&]:pointer-events-none',
+  'py-0 w-full text-base-surface-text rounded-xs placeholder-placeholder',
+  textInputSurfaceFocus,
+  densityDimensions(props.density),
+  props.disabled ? staticDisabled : textInputSurfaceHover,
+];
+
+const sharedStaticInputStyles: ComponentFragment<InputStyleProps> = (props) => [
+  '[[data-drag-autoscroll="active"]_&]:pointer-events-none',
+  'py-0 w-full text-base-surface-text rounded-xs placeholder-placeholder',
+  textInputSurfaceFocus,
+  textInputSurfaceHover,
+  props.focused && 'bg-attention-surface',
+  inputValence(props.validationValence),
+  props.disabled && staticDisabled,
+  props.focused && 'dx-focus-static',
+];
+
+const inputInput: ComponentFunction<InputStyleProps> = (props, ...etc) =>
+  props.variant === 'subdued'
+    ? mx(...sharedSubduedInputStyles(props), ...etc)
+    : props.variant === 'static'
+      ? mx(...sharedStaticInputStyles(props), ...etc)
+      : mx(
+          ...sharedDefaultInputStyles(props),
+          !props.disabled && 'dx-focus-ring',
+          inputValence(props.validationValence),
+          ...etc,
+        );
+
+const inputTextArea: ComponentFunction<InputStyleProps> = (props, ...etc) => inputInput(props, ...etc);
+
+const inputCheckbox: ComponentFunction<InputStyleProps> = ({ size = 5 }, ...etc) =>
+  mx('dx-checkbox dx-focus-ring', getSize(size), ...etc);
+
+const inputCheckboxIndicator: ComponentFunction<InputStyleProps> = ({ size = 5, checked }, ...etc) =>
+  mx(getSize(snapSize(sizeValue(size) * 0.65, 4)), !checked && 'invisible', ...etc);
+
+const inputSwitch: ComponentFunction<InputStyleProps> = ({ size = 5, disabled }, ...etc) =>
+  mx(
+    getHeight(size),
+    getWidth(snapSize(sizeValue(size) * 1.75, 9)),
+    booleanInputSurface,
+    !disabled && booleanInputSurfaceHover,
+    // TODO(burdon): Added m-1 margin to make 40px width to align with 40px icon button.
+    'cursor-pointer shrink-0 rounded-full px-1 mx-1 relative',
+    'dx-focus-ring',
+    ...etc,
+  );
+
+const inputSwitchThumb: ComponentFunction<InputStyleProps> = ({ size = 5 }, ...etc) =>
+  mx(
+    getSize(size === 'px' ? 'px' : ((size - 2) as Size)),
+    'block bg-white rounded-full transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[100%]',
+    ...etc,
+  );
+
+const inputWithSegmentsInput: ComponentFunction<InputStyleProps> = (props, ...etc) =>
+  mx(
+    'font-mono selection:bg-transparent mx-auto',
+    props.density === 'fine' ? 'text-base pointer-fine:text-sm' : 'text-lg',
+    props.disabled && 'cursor-not-allowed',
+    ...etc,
+  );
+
+const inputSegment: ComponentFunction<InputStyleProps> = (props, ...etc) =>
+  mx(
+    'flex items-center justify-center font-mono',
+    props.density === 'fine' ? 'size-10 pointer-fine:size-8 rounded-xs' : 'size-12 rounded-xs',
+    'bg-input-surface text-base-surface-text transition-colors border border-separator',
+    'data-[focused]:bg-attention-surface data-[focused]:border-neutral-focus-indicator',
+    'data-[focused]:ring-2 data-[focused]:ring-offset-0 data-[focused]:ring-neutral-focus-indicator',
+    inputValence(props.validationValence),
+    props.disabled && staticDisabled,
+    ...etc,
+  );
+
+const inputLabel: ComponentFunction<InputMetaStyleProps> = (props, ...etc) =>
+  mx('block', inputTextLabel, props.srOnly && 'sr-only', ...etc);
+
+const inputDescription: ComponentFunction<InputMetaStyleProps> = (props, ...etc) =>
+  mx('text-description', props.srOnly && 'sr-only', ...etc);
+
+const inputDescriptionAndValidation: ComponentFunction<InputMetaStyleProps> = (props, ...etc) =>
+  mx('leading-none my-1.5', props.srOnly && 'sr-only', ...etc);
+
+const inputValidation: ComponentFunction<InputMetaStyleProps> = (props, ...etc) =>
+  mx(inputTextLabel, props.srOnly ? 'sr-only' : textValence(props.validationValence), ...etc);
+
+export const inputTheme = {
+  input: inputInput,
+  textArea: inputTextArea,
+  inputWithSegments: inputWithSegmentsInput,
+  segment: inputSegment,
+  checkbox: inputCheckbox,
+  checkboxIndicator: inputCheckboxIndicator,
+  label: inputLabel,
+  description: inputDescription,
+  switch: inputSwitch,
+  switchThumb: inputSwitchThumb,
+  validation: inputValidation,
+  descriptionAndValidation: inputDescriptionAndValidation,
+};

package/src/{styles → theme}/components/link.ts

@@ -5,7 +5,6 @@
 import { type ComponentFunction, type Theme } from '@dxos/ui-types';
 
 import { mx } from '../../util';
-import { focusRing } from '../fragments';
 
 export type LinkStyleProps = {
   variant?: 'accent' | 'neutral';
@@ -13,11 +12,11 @@ export type LinkStyleProps = {
 
 export const linkRoot: ComponentFunction<LinkStyleProps> = ({ variant }, ...etc) =>
   mx(
-    'underline decoration-1 underline-offset-2 transition-color rounded-sm',
+    'underline decoration-1 underline-offset-2 transition-color rounded-xs',
     variant === 'neutral'
       ? 'text-inherit hover:opacity-90 visited:text-inherit visited:hover:opacity-90'
-      : 'text-accentText hover:text-accentTextHover visited:text-accentText visited:hover:text-accentTextHover',
-    focusRing,
+      : 'text-accent-text hover:text-accent-text-hover visited:text-accent-text visited:hover:text-accent-text-hover',
+    'dx-focus-ring',
     ...etc,
   );
 

package/src/{styles → theme}/components/list.ts

@@ -4,8 +4,8 @@
 
 import { type ComponentFunction, type Density, type Theme } from '@dxos/ui-types';
 
-import { mx } from '../../util';
-import { densityBlockSize, focusRing, getSize, ghostHover } from '../fragments';
+import { densityBlockSize, ghostHover } from '../../fragments';
+import { getSize, mx } from '../../util';
 
 export type ListStyleProps = Partial<{
   density: Density;
@@ -21,13 +21,13 @@ export const listItemEndcap: ComponentFunction<ListStyleProps> = ({ density }, .
   mx(density === 'fine' ? getSize(8) : getSize(10), 'shrink-0 flex items-center justify-center', ...etc);
 
 export const listItemHeading: ComponentFunction<ListStyleProps> = ({ density }, ...etc) =>
-  mx(densityBlockSize(density), 'flex items-center', ...etc);
+  mx(densityBlockSize(density), 'flex items-center overflow-hidden [&>span]:truncate', ...etc);
 
 export const listItemDragHandleIcon: ComponentFunction<ListStyleProps> = (_props, ...etc) =>
-  mx(getSize(5), 'mbs-2.5', ...etc);
+  mx(getSize(5), 'mt-2.5', ...etc);
 
 export const listItemOpenTrigger: ComponentFunction<ListStyleProps> = ({ density }, ...etc) =>
-  mx('is-5 rounded flex justify-center items-center', densityBlockSize(density), ghostHover, focusRing, ...etc);
+  mx('w-5 rounded-sm flex justify-center items-center', densityBlockSize(density), ghostHover, 'dx-focus-ring', ...etc);
 
 export const listItemOpenTriggerIcon: ComponentFunction<ListStyleProps> = (_props, ...etc) => {
   return mx(getSize(5), ...etc);

package/src/{styles → theme}/components/main.ts

@@ -7,8 +7,8 @@ import { type ComponentFunction } from '@dxos/ui-types';
 import { mx } from '../../util';
 
 // Padding to apply to in-flow elements which need to clear the fixed topbar/bottombar.
-export const topbarBlockPaddingStart = 'pbs-[--topbar-size] sticky-top-from-topbar-bottom';
-export const bottombarBlockPaddingEnd = 'pbe-[--statusbar-size] sticky-bottom-from-statusbar-bottom';
+export const topbarBlockPaddingStart = 'py-(--dx-topbar-size) dx-sticky-top-from-topbar-bottom';
+export const bottombarBlockPaddingEnd = 'pb-(--dx-statusbar-size) dx-sticky-bottom-from-statusbar-bottom';
 
 export const mainPadding = 'dx-main-content-padding';
 export const mainPaddingTransitions = 'dx-main-content-padding-transitions';
@@ -25,14 +25,10 @@ export const mainContent: ComponentFunction<MainStyleProps> = ({ bounce }, ...et
 export const mainSidebar: ComponentFunction<MainStyleProps> = (_, ...etc) =>
   mx('dx-main-sidebar', 'dx-focus-ring-inset-over-all', ...etc);
 
-export const mainDrawer: ComponentFunction<MainStyleProps> = (_, ...etc) =>
-  mx('dx-main-drawer', 'dx-focus-ring-inset-over-all', ...etc);
-
 export const mainOverlay: ComponentFunction<MainStyleProps> = (_, ...etc) => mx('dx-main-overlay', ...etc);
 
 export const mainTheme = {
   content: mainContent,
   sidebar: mainSidebar,
-  drawer: mainDrawer,
   overlay: mainOverlay,
 };

package/src/{styles → theme}/components/menu.ts

@@ -4,49 +4,39 @@
 
 import { type ComponentFunction, type Elevation, type Theme } from '@dxos/ui-types';
 
-import { mx } from '../../util';
-import {
-  dataDisabled,
-  descriptionText,
-  modalSurface,
-  popperMotion,
-  subduedFocus,
-  surfaceShadow,
-  surfaceZIndex,
-} from '../fragments';
+import { dataDisabled } from '../../fragments';
+import { mx, surfaceShadow, surfaceZIndex } from '../../util';
 
 export type MenuStyleProps = Partial<{
   constrainBlockSize: boolean;
   elevation: Elevation;
 }>;
 
-export const menuViewport: ComponentFunction<MenuStyleProps> = (_props, ...etc) =>
-  mx('rounded p-1 max-bs-[--radix-dropdown-menu-content-available-height] overflow-y-auto', ...etc);
-
 export const menuContent: ComponentFunction<MenuStyleProps> = ({ elevation }, ...etc) =>
   mx(
-    'is-48 rounded md:is-56 border border-separator',
+    'dx-modal-surface w-48 rounded-sm md:w-56 border border-separator',
     surfaceZIndex({ elevation, level: 'menu' }),
     surfaceShadow({ elevation: 'positioned' }),
-    modalSurface,
-    popperMotion,
     ...etc,
   );
 
+export const menuViewport: ComponentFunction<MenuStyleProps> = (_props, ...etc) =>
+  mx('rounded-sm p-1 max-h-[var(--radix-dropdown-menu-content-available-height)] overflow-y-auto', ...etc);
+
 export const menuItem: ComponentFunction<MenuStyleProps> = (_props, ...etc) =>
   mx(
-    'flex cursor-pointer select-none items-center gap-2 rounded-sm pli-2 plb-2 text-sm',
-    'data-[highlighted]:bg-hoverSurface',
-    subduedFocus,
+    'flex cursor-pointer select-none items-center gap-2 rounded-xs px-2 py-2 text-sm',
+    'hover:bg-hover-surface data-[highlighted]:bg-hover-surface',
+    'dx-focus-subdued',
     dataDisabled,
     ...etc,
   );
 
 export const menuSeparator: ComponentFunction<MenuStyleProps> = (_props, ...etc) =>
-  mx('mlb-1 mli-2 bs-px bg-separator', ...etc);
+  mx('my-1 mx-2 h-px bg-separator', ...etc);
 
 export const menuGroupLabel: ComponentFunction<MenuStyleProps> = (_props, ...etc) =>
-  mx(descriptionText, 'select-none pli-2 plb-2', ...etc);
+  mx('text-description', 'select-none px-2 py-2', ...etc);
 
 export const menuArrow: ComponentFunction<MenuStyleProps> = (_props, ...etc) => mx('fill-separator', ...etc);