@dxos/react-ui 0.8.4-main.ef1bc66f44 → 0.8.4-main.effb148878

package/src/components/Button/IconButton.stories.tsx

@@ -5,19 +5,56 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
+import { type Density } from '@dxos/ui-types';
+
 import { withTheme } from '../../testing';
 import { Tooltip } from '../Tooltip';
-
+import { Button } from './Button';
 import { IconButton, type IconButtonProps } from './IconButton';
 
 const DefaultStory = (props: IconButtonProps) => {
   return (
     <Tooltip.Provider>
-      <div className='mbe-4'>
+      <div className='flex gap-4'>
         <IconButton {...props} />
-      </div>
-      <div className='mbe-4'>
         <IconButton iconOnly {...props} />
+        <Button>{props.label}</Button>
+      </div>
+    </Tooltip.Provider>
+  );
+};
+
+const densities: Density[] = ['lg', 'md', 'sm', 'xs'];
+const densityIconSize: Record<Density, IconButtonProps['size']> = {
+  lg: 5,
+  md: 4,
+  sm: 4,
+  xs: 4,
+};
+
+const DensitiesStory = (props: Omit<IconButtonProps, 'density' | 'size'>) => {
+  return (
+    <Tooltip.Provider>
+      <div className='grid grid-cols-[auto_1fr_1fr_1fr] gap-4 items-center'>
+        <div />
+        <div className='text-xs text-subdued uppercase'>iconOnly</div>
+        <div className='text-xs text-subdued uppercase'>label + icon</div>
+        <div className='text-xs text-subdued uppercase'>Button (reference)</div>
+        {densities.map((density) => (
+          <React.Fragment key={density}>
+            <div className='text-xs font-mono'>density={density}</div>
+            <IconButton
+              square
+              classNames='w-fit'
+              density={density}
+              size={densityIconSize[density]}
+              iconOnly
+              {...props}
+            />
+            <IconButton classNames='w-fit' density={density} size={densityIconSize[density]} {...props} />
+            <Button density={density}>{props.label}</Button>
+          </React.Fragment>
+        ))}
       </div>
     </Tooltip.Provider>
   );
@@ -28,6 +65,9 @@ const meta = {
   component: IconButton,
   render: DefaultStory as any,
   decorators: [withTheme()],
+  parameters: {
+    layout: 'centered',
+  },
 } satisfies Meta<typeof IconButton>;
 
 export default meta;
@@ -35,8 +75,18 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
+  render: DensitiesStory as any,
+  args: {
+    label: 'Close',
+    icon: 'ph--x--regular',
+  },
+};
+
+export const Ghost: Story = {
+  render: DensitiesStory as any,
   args: {
-    label: 'Bold',
-    icon: 'ph--text-b--regular',
+    label: 'Close',
+    icon: 'ph--x--regular',
+    variant: 'ghost',
   },
 };

package/src/components/Button/IconButton.theme.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import { mx } from '@dxos/ui-theme';
+import type { ComponentFunction, Theme } from '@dxos/ui-types';
+
+import { type ButtonStyleProps } from './Button.theme';
+
+export type IconButtonStyleProps = ButtonStyleProps & {
+  iconOnly?: boolean;
+  square?: boolean;
+};
+
+const root: ComponentFunction<IconButtonStyleProps> = ({ iconOnly, square }, ...etc) => {
+  return mx('px-1.5', !iconOnly && 'gap-1.5', square && 'aspect-square', ...etc);
+};
+
+export const iconButtonTheme: Theme<IconButtonStyleProps> = {
+  root,
+};

package/src/components/Button/IconButton.tsx

@@ -8,7 +8,6 @@ import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
 import { Icon, type IconProps } from '../Icon';
 import { Tooltip, type TooltipSide } from '../Tooltip';
-
 import { Button, type ButtonProps } from './Button';
 
 type IconButtonProps = Omit<ButtonProps, 'children'> &
@@ -17,6 +16,7 @@ type IconButtonProps = Omit<ButtonProps, 'children'> &
     noTooltip?: boolean;
     caretDown?: boolean;
     iconOnly?: boolean;
+    square?: boolean; // TODO(burdon): Handle more uniformly.
     iconEnd?: boolean;
     iconClassNames?: ThemedClassName<any>['classNames'];
     tooltipSide?: TooltipSide;
@@ -44,15 +44,14 @@ const IconOnlyButton = forwardRef<HTMLButtonElement, IconButtonProps>(
   },
 );
 
-// TODO(burdon): Inherit size from container/density.
 const LabelledIconButton = forwardRef<HTMLButtonElement, IconButtonProps>(
   (
-    { size = 5, icon, iconOnly, iconEnd, iconClassNames, label, caretDown, noTooltip: _, classNames, ...props },
+    { size, icon, iconOnly, square, iconEnd, iconClassNames, label, caretDown, noTooltip: _, classNames, ...props },
     forwardedRef,
   ) => {
     const { tx } = useThemeContext();
     return (
-      <Button {...props} classNames={tx('iconButton.root', 'iconButton', { iconOnly }, classNames)} ref={forwardedRef}>
+      <Button {...props} classNames={tx('iconButton.root', { iconOnly, square }, classNames)} ref={forwardedRef}>
         {icon && !iconEnd && <Icon icon={icon} size={size} classNames={iconClassNames} />}
         <span className={iconOnly ? 'sr-only' : undefined}>{label}</span>
         {icon && iconEnd && <Icon icon={icon} size={size} classNames={iconClassNames} />}

package/src/components/Button/Toggle.stories.tsx

@@ -7,7 +7,6 @@ import React from 'react';
 
 import { withTheme } from '../../testing';
 import { Icon } from '../Icon';
-
 import { Toggle, type ToggleProps } from './Toggle';
 
 const DefaultStory = (props: ToggleProps) => {

package/src/components/Button/Toggle.tsx

@@ -2,19 +2,19 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Toggle as TogglePrimitive, type ToggleProps as TogglePrimitiveProps } from '@radix-ui/react-toggle';
+import * as TogglePrimitive from '@radix-ui/react-toggle';
 import React, { forwardRef } from 'react';
 
 import { Button, type ButtonProps } from './Button';
 
-type ToggleProps = Omit<TogglePrimitiveProps, 'asChild'> & ButtonProps;
+type ToggleProps = Omit<TogglePrimitive.ToggleProps, 'asChild'> & ButtonProps;
 
 const Toggle = forwardRef<HTMLButtonElement, ToggleProps>(
   ({ defaultPressed, pressed, onPressedChange, ...props }, forwardedRef) => {
     return (
-      <TogglePrimitive {...{ defaultPressed, pressed, onPressedChange }} asChild>
+      <TogglePrimitive.Root {...{ defaultPressed, pressed, onPressedChange }} asChild>
         <Button {...props} ref={forwardedRef} />
-      </TogglePrimitive>
+      </TogglePrimitive.Root>
     );
   },
 );

package/src/components/Button/ToggleGroup.stories.tsx

@@ -7,7 +7,6 @@ import React from 'react';
 
 import { withTheme } from '../../testing';
 import { Icon } from '../Icon';
-
 import { ToggleGroup, ToggleGroupItem, type ToggleGroupProps } from './ToggleGroup';
 
 // TODO(burdon): Create Radix-style Root, Item, etc?

package/src/components/Button/ToggleGroup.tsx

@@ -2,50 +2,46 @@
 // Copyright 2023 DXOS.org
 //
 
-import {
-  ToggleGroupItem as ToggleGroupItemPrimitive,
-  type ToggleGroupItemProps as ToggleGroupItemPrimitiveProps,
-  type ToggleGroupMultipleProps,
-  ToggleGroup as ToggleGroupPrimitive,
-  type ToggleGroupSingleProps,
-} from '@radix-ui/react-toggle-group';
+import * as ToggleGroupPrimitive from '@radix-ui/react-toggle-group';
 import React, { forwardRef } from 'react';
 
 import { Button, ButtonGroup, type ButtonGroupProps, type ButtonProps } from './Button';
 import { IconButton, type IconButtonProps } from './IconButton';
 
-type ToggleGroupProps = Omit<ToggleGroupSingleProps, 'className'> | Omit<ToggleGroupMultipleProps, 'className'>;
+type ToggleGroupProps =
+  | Omit<ToggleGroupPrimitive.ToggleGroupSingleProps, 'className'>
+  | Omit<ToggleGroupPrimitive.ToggleGroupMultipleProps, 'className'>;
 
 const ToggleGroup = forwardRef<HTMLDivElement, ToggleGroupProps & ButtonGroupProps>(
   ({ classNames, children, ...props }, forwardedRef) => {
     return (
-      <ToggleGroupPrimitive {...props} asChild>
+      <ToggleGroupPrimitive.Root {...props} asChild>
         <ButtonGroup {...{ classNames, children }} ref={forwardedRef} />
-      </ToggleGroupPrimitive>
+      </ToggleGroupPrimitive.Root>
     );
   },
 );
 
-type ToggleGroupItemProps = Omit<ToggleGroupItemPrimitiveProps, 'className'> & ButtonProps;
+type ToggleGroupItemProps = Omit<ToggleGroupPrimitive.ToggleGroupItemProps, 'className'> & ButtonProps;
 
 const ToggleGroupItem = forwardRef<HTMLButtonElement, ToggleGroupItemProps>(
   ({ variant, elevation, density, classNames, children, ...props }, forwardedRef) => {
     return (
-      <ToggleGroupItemPrimitive {...props} asChild>
+      <ToggleGroupPrimitive.Item {...props} asChild>
         <Button {...{ variant, elevation, density, classNames, children }} ref={forwardedRef} />
-      </ToggleGroupItemPrimitive>
+      </ToggleGroupPrimitive.Item>
     );
   },
 );
 
-type ToggleGroupIconItemProps = Omit<ToggleGroupItemPrimitiveProps, 'className'> & IconButtonProps;
+type ToggleGroupIconItemProps = Omit<ToggleGroupPrimitive.ToggleGroupItemProps, 'className'> & IconButtonProps;
 
 const ToggleGroupIconItem = forwardRef<HTMLButtonElement, ToggleGroupIconItemProps>(
   ({ variant, label, icon, size, elevation, density, classNames, ...props }, forwardedRef) => {
     return (
-      <ToggleGroupItemPrimitive {...props} asChild>
+      <ToggleGroupPrimitive.Item {...props} asChild>
         <IconButton {...{ variant, elevation, density, classNames, label, icon, size }} ref={forwardedRef} />
-      </ToggleGroupItemPrimitive>
+      </ToggleGroupPrimitive.Item>
     );
   },
 );

package/src/components/Calendar/Calendar.stories.tsx

@@ -0,0 +1,43 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useState } from 'react';
+
+import { withLayout, withTheme } from '../../testing';
+import { Calendar, type DateRange } from './Calendar';
+
+const meta: Meta<typeof Calendar.Root> = {
+  title: 'ui/react-ui-core/components/Calendar',
+  component: Calendar.Root,
+  decorators: [withTheme(), withLayout({ layout: 'column', classNames: 'flex flex-row p-4 justify-center' })],
+  parameters: {
+    layout: 'fullscreen',
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof Calendar.Root>;
+
+export const Single: Story = {
+  render: () => {
+    const [date, setDate] = useState<Date | undefined>(new Date());
+    return <Calendar.Root mode='single' selected={date} onSelect={setDate} />;
+  },
+};
+
+export const Range: Story = {
+  render: () => {
+    const [range, setRange] = useState<DateRange | undefined>();
+    return <Calendar.Root mode='range' selected={range} onSelect={setRange} />;
+  },
+};
+
+export const WithMinDate: Story = {
+  render: () => {
+    const [date, setDate] = useState<Date | undefined>();
+    return <Calendar.Root mode='single' selected={date} onSelect={setDate} minValue={new Date()} />;
+  },
+};

package/src/components/Calendar/Calendar.theme.ts

@@ -0,0 +1,74 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { mx } from '@dxos/ui-theme';
+import { type ComponentFunction, type Theme } from '@dxos/ui-types';
+
+export type CalendarStyleProps = Partial<{}>;
+
+//
+// Theme slots target react-aria-components elements. RAC attaches `data-*` attributes to its
+// rendered nodes (`data-selected`, `data-focused`, `data-disabled`, `data-outside-month`,
+// `data-selection-start`, `data-selection-end`, `data-hovered`, etc.) which we hook into via
+// Tailwind's `data-[…]:` modifiers.
+//
+
+const root: ComponentFunction<CalendarStyleProps> = (_p, ...etc) =>
+  mx('relative w-fit h-fit self-start p-2 select-none bg-group-surface text-base-foreground', ...etc);
+
+const nav: ComponentFunction<CalendarStyleProps> = (_p, ...etc) => mx('flex items-center justify-between pb-1', ...etc);
+
+const caption_label: ComponentFunction<CalendarStyleProps> = (_p, ...etc) =>
+  mx('flex-1 text-center text-sm font-medium', ...etc);
+
+const button_previous: ComponentFunction<CalendarStyleProps> = (_p, ...etc) =>
+  mx(
+    'h-7 w-7 inline-flex items-center justify-center rounded-sm shrink-0',
+    'text-description hover:bg-hover-surface',
+    'data-[disabled]:opacity-50 data-[disabled]:cursor-not-allowed',
+    ...etc,
+  );
+
+const button_next: ComponentFunction<CalendarStyleProps> = (_p, ...etc) =>
+  mx(
+    'h-7 w-7 inline-flex items-center justify-center rounded-sm shrink-0',
+    'text-description hover:bg-hover-surface',
+    'data-[disabled]:opacity-50 data-[disabled]:cursor-not-allowed',
+    ...etc,
+  );
+
+const month_grid: ComponentFunction<CalendarStyleProps> = (_p, ...etc) => mx('w-full border-collapse', ...etc);
+
+const weekdays: ComponentFunction<CalendarStyleProps> = (_p, ...etc) => mx('', ...etc);
+
+const weekday: ComponentFunction<CalendarStyleProps> = (_p, ...etc) =>
+  mx('w-9 h-7 text-xs font-thin text-description', ...etc);
+
+const day: ComponentFunction<CalendarStyleProps> = (_p, ...etc) =>
+  mx(
+    'relative w-9 h-9 p-0 text-center text-sm rounded-sm inline-flex items-center justify-center cursor-pointer',
+    'outline-none',
+    'data-[hovered]:bg-hover-surface',
+    'data-[focus-visible]:outline-2 data-[focus-visible]:outline-primary-500',
+    'data-[selected]:bg-primary-500 data-[selected]:text-primary-fg data-[selected]:hover:bg-primary-500',
+    'data-[outside-month]:text-description/40',
+    'data-[disabled]:text-description/40 data-[disabled]:cursor-not-allowed data-[disabled]:hover:bg-transparent',
+    'data-[unavailable]:line-through data-[unavailable]:text-description/50 data-[unavailable]:cursor-not-allowed',
+    // Range selection visual layer.
+    'data-[selection-start]:rounded-l-sm data-[selection-end]:rounded-r-sm',
+    'data-[selection-start]:bg-primary-500 data-[selection-end]:bg-primary-500',
+    ...etc,
+  );
+
+export const calendarTheme: Theme<CalendarStyleProps> = {
+  root,
+  nav,
+  caption_label,
+  button_previous,
+  button_next,
+  month_grid,
+  weekdays,
+  weekday,
+  day,
+};

package/src/components/Calendar/Calendar.tsx

@@ -0,0 +1,196 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { CalendarDate, parseDate } from '@internationalized/date';
+import React, { forwardRef, type ComponentPropsWithoutRef, type ReactNode } from 'react';
+import {
+  Button as RACButton,
+  Calendar as RACCalendar,
+  CalendarCell as RACCalendarCell,
+  type CalendarProps as RACCalendarProps,
+  CalendarGrid as RACCalendarGrid,
+  CalendarGridBody as RACCalendarGridBody,
+  CalendarGridHeader as RACCalendarGridHeader,
+  CalendarHeaderCell as RACCalendarHeaderCell,
+  Heading as RACHeading,
+  RangeCalendar as RACRangeCalendar,
+  type RangeCalendarProps as RACRangeCalendarProps,
+  type DateValue,
+} from 'react-aria-components';
+
+import { type ClassNameValue } from '@dxos/ui-types';
+
+import { useThemeContext } from '../../hooks';
+import { Icon } from '../Icon';
+
+//
+// Date <-> CalendarDate conversion.
+// External API stays `Date` (and `{from,to}`-style range objects) so existing call sites keep working.
+//
+
+const toCalendarDate = (date: Date | undefined): CalendarDate | null => {
+  if (!date) {
+    return null;
+  }
+  return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate());
+};
+
+const fromCalendarDate = (value: DateValue | null | undefined): Date | undefined => {
+  if (!value) {
+    return undefined;
+  }
+  return new Date(value.year, value.month - 1, value.day);
+};
+
+export type DateRange = { from: Date; to?: Date };
+
+//
+// Public API.
+//
+
+type BaseCalendarProps = {
+  classNames?: ClassNameValue;
+  className?: string;
+  isDisabled?: boolean;
+  minValue?: Date;
+  maxValue?: Date;
+  /** Month to render when there's no selection — driven by the consuming picker. */
+  defaultMonth?: Date;
+};
+
+type SingleProps = BaseCalendarProps & {
+  mode?: 'single';
+  selected?: Date;
+  onSelect?: (date: Date | undefined) => void;
+};
+
+type RangeProps = BaseCalendarProps & {
+  mode: 'range';
+  selected?: DateRange;
+  onSelect?: (range: DateRange | undefined) => void;
+};
+
+export type CalendarRootProps = SingleProps | RangeProps;
+
+const CalendarShell = ({
+  classNames,
+  className,
+  isDisabled,
+  forwardedRef,
+  children,
+}: {
+  classNames?: ClassNameValue;
+  className?: string;
+  isDisabled?: boolean;
+  forwardedRef?: React.Ref<HTMLDivElement>;
+  children: ReactNode;
+}) => {
+  const { tx } = useThemeContext();
+  return (
+    <div
+      ref={forwardedRef}
+      className={tx('calendar.root', {}, classNames, className) ?? undefined}
+      aria-disabled={isDisabled || undefined}
+    >
+      {children}
+    </div>
+  );
+};
+
+const CalendarChrome = () => {
+  const { tx } = useThemeContext();
+  return (
+    <header className={tx('calendar.nav', {}) ?? undefined}>
+      <RACButton slot='previous' className={tx('calendar.button_previous', {}) ?? undefined}>
+        <Icon size={4} icon='ph--caret-left--regular' />
+      </RACButton>
+      <RACHeading className={tx('calendar.caption_label', {}) ?? undefined} />
+      <RACButton slot='next' className={tx('calendar.button_next', {}) ?? undefined}>
+        <Icon size={4} icon='ph--caret-right--regular' />
+      </RACButton>
+    </header>
+  );
+};
+
+const CalendarGridContent = () => {
+  const { tx } = useThemeContext();
+  return (
+    <RACCalendarGrid className={tx('calendar.month_grid', {}) ?? undefined}>
+      <RACCalendarGridHeader className={tx('calendar.weekdays', {}) ?? undefined}>
+        {(day) => (
+          <RACCalendarHeaderCell className={tx('calendar.weekday', {}) ?? undefined}>{day}</RACCalendarHeaderCell>
+        )}
+      </RACCalendarGridHeader>
+      <RACCalendarGridBody>
+        {(date) => <RACCalendarCell date={date} className={tx('calendar.day', {}) ?? undefined} />}
+      </RACCalendarGridBody>
+    </RACCalendarGrid>
+  );
+};
+
+const CalendarRoot = forwardRef<HTMLDivElement, CalendarRootProps>((props, forwardedRef) => {
+  const { classNames, className, isDisabled, minValue, maxValue, defaultMonth } = props;
+  const defaultFocused = toCalendarDate(defaultMonth) ?? undefined;
+
+  if (props.mode === 'range') {
+    const racProps: RACRangeCalendarProps<CalendarDate> = {
+      isDisabled,
+      minValue: toCalendarDate(minValue) ?? undefined,
+      maxValue: toCalendarDate(maxValue) ?? undefined,
+      defaultFocusedValue: defaultFocused,
+      value: props.selected?.from
+        ? {
+            start: toCalendarDate(props.selected.from)!,
+            end: toCalendarDate(props.selected.to ?? props.selected.from)!,
+          }
+        : undefined,
+      onChange: (next) => {
+        if (!next) {
+          props.onSelect?.(undefined);
+          return;
+        }
+        const from = fromCalendarDate(next.start);
+        const to = fromCalendarDate(next.end);
+        if (from) {
+          props.onSelect?.({ from, to });
+        }
+      },
+    };
+    return (
+      <CalendarShell classNames={classNames} className={className} isDisabled={isDisabled} forwardedRef={forwardedRef}>
+        <RACRangeCalendar {...racProps}>
+          <CalendarChrome />
+          <CalendarGridContent />
+        </RACRangeCalendar>
+      </CalendarShell>
+    );
+  }
+
+  const racProps: RACCalendarProps<CalendarDate> = {
+    isDisabled,
+    minValue: toCalendarDate(minValue) ?? undefined,
+    maxValue: toCalendarDate(maxValue) ?? undefined,
+    defaultFocusedValue: defaultFocused,
+    value: toCalendarDate(props.selected),
+    onChange: (next) => props.onSelect?.(fromCalendarDate(next)),
+  };
+  return (
+    <CalendarShell classNames={classNames} className={className} isDisabled={isDisabled} forwardedRef={forwardedRef}>
+      <RACCalendar {...racProps}>
+        <CalendarChrome />
+        <CalendarGridContent />
+      </RACCalendar>
+    </CalendarShell>
+  );
+});
+
+CalendarRoot.displayName = 'Calendar.Root';
+
+export const Calendar = {
+  Root: CalendarRoot,
+};
+
+// Re-export the iso parser for convenience.
+export { parseDate as parseCalendarDate };
+export type { ComponentPropsWithoutRef };

package/src/components/Calendar/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './Calendar';