@dxos/react-ui-pickers 0.8.4-main.dedc0f3 → 0.8.4-main.e8ec1fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-pickers",
-  "version": "0.8.4-main.dedc0f3",
+  "version": "0.8.4-main.e8ec1fe",
   "description": "A collection of picker components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -29,25 +29,25 @@
     "@preact-signals/safe-react": "^0.9.0",
     "@radix-ui/react-use-controllable-state": "1.1.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/log": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-types": "0.8.4-main.dedc0f3",
-    "@dxos/util": "0.8.4-main.dedc0f3"
+    "@dxos/log": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-types": "0.8.4-main.e8ec1fe",
+    "@dxos/util": "0.8.4-main.e8ec1fe"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3",
-    "@dxos/storybook-utils": "0.8.4-main.dedc0f3"
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/react-ui-theme": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui": "0.8.4-main.e8ec1fe",
+    "@dxos/storybook-utils": "0.8.4-main.e8ec1fe"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-theme": "0.8.4-main.e8ec1fe"
   },
   "publishConfig": {
     "access": "public"

package/src/components/EmojiPicker/EmojiPicker.stories.tsx

@@ -2,24 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import EmojiPicker from '@emoji-mart/react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { Toolbar } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { EmojiPickerBlock, type EmojiPickerProps, EmojiPickerToolbarButton } from './EmojiPicker';
 
 const meta = {
   title: 'ui/react-ui-pickers/EmojiPicker',
   component: EmojiPicker,
-  decorators: [withTheme, withLayout()],
-  parameters: {
-    layout: 'centered',
-  },
+  decorators: [withTheme, withLayout({ container: 'column' })],
 } satisfies Meta<typeof EmojiPicker>;
 
 export default meta;
@@ -38,7 +33,7 @@ const BlockStory = (props: EmojiPickerProps) => {
   const [emoji, setEmoji] = useState<string>(props.defaultEmoji ?? '😀');
 
   return (
-    <div className='flex gap-2'>
+    <div>
       <EmojiPickerBlock
         {...props}
         emoji={emoji}

package/src/components/EmojiPicker/EmojiPicker.tsx

@@ -12,10 +12,10 @@ import {
   ButtonGroup,
   type ButtonProps,
   Icon,
+  IconButton,
   Popover,
   type ThemedClassName,
   Toolbar,
-  Tooltip,
   useMediaQuery,
   useThemeContext,
   useTranslation,
@@ -60,14 +60,15 @@ export const EmojiPickerToolbarButton = ({
         setEmojiPickerOpen(nextOpen);
       }}
     >
-      <Tooltip.Trigger asChild content={t('select emoji label')} side='bottom'>
-        <Popover.Trigger asChild>
-          <Toolbar.Button classNames={['gap-2 text-2xl plb-1', classNames]} disabled={disabled}>
-            <span className='sr-only'>{t('select emoji label')}</span>
-            <Icon icon='ph--user-circle--regular' size={5} />
-          </Toolbar.Button>
-        </Popover.Trigger>
-      </Tooltip.Trigger>
+      <Popover.Trigger asChild>
+        <Toolbar.IconButton
+          icon='ph--user-circle--regular'
+          label={t('select emoji label')}
+          iconOnly
+          tooltipSide='bottom'
+          disabled={disabled}
+        />
+      </Popover.Trigger>
       <Popover.Portal>
         <Popover.Content
           side='bottom'
@@ -112,7 +113,7 @@ export const EmojiPickerBlock = ({
   classNames,
 }: EmojiPickerProps) => {
   const { t } = useTranslation('os');
-  const [isMd] = useMediaQuery('md', { ssr: false });
+  const [isMd] = useMediaQuery('md');
 
   const [emojiValue, setEmojiValue] = useControllableState<string>({
     prop: emoji,
@@ -157,12 +158,15 @@ export const EmojiPickerBlock = ({
           <Popover.Arrow />
         </Popover.Content>
       </Popover.Root>
-      <Tooltip.Trigger asChild content={t('clear label')} side='right'>
-        <Button variant={triggerVariant} onClick={onClickClear} disabled={disabled}>
-          <span className='sr-only'>{t('clear label')}</span>
-          <Icon icon='ph--arrow-counter-clockwise--regular' size={5} />
-        </Button>
-      </Tooltip.Trigger>
+      <IconButton
+        icon='ph--arrow-counter-clockwise--regular'
+        iconOnly
+        label={t('clear label')}
+        tooltipSide='right'
+        variant={triggerVariant}
+        onClick={onClickClear}
+        disabled={disabled}
+      />
     </ButtonGroup>
   );
 };

package/src/components/HuePicker/HuePicker.stories.tsx

@@ -2,13 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { Toolbar } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { HuePicker, type HuePickerProps } from './HuePicker';
 
@@ -32,10 +30,7 @@ const meta = {
   title: 'ui/react-ui-pickers/HuePicker',
   component: HuePicker,
   render: DefaultStory,
-  decorators: [withTheme, withLayout()],
-  parameters: {
-    layout: 'centered',
-  },
+  decorators: [withTheme, withLayout({ container: 'column' })],
 } satisfies Meta<typeof HuePicker>;
 
 export default meta;

package/src/components/HuePicker/HuePicker.tsx

@@ -4,8 +4,8 @@
 
 import React from 'react';
 
-import { type ButtonProps, type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { hues } from '@dxos/react-ui-theme';
+import { type ButtonProps, type IconProps, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { getSize, hues } from '@dxos/react-ui-theme';
 
 import { PickerButton, type PickerButtonProps } from '../PickerButton';
 
@@ -31,14 +31,10 @@ export const HuePicker = (props: ThemedClassName<HuePickerProps>) => {
   );
 };
 
-const HuePreview = ({ value }: { value: string }) => {
-  const size = 16;
+const HuePreview = ({ value, size = 5 }: { value: string; size?: IconProps['size'] }) => {
   return (
-    <div className='flex p-[2px] justify-center items-center'>
-      <svg
-        viewBox={`0 0 ${size} ${size}`}
-        className='is-[var(--hue-preview-size,1rem)] bs-[var(--hue-preview-size,1rem)]'
-      >
+    <div role='none' className='flex justify-center items-center'>
+      <svg viewBox={`0 0 ${size} ${size}`} className={getSize(size)}>
         <rect x={0} y={0} width={size} height={size} fill={`var(--dx-${value}Fill)`} strokeWidth={4} />
       </svg>
     </div>

package/src/components/IconPicker/IconPicker.stories.tsx

@@ -2,13 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { Toolbar } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { IconPicker, type IconPickerProps } from './IconPicker';
 
@@ -27,10 +25,7 @@ const meta = {
   title: 'ui/react-ui-pickers/IconPicker',
   component: IconPicker,
   render: DefaultStory,
-  decorators: [withTheme, withLayout()],
-  parameters: {
-    layout: 'centered',
-  },
+  decorators: [withTheme, withLayout({ container: 'column' })],
 } satisfies Meta<typeof IconPicker>;
 
 export default meta;

package/src/components/IconPicker/IconPicker.tsx

@@ -16,7 +16,7 @@ export type IconPickerProps = {
   onReset?: ButtonProps['onClick'];
 } & Pick<
   PickerButtonProps,
-  'disabled' | 'defaultValue' | 'value' | 'onChange' | 'onReset' | 'rootVariant' | 'iconSize'
+  'disabled' | 'rootVariant' | 'iconSize' | 'defaultValue' | 'value' | 'onChange' | 'onReset'
 >;
 
 export const IconPicker = ({ ...props }: ThemedClassName<IconPickerProps>) => {
@@ -33,15 +33,21 @@ export const IconPicker = ({ ...props }: ThemedClassName<IconPickerProps>) => {
   );
 };
 
-const IconPreview = ({ value, iconSize = 5 }: { value: string; iconSize?: IconProps['size'] }) => {
-  return <Icon icon={`ph--${value}--regular`} size={iconSize} />;
+const IconPreview = ({ value, size }: { value: string; size?: IconProps['size'] }) => {
+  return <Icon icon={`ph--${value}--regular`} size={size} />;
 };
 
 /**
  * https://phosphoricons.com
  * NOTE: Select icons that we are unlikely to use for the UI.
  */
-const icons = [
+export const icons = [
+  'ph--house-line--regular',
+  'ph--planet--regular',
+  'ph--castle-turret--regular',
+  'ph--snowflake--regular',
+  'ph--virus--regular',
+  'ph--graph--regular',
   'ph--air-traffic-control--regular',
   'ph--asterisk--regular',
   'ph--atom--regular',
@@ -92,4 +98,4 @@ const icons = [
   'ph--yin-yang--regular',
 ];
 
-const iconValues = icons.map((icon) => icon.match(/ph--(.+)--regular/)?.[1] ?? icon);
+export const iconValues = icons.map((icon) => icon.match(/ph--(.+)--regular/)?.[1] ?? icon);

package/src/components/PickerButton/PickerButton.tsx

@@ -8,7 +8,7 @@ import React, { type FC, useEffect, useState } from 'react';
 import { Button, DropdownMenu, Icon, type IconProps, type ThemedClassName, Toolbar, Tooltip } from '@dxos/react-ui';
 
 export type PickerButtonProps = ThemedClassName<{
-  Component: FC<{ value: string; iconSize?: IconProps['size'] }>;
+  Component: FC<{ value: string; size?: IconProps['size'] }>;
   label: string;
   icon: string;
   values: string[];
@@ -25,8 +25,8 @@ export const PickerButton = ({
   Component,
   disabled,
   classNames,
-  defaultValue: _defaultValue,
-  value: _value,
+  defaultValue: defaultValueParam,
+  value: valueParam,
   values,
   label,
   icon,
@@ -36,15 +36,14 @@ export const PickerButton = ({
   iconSize = 5,
 }: PickerButtonProps) => {
   const [value, setValue] = useControllableState<string>({
-    prop: _value,
-    defaultProp: _defaultValue,
+    prop: valueParam,
+    defaultProp: defaultValueParam,
     onChange,
   });
   // TODO(burdon): useControllableState doesn't update the prop when the value is changed. Replace it.
-  useEffect(() => setValue(_value), [_value]);
+  useEffect(() => setValue(valueParam), [valueParam]);
 
   const [open, setOpen] = useState<boolean>(false);
-
   const TriggerRoot = rootVariant === 'toolbar-button' ? Toolbar.Button : Button;
 
   return (
@@ -53,7 +52,7 @@ export const PickerButton = ({
         <DropdownMenu.Trigger asChild>
           <TriggerRoot classNames={['gap-2 plb-1', classNames]} disabled={disabled}>
             <span className='sr-only'>{label}</span>
-            {(value && <Component value={value} iconSize={iconSize} />) || <Icon icon={icon} size={iconSize} />}
+            {(value && <Component value={value} size={iconSize} />) || <Icon icon={icon} size={iconSize} />}
             <Icon icon='ph--caret-down--bold' size={3} />
           </TriggerRoot>
         </DropdownMenu.Trigger>
@@ -69,7 +68,7 @@ export const PickerButton = ({
                   onCheckedChange={() => setValue(_value)}
                   classNames={'p-1 items-center justify-center aspect-square'}
                 >
-                  <Component value={_value} iconSize={iconSize} />
+                  <Component value={_value} size={iconSize} />
                 </DropdownMenu.CheckboxItem>
               );
             })}