@dxos/react-ui-pickers 0.8.4-main.fffef41 → 0.8.4-staging.ac66bdf99f

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/react-ui-pickers",
-  "version": "0.8.4-main.fffef41",
+  "version": "0.8.4-staging.ac66bdf99f",
   "description": "A collection of picker components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "type": "module",
@@ -13,11 +17,21 @@
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
+    },
+    "./icons": {
+      "source": "./src/components/IconPicker/icons.ts",
+      "types": "./dist/types/src/components/IconPicker/icons.d.ts",
+      "browser": "./dist/lib/browser/components/IconPicker/icons.mjs",
+      "node": "./dist/lib/node-esm/components/IconPicker/icons.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
-    "*": {}
+    "*": {
+      "icons": [
+        "./dist/types/src/components/IconPicker/icons.d.ts"
+      ]
+    }
   },
   "files": [
     "dist",
@@ -26,28 +40,27 @@
   "dependencies": {
     "@emoji-mart/data": "^1.1.2",
     "@emoji-mart/react": "^1.1.1",
-    "@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.fffef41",
-    "@dxos/react-ui-types": "0.8.4-main.fffef41",
-    "@dxos/util": "0.8.4-main.fffef41"
+    "@dxos/log": "0.8.4-staging.ac66bdf99f",
+    "@dxos/ui-types": "0.8.4-staging.ac66bdf99f",
+    "@dxos/util": "0.8.4-staging.ac66bdf99f"
   },
   "devDependencies": {
-    "@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": "0.8.4-main.fffef41",
-    "@dxos/storybook-utils": "0.8.4-main.fffef41",
-    "@dxos/react-ui-theme": "0.8.4-main.fffef41"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-staging.ac66bdf99f",
+    "@dxos/storybook-utils": "0.8.4-staging.ac66bdf99f",
+    "@dxos/ui-theme": "0.8.4-staging.ac66bdf99f"
   },
   "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.fffef41",
-    "@dxos/react-ui-theme": "0.8.4-main.fffef41"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-staging.ac66bdf99f",
+    "@dxos/ui-theme": "0.8.4-staging.ac66bdf99f"
   },
   "publishConfig": {
     "access": "public"

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

@@ -14,7 +14,7 @@ import { EmojiPickerBlock, type EmojiPickerProps, EmojiPickerToolbarButton } fro
 const meta = {
   title: 'ui/react-ui-pickers/EmojiPicker',
   component: EmojiPicker,
-  decorators: [withTheme, withLayout({ container: 'column' })],
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
 } satisfies Meta<typeof EmojiPicker>;
 
 export default meta;

package/src/components/EmojiPicker/EmojiPicker.tsx

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+import './emoji.css';
+
 import emojiData from '@emoji-mart/data';
 import EmojiMart from '@emoji-mart/react';
 import { useControllableState } from '@radix-ui/react-use-controllable-state';
@@ -20,8 +22,7 @@ import {
   useThemeContext,
   useTranslation,
 } from '@dxos/react-ui';
-
-import './emoji.css';
+import { osTranslations } from '@dxos/ui-theme';
 
 export type EmojiPickerProps = ThemedClassName<{
   disabled?: boolean;
@@ -42,7 +43,7 @@ export const EmojiPickerToolbarButton = ({
   defaultEmoji,
   onChangeEmoji,
 }: Omit<EmojiPickerProps, 'onClickClear'>) => {
-  const { t } = useTranslation('os');
+  const { t } = useTranslation(osTranslations);
   const { themeMode } = useThemeContext();
 
   const [_emojiValue, setEmojiValue] = useControllableState<string>({
@@ -63,7 +64,7 @@ export const EmojiPickerToolbarButton = ({
       <Popover.Trigger asChild>
         <Toolbar.IconButton
           icon='ph--user-circle--regular'
-          label={t('select emoji label')}
+          label={t('select-emoji.label')}
           iconOnly
           tooltipSide='bottom'
           disabled={disabled}
@@ -112,7 +113,7 @@ export const EmojiPickerBlock = ({
   triggerVariant = 'ghost',
   classNames,
 }: EmojiPickerProps) => {
-  const { t } = useTranslation('os');
+  const { t } = useTranslation(osTranslations);
   const [isMd] = useMediaQuery('md');
 
   const [emojiValue, setEmojiValue] = useControllableState<string>({
@@ -127,8 +128,8 @@ export const EmojiPickerBlock = ({
     <ButtonGroup classNames={classNames}>
       <Popover.Root open={emojiPickerOpen} onOpenChange={setEmojiPickerOpen}>
         <Popover.Trigger asChild>
-          <Button variant={triggerVariant} classNames='grow gap-2 text-2xl plb-1' disabled={disabled}>
-            <span className='sr-only'>{t('select emoji label')}</span>
+          <Button variant={triggerVariant} classNames='grow gap-2 text-2xl py-1' disabled={disabled}>
+            <span className='sr-only'>{t('select-emoji.label')}</span>
             <span>{emojiValue}</span>
             <Icon icon='ph--caret-down--bold' size={3} />
           </Button>
@@ -161,7 +162,7 @@ export const EmojiPickerBlock = ({
       <IconButton
         icon='ph--arrow-counter-clockwise--regular'
         iconOnly
-        label={t('clear label')}
+        label={t('clear.label')}
         tooltipSide='right'
         variant={triggerVariant}
         onClick={onClickClear}

package/src/components/EmojiPicker/emoji.css

@@ -1,25 +1,9 @@
 /**
  * https://github.com/missive/emoji-mart/blob/main/packages/emoji-mart-website/example-custom-styles.html
  */
-[data-theme="dark"] em-emoji-picker {
-  /* TODO(burdon): Get from TW defs: modal-surface? */
-  --background-rgb: #3B3B3F;
-  --rgb-background: #3B3B3F;
-
-  --font-family: "Inter Variable", ui-sans-serif;
-
-  /*--font-size: 16px;*/
-  /*--color-border-over: rgba(0, 0, 0, 0.1);*/
-  /*--color-border: rgba(0, 0, 0, 0.05);*/
-  /*--category-icon-size: 24px;*/
-  /*--border-radius: 24px;*/
-  /*--font-family: 'Comic Sans MS', 'Chalkboard SE', cursive;*/
-  /*--rgb-accent: 255, 105, 180;*/
-  /*--rgb-color: 102, 51, 153;*/
-  /*--rgb-input: 255, 235, 235;*/
-  /*--shadow: 5px 5px 15px -8px rebeccapurple;*/
-
-  /*height: 50vh;*/
-  /*min-height: 400px;*/
-  /*max-height: 800px;*/
+[data-theme='dark'] em-emoji-picker {
+  /* TODO(burdon): Use tailwind tokens. */
+  --background-rgb: #3b3b3f;
+  --rgb-background: #3b3b3f;
+  --font-family: 'Inter Variable', ui-sans-serif;
 }

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

@@ -30,7 +30,7 @@ const meta = {
   title: 'ui/react-ui-pickers/HuePicker',
   component: HuePicker,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ container: 'column' })],
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
 } satisfies Meta<typeof HuePicker>;
 
 export default meta;

package/src/components/HuePicker/HuePicker.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { type ButtonProps, type IconProps, type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { getSize, hues } from '@dxos/react-ui-theme';
+import { getSize, hues, osTranslations } from '@dxos/ui-theme';
 
 import { PickerButton, type PickerButtonProps } from '../PickerButton';
 
@@ -18,12 +18,12 @@ export type HuePickerProps = {
 } & Pick<PickerButtonProps, 'disabled' | 'defaultValue' | 'value' | 'onChange' | 'onReset' | 'rootVariant'>;
 
 export const HuePicker = (props: ThemedClassName<HuePickerProps>) => {
-  const { t } = useTranslation('os');
+  const { t } = useTranslation(osTranslations);
 
   return (
     <PickerButton
       Component={HuePreview}
-      label={t('select hue label')}
+      label={t('select-hue.label')}
       icon='ph--palette--regular'
       values={hues}
       {...props}
@@ -35,7 +35,7 @@ const HuePreview = ({ value, size = 5 }: { value: string; size?: IconProps['size
   return (
     <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} />
+        <rect x={0} y={0} width={size} height={size} fill={`var(--color-${value}-surface)`} strokeWidth={4} />
       </svg>
     </div>
   );

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

@@ -25,7 +25,7 @@ const meta = {
   title: 'ui/react-ui-pickers/IconPicker',
   component: IconPicker,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ container: 'column' })],
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
 } satisfies Meta<typeof IconPicker>;
 
 export default meta;

package/src/components/IconPicker/IconPicker.tsx

@@ -5,8 +5,10 @@
 import React from 'react';
 
 import { type ButtonProps, Icon, type IconProps, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { osTranslations } from '@dxos/ui-theme';
 
 import { PickerButton, type PickerButtonProps } from '../PickerButton';
+import { iconValues } from './icons';
 
 export type IconPickerProps = {
   disabled?: boolean;
@@ -20,12 +22,12 @@ export type IconPickerProps = {
 >;
 
 export const IconPicker = ({ ...props }: ThemedClassName<IconPickerProps>) => {
-  const { t } = useTranslation('os');
+  const { t } = useTranslation(osTranslations);
 
   return (
     <PickerButton
       Component={IconPreview}
-      label={t('select icon label')}
+      label={t('select-icon.label')}
       icon='ph--selection--regular'
       values={iconValues}
       {...props}
@@ -36,66 +38,3 @@ export const IconPicker = ({ ...props }: ThemedClassName<IconPickerProps>) => {
 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.
- */
-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',
-  'ph--basketball--regular',
-  'ph--butterfly--regular',
-  'ph--cactus--regular',
-  'ph--cake--regular',
-  'ph--calendar-dots--regular',
-  'ph--campfire--regular',
-  'ph--command--regular',
-  'ph--confetti--regular',
-  'ph--detective--regular',
-  'ph--disco-ball--regular',
-  'ph--dna--regular',
-  'ph--factory--regular',
-  'ph--flag-banner-fold--regular',
-  'ph--flask--regular',
-  'ph--flower-lotus--regular',
-  'ph--flying-saucer--regular',
-  'ph--game-controller--regular',
-  'ph--gavel--regular',
-  'ph--gift--regular',
-  'ph--guitar--regular',
-  'ph--hamburger--regular',
-  'ph--handshake--regular',
-  'ph--heart--regular',
-  'ph--lightbulb--regular',
-  'ph--lock--regular',
-  'ph--martini--regular',
-  'ph--medal-military--regular',
-  'ph--moped-front--regular',
-  'ph--office-chair--regular',
-  'ph--paint-brush-household--regular',
-  'ph--peace--regular',
-  'ph--person-simple-hike--regular',
-  'ph--piggy-bank--regular',
-  'ph--potted-plant--regular',
-  'ph--radioactive--regular',
-  'ph--rocket-launch--regular',
-  'ph--shield-star--regular',
-  'ph--shopping-cart--regular',
-  'ph--stethoscope--regular',
-  'ph--student--regular',
-  'ph--sun--regular',
-  'ph--tote--regular',
-  'ph--tree--regular',
-  'ph--users-three--regular',
-  'ph--yin-yang--regular',
-];
-
-export const iconValues = icons.map((icon) => icon.match(/ph--(.+)--regular/)?.[1] ?? icon);

package/src/components/IconPicker/icons.ts

@@ -0,0 +1,66 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+/**
+ * https://phosphoricons.com
+ * NOTE: Select icons that we are unlikely to use for the UI.
+ */
+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',
+  'ph--basketball--regular',
+  'ph--butterfly--regular',
+  'ph--cactus--regular',
+  'ph--cake--regular',
+  'ph--calendar-dots--regular',
+  'ph--campfire--regular',
+  'ph--command--regular',
+  'ph--confetti--regular',
+  'ph--detective--regular',
+  'ph--disco-ball--regular',
+  'ph--dna--regular',
+  'ph--factory--regular',
+  'ph--flag-banner-fold--regular',
+  'ph--flask--regular',
+  'ph--flower-lotus--regular',
+  'ph--flying-saucer--regular',
+  'ph--game-controller--regular',
+  'ph--gavel--regular',
+  'ph--gift--regular',
+  'ph--guitar--regular',
+  'ph--hamburger--regular',
+  'ph--handshake--regular',
+  'ph--heart--regular',
+  'ph--lightbulb--regular',
+  'ph--lock--regular',
+  'ph--martini--regular',
+  'ph--medal-military--regular',
+  'ph--moped-front--regular',
+  'ph--office-chair--regular',
+  'ph--paint-brush-household--regular',
+  'ph--peace--regular',
+  'ph--person-simple-hike--regular',
+  'ph--piggy-bank--regular',
+  'ph--potted-plant--regular',
+  'ph--radioactive--regular',
+  'ph--rocket-launch--regular',
+  'ph--shield-star--regular',
+  'ph--shopping-cart--regular',
+  'ph--stethoscope--regular',
+  'ph--student--regular',
+  'ph--sun--regular',
+  'ph--tote--regular',
+  'ph--tree--regular',
+  'ph--users-three--regular',
+  'ph--yin-yang--regular',
+];
+
+export const iconValues = icons.map((icon) => icon.match(/ph--(.+)--regular/)?.[1] ?? icon);

package/src/components/PickerButton/PickerButton.tsx

@@ -11,7 +11,7 @@ export type PickerButtonProps = ThemedClassName<{
   Component: FC<{ value: string; size?: IconProps['size'] }>;
   label: string;
   icon: string;
-  values: string[];
+  values: readonly string[];
   disabled?: boolean;
   defaultValue?: string;
   value?: string;
@@ -25,8 +25,8 @@ export const PickerButton = ({
   Component,
   disabled,
   classNames,
-  defaultValue: defaultValueParam,
-  value: valueParam,
+  defaultValue: defaultValueProp,
+  value: valueProp,
   values,
   label,
   icon,
@@ -36,12 +36,12 @@ export const PickerButton = ({
   iconSize = 5,
 }: PickerButtonProps) => {
   const [value, setValue] = useControllableState<string>({
-    prop: valueParam,
-    defaultProp: defaultValueParam,
+    prop: valueProp,
+    defaultProp: defaultValueProp,
     onChange,
   });
   // TODO(burdon): useControllableState doesn't update the prop when the value is changed. Replace it.
-  useEffect(() => setValue(valueParam), [valueParam]);
+  useEffect(() => setValue(valueProp), [valueProp]);
 
   const [open, setOpen] = useState<boolean>(false);
   const TriggerRoot = rootVariant === 'toolbar-button' ? Toolbar.Button : Button;
@@ -50,7 +50,7 @@ export const PickerButton = ({
     <DropdownMenu.Root modal={false} open={open} onOpenChange={setOpen}>
       <Tooltip.Trigger asChild content={label} side='bottom'>
         <DropdownMenu.Trigger asChild>
-          <TriggerRoot classNames={['gap-2 plb-1', classNames]} disabled={disabled}>
+          <TriggerRoot classNames={['gap-2 py-1', classNames]} disabled={disabled}>
             <span className='sr-only'>{label}</span>
             {(value && <Component value={value} size={iconSize} />) || <Icon icon={icon} size={iconSize} />}
             <Icon icon='ph--caret-down--bold' size={3} />
@@ -58,7 +58,7 @@ export const PickerButton = ({
         </DropdownMenu.Trigger>
       </Tooltip.Trigger>
       <DropdownMenu.Portal>
-        <DropdownMenu.Content side='bottom' classNames='!is-min'>
+        <DropdownMenu.Content side='bottom' classNames='!w-min'>
           <DropdownMenu.Viewport classNames='grid grid-cols-[repeat(6,min-content)]'>
             {values.map((_value) => {
               return (