@dxos/react-ui 0.7.5-main.9d2a38b → 0.7.5-main.ff8607b

package/src/components/Main/Main.tsx

@@ -35,12 +35,14 @@ const COMPLEMENTARY_SIDEBAR_NAME = 'ComplementarySidebar';
 const MAIN_NAME = 'Main';
 const GENERIC_CONSUMER_NAME = 'GenericConsumer';
 
+type SidebarState = 'expanded' | 'collapsed' | 'closed';
+
 type MainContextValue = {
   resizing: boolean;
-  navigationSidebarOpen: boolean;
-  setNavigationSidebarOpen: Dispatch<SetStateAction<boolean | undefined>>;
-  complementarySidebarOpen: boolean;
-  setComplementarySidebarOpen: Dispatch<SetStateAction<boolean | undefined>>;
+  navigationSidebarState: SidebarState;
+  setNavigationSidebarState: Dispatch<SetStateAction<SidebarState | undefined>>;
+  complementarySidebarState: SidebarState;
+  setComplementarySidebarState: Dispatch<SetStateAction<SidebarState | undefined>>;
 };
 
 const landmarkAttr = 'data-main-landmark';
@@ -73,73 +75,77 @@ const useLandmarkMover = (propsOnKeyDown: ComponentPropsWithoutRef<'div'>['onKey
 
 const [MainProvider, useMainContext] = createContext<MainContextValue>(MAIN_NAME, {
   resizing: false,
-  navigationSidebarOpen: false,
-  setNavigationSidebarOpen: (nextOpen) => {
+  navigationSidebarState: 'closed',
+  setNavigationSidebarState: (nextState) => {
     // TODO(burdon): Standardize with other context missing errors using raise.
     log.warn('Attempt to set sidebar state without initializing `MainRoot`');
   },
-  complementarySidebarOpen: false,
-  setComplementarySidebarOpen: (nextOpen) => {
+  complementarySidebarState: 'closed',
+  setComplementarySidebarState: (nextState) => {
     // TODO(burdon): Standardize with other context missing errors using raise.
     log.warn('Attempt to set sidebar state without initializing `MainRoot`');
   },
 });
 
 const useSidebars = (consumerName = GENERIC_CONSUMER_NAME) => {
-  const { setNavigationSidebarOpen, navigationSidebarOpen, setComplementarySidebarOpen, complementarySidebarOpen } =
+  const { setNavigationSidebarState, navigationSidebarState, setComplementarySidebarState, complementarySidebarState } =
     useMainContext(consumerName);
   return {
-    navigationSidebarOpen,
-    setNavigationSidebarOpen,
+    navigationSidebarState,
+    setNavigationSidebarState,
     toggleNavigationSidebar: useCallback(
-      () => setNavigationSidebarOpen(!navigationSidebarOpen),
-      [navigationSidebarOpen, setNavigationSidebarOpen],
+      () => setNavigationSidebarState(navigationSidebarState === 'expanded' ? 'closed' : 'expanded'),
+      [navigationSidebarState, setNavigationSidebarState],
     ),
-    openNavigationSidebar: useCallback(() => setNavigationSidebarOpen(true), [setNavigationSidebarOpen]),
-    closeNavigationSidebar: useCallback(() => setNavigationSidebarOpen(false), [setNavigationSidebarOpen]),
-    complementarySidebarOpen,
-    setComplementarySidebarOpen,
+    openNavigationSidebar: useCallback(() => setNavigationSidebarState('expanded'), []),
+    collapseNavigationSidebar: useCallback(() => setNavigationSidebarState('collapsed'), []),
+    closeNavigationSidebar: useCallback(() => setNavigationSidebarState('closed'), []),
+    complementarySidebarState,
+    setComplementarySidebarState,
     toggleComplementarySidebar: useCallback(
-      () => setComplementarySidebarOpen(!complementarySidebarOpen),
-      [complementarySidebarOpen, setComplementarySidebarOpen],
+      () => setComplementarySidebarState(complementarySidebarState === 'expanded' ? 'closed' : 'expanded'),
+      [complementarySidebarState, setComplementarySidebarState],
     ),
-    openComplementarySidebar: useCallback(() => setComplementarySidebarOpen(true), [setComplementarySidebarOpen]),
-    closeComplementarySidebar: useCallback(() => setComplementarySidebarOpen(false), [setComplementarySidebarOpen]),
+    openComplementarySidebar: useCallback(() => setComplementarySidebarState('expanded'), []),
+    collapseComplementarySidebar: useCallback(() => setComplementarySidebarState('collapsed'), []),
+    closeComplementarySidebar: useCallback(() => setComplementarySidebarState('closed'), []),
   };
 };
 
 type MainRootProps = PropsWithChildren<{
-  navigationSidebarOpen?: boolean;
-  defaultNavigationSidebarOpen?: boolean;
-  onNavigationSidebarOpenChange?: (nextOpen: boolean) => void;
-  complementarySidebarOpen?: boolean;
-  defaultComplementarySidebarOpen?: boolean;
-  onComplementarySidebarOpenChange?: (nextOpen: boolean) => void;
+  navigationSidebarState?: SidebarState;
+  defaultNavigationSidebarState?: SidebarState;
+  onNavigationSidebarStateChange?: (nextState: SidebarState) => void;
+  complementarySidebarState?: SidebarState;
+  defaultComplementarySidebarState?: SidebarState;
+  onComplementarySidebarStateChange?: (nextState: SidebarState) => void;
 }>;
 
 const resizeDebounce = 3000;
 
 const MainRoot = ({
-  navigationSidebarOpen: propsNavigationSidebarOpen,
-  defaultNavigationSidebarOpen,
-  onNavigationSidebarOpenChange,
-  complementarySidebarOpen: propsComplementarySidebarOpen,
-  defaultComplementarySidebarOpen,
-  onComplementarySidebarOpenChange,
+  navigationSidebarState: propsNavigationSidebarState,
+  defaultNavigationSidebarState,
+  onNavigationSidebarStateChange,
+  complementarySidebarState: propsComplementarySidebarState,
+  defaultComplementarySidebarState,
+  onComplementarySidebarStateChange,
   children,
   ...props
 }: MainRootProps) => {
   const [isLg] = useMediaQuery('lg', { ssr: false });
-  const [navigationSidebarOpen = isLg, setNavigationSidebarOpen] = useControllableState<boolean>({
-    prop: propsNavigationSidebarOpen,
-    defaultProp: defaultNavigationSidebarOpen,
-    onChange: onNavigationSidebarOpenChange,
-  });
-  const [complementarySidebarOpen = false, setComplementarySidebarOpen] = useControllableState<boolean>({
-    prop: propsComplementarySidebarOpen,
-    defaultProp: defaultComplementarySidebarOpen,
-    onChange: onComplementarySidebarOpenChange,
-  });
+  const [navigationSidebarState = isLg ? 'expanded' : 'collapsed', setNavigationSidebarState] =
+    useControllableState<SidebarState>({
+      prop: propsNavigationSidebarState,
+      defaultProp: defaultNavigationSidebarState,
+      onChange: onNavigationSidebarStateChange,
+    });
+  const [complementarySidebarState = isLg ? 'expanded' : 'collapsed', setComplementarySidebarState] =
+    useControllableState<SidebarState>({
+      prop: propsComplementarySidebarState,
+      defaultProp: defaultComplementarySidebarState,
+      onChange: onComplementarySidebarStateChange,
+    });
 
   const [resizing, setResizing] = useState(false);
   const resizeInterval = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -164,10 +170,10 @@ const MainRoot = ({
     <MainProvider
       {...props}
       {...{
-        navigationSidebarOpen,
-        setNavigationSidebarOpen,
-        complementarySidebarOpen,
-        setComplementarySidebarOpen,
+        navigationSidebarState,
+        setNavigationSidebarState,
+        complementarySidebarState,
+        setComplementarySidebarState,
       }}
       resizing={resizing}
     >
@@ -184,15 +190,15 @@ const handleOpenAutoFocus = (event: Event) => {
 
 type MainSidebarProps = ThemedClassName<ComponentPropsWithRef<typeof DialogContent>> & {
   swipeToDismiss?: boolean;
-  open: boolean;
+  state?: SidebarState;
   resizing?: boolean;
-  setOpen: Dispatch<SetStateAction<boolean | undefined>>;
+  onStateChange?: (nextState: SidebarState) => void;
   side: 'inline-start' | 'inline-end';
 };
 
 const MainSidebar = forwardRef<HTMLDivElement, MainSidebarProps>(
   (
-    { classNames, children, swipeToDismiss, onOpenAutoFocus, open, resizing, setOpen, side, ...props },
+    { classNames, children, swipeToDismiss, onOpenAutoFocus, state, resizing, onStateChange, side, ...props },
     forwardedRef,
   ) => {
     const [isLg] = useMediaQuery('lg', { ssr: false });
@@ -200,7 +206,7 @@ const MainSidebar = forwardRef<HTMLDivElement, MainSidebarProps>(
     const ref = useForwardedRef(forwardedRef);
     const noopRef = useRef(null);
     useSwipeToDismiss(swipeToDismiss ? ref : noopRef, {
-      onDismiss: () => setOpen(false),
+      onDismiss: () => onStateChange?.('closed'),
     });
     const handleKeyDown = useCallback(
       (event: KeyboardEvent<HTMLDivElement>) => {
@@ -213,16 +219,16 @@ const MainSidebar = forwardRef<HTMLDivElement, MainSidebarProps>(
     );
     const Root = isLg ? Primitive.div : DialogContent;
     return (
-      <DialogRoot open={open} modal={false}>
+      <DialogRoot open={state !== 'closed'} modal={false}>
         <Root
           {...(!isLg && { forceMount: true, tabIndex: -1, onOpenAutoFocus: onOpenAutoFocus ?? handleOpenAutoFocus })}
           {...props}
           data-side={side === 'inline-end' ? 'ie' : 'is'}
-          data-state={open ? 'open' : 'closed'}
+          data-state={state}
           data-resizing={resizing ? 'true' : 'false'}
           className={tx('main.sidebar', 'main__sidebar', {}, classNames)}
           onKeyDown={handleKeyDown}
-          {...(!open && { inert: 'true' })}
+          {...(state === 'closed' && { inert: 'true' })}
           ref={ref}
         >
           {children}
@@ -232,17 +238,17 @@ const MainSidebar = forwardRef<HTMLDivElement, MainSidebarProps>(
   },
 );
 
-type MainNavigationSidebarProps = Omit<MainSidebarProps, 'open' | 'setOpen' | 'side'>;
+type MainNavigationSidebarProps = Omit<MainSidebarProps, 'expanded' | 'side'>;
 
 const MainNavigationSidebar = forwardRef<HTMLDivElement, MainNavigationSidebarProps>((props, forwardedRef) => {
-  const { navigationSidebarOpen, setNavigationSidebarOpen, resizing } = useMainContext(NAVIGATION_SIDEBAR_NAME);
+  const { navigationSidebarState, setNavigationSidebarState, resizing } = useMainContext(NAVIGATION_SIDEBAR_NAME);
   const mover = useLandmarkMover(props.onKeyDown, '0');
   return (
     <MainSidebar
       {...mover}
       {...props}
-      open={navigationSidebarOpen}
-      setOpen={setNavigationSidebarOpen}
+      state={navigationSidebarState}
+      onStateChange={setNavigationSidebarState}
       resizing={resizing}
       side='inline-start'
       ref={forwardedRef}
@@ -252,18 +258,18 @@ const MainNavigationSidebar = forwardRef<HTMLDivElement, MainNavigationSidebarPr
 
 MainNavigationSidebar.displayName = NAVIGATION_SIDEBAR_NAME;
 
-type MainComplementarySidebarProps = Omit<MainSidebarProps, 'open' | 'setOpen' | 'side'>;
+type MainComplementarySidebarProps = Omit<MainSidebarProps, 'expanded' | 'side'>;
 
 const MainComplementarySidebar = forwardRef<HTMLDivElement, MainComplementarySidebarProps>((props, forwardedRef) => {
-  const { complementarySidebarOpen, setComplementarySidebarOpen, resizing } =
+  const { complementarySidebarState, setComplementarySidebarState, resizing } =
     useMainContext(COMPLEMENTARY_SIDEBAR_NAME);
   const mover = useLandmarkMover(props.onKeyDown, '2');
   return (
     <MainSidebar
       {...mover}
       {...props}
-      open={complementarySidebarOpen}
-      setOpen={setComplementarySidebarOpen}
+      state={complementarySidebarState}
+      onStateChange={setComplementarySidebarState}
       resizing={resizing}
       side='inline-end'
       ref={forwardedRef}
@@ -281,7 +287,7 @@ type MainProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.div>> &
 
 const MainContent = forwardRef<HTMLDivElement, MainProps>(
   ({ asChild, classNames, bounce, handlesFocus, children, role, ...props }: MainProps, forwardedRef) => {
-    const { navigationSidebarOpen, complementarySidebarOpen } = useMainContext(MAIN_NAME);
+    const { navigationSidebarState, complementarySidebarState } = useMainContext(MAIN_NAME);
     const { tx } = useThemeContext();
     const Root = asChild ? Slot : role ? 'div' : 'main';
 
@@ -292,8 +298,8 @@ const MainContent = forwardRef<HTMLDivElement, MainProps>(
         role={role}
         {...(handlesFocus && { ...mover })}
         {...props}
-        data-sidebar-inline-start-state={navigationSidebarOpen ? 'open' : 'closed'}
-        data-sidebar-inline-end-state={complementarySidebarOpen ? 'open' : 'closed'}
+        data-sidebar-inline-start-state={navigationSidebarState}
+        data-sidebar-inline-end-state={complementarySidebarState}
         className={tx('main.content', 'main', { bounce, handlesFocus }, classNames)}
         ref={forwardedRef}
       >
@@ -309,23 +315,23 @@ type MainOverlayProps = ThemedClassName<Omit<ComponentPropsWithRef<typeof Primit
 
 const MainOverlay = forwardRef<HTMLDivElement, MainOverlayProps>(({ classNames, ...props }, forwardedRef) => {
   const [isLg] = useMediaQuery('lg', { ssr: false });
-  const { navigationSidebarOpen, setNavigationSidebarOpen, complementarySidebarOpen, setComplementarySidebarOpen } =
+  const { navigationSidebarState, setNavigationSidebarState, complementarySidebarState, setComplementarySidebarState } =
     useMainContext(MAIN_NAME);
   const { tx } = useThemeContext();
   return (
     <div
       onClick={() => {
-        setNavigationSidebarOpen(false);
-        setComplementarySidebarOpen(false);
+        setNavigationSidebarState('collapsed');
+        setComplementarySidebarState('collapsed');
       }}
       {...props}
       className={tx(
         'main.overlay',
         'main__overlay',
-        { isLg, inlineStartSidebarOpen: navigationSidebarOpen, inlineEndSidebarOpen: complementarySidebarOpen },
+        { isLg, inlineStartSidebarOpen: navigationSidebarState, inlineEndSidebarOpen: complementarySidebarState },
         classNames,
       )}
-      data-state={navigationSidebarOpen || complementarySidebarOpen ? 'open' : 'closed'}
+      data-state={navigationSidebarState === 'expanded' || complementarySidebarState === 'expanded' ? 'open' : 'closed'}
       aria-hidden='true'
       ref={forwardedRef}
     />
@@ -340,6 +346,6 @@ export const Main = {
   ComplementarySidebar: MainComplementarySidebar,
 };
 
-export { useMainContext, useSidebars };
+export { useMainContext, useSidebars, useLandmarkMover };
 
-export type { MainRootProps, MainProps, MainOverlayProps, MainNavigationSidebarProps };
+export type { MainRootProps, MainProps, MainOverlayProps, MainNavigationSidebarProps, SidebarState };

package/src/components/Tag/Tag.stories.tsx

@@ -1,46 +1,35 @@
 //
 // Copyright 2022 DXOS.org
 //
+import React from 'react';
 
+import { hueTokenThemes } from '@dxos/react-ui-theme';
 import '@dxos-theme';
+import { type ChromaticPalette, type MessageValence } from '@dxos/react-ui-types';
 
 import { Tag } from './Tag';
 import { withTheme } from '../../testing';
 
+const palettes = ['neutral', 'success', 'info', 'warning', 'error', ...Object.keys(hueTokenThemes)] as (
+  | ChromaticPalette
+  | MessageValence
+)[];
+
 export default {
   title: 'ui/react-ui-core/Tag',
   component: Tag,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-  argTypes: {
-    palette: {
-      control: 'select',
-      options: [
-        'neutral',
-        'success',
-        'info',
-        'warning',
-        'error',
-        'red',
-        'orange',
-        'amber',
-        'yellow',
-        'lime',
-        'green',
-        'emerald',
-        'teal',
-        'cyan',
-        'sky',
-        'blue',
-        'indigo',
-        'violet',
-        'purple',
-        'fuchsia',
-        'pink',
-        'rose',
-      ],
-    },
-  },
-} as any;
+} as const;
 
-export const Default = { args: { children: 'Hello', palette: 'success' } };
+export const Default = {
+  render: () => (
+    <div role='grid' className='grid grid-cols-5 gap-2 max-is-screen-md'>
+      {palettes.map((palette) => (
+        <Tag key={palette} palette={palette}>
+          {palette}
+        </Tag>
+      ))}
+    </div>
+  ),
+};

package/src/components/Tag/Tag.tsx

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 DXOS.org
+// Copyright 2025 DXOS.org
 //
 
 import { Primitive } from '@radix-ui/react-primitive';
@@ -16,8 +16,17 @@ export type TagProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.sp
   asChild?: boolean;
 };
 
-export const Tag = forwardRef<HTMLSpanElement, TagProps>(({ asChild, palette, classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
-  const Root = asChild ? Slot : Primitive.span;
-  return <Root {...props} className={tx('tag.root', 'tag', { palette }, classNames)} ref={forwardedRef} />;
-});
+export const Tag = forwardRef<HTMLSpanElement, TagProps>(
+  ({ asChild, palette = 'neutral', classNames, ...props }, forwardedRef) => {
+    const { tx } = useThemeContext();
+    const Root = asChild ? Slot : Primitive.span;
+    return (
+      <Root
+        {...props}
+        className={tx('tag.root', 'dx-tag', { palette }, classNames)}
+        data-hue={palette}
+        ref={forwardedRef}
+      />
+    );
+  },
+);