@dxos/react-ui 0.7.5-labs.35b4b42 → 0.7.5-labs.5f04cf6

package/dist/types/src/components/Main/Main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Main.d.ts","sourceRoot":"","sources":["../../../../../src/components/Main/Main.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAsB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,KAAK,EAAE,EACZ,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,EAEb,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAKnB,KAAK,aAAa,EAClB,KAAK,wBAAwB,EAC9B,MAAM,OAAO,CAAC;AAOf,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAQlD,KAAK,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,QAAQ,CAAC;AAExD,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,sBAAsB,EAAE,YAAY,CAAC;IACrC,yBAAyB,EAAE,QAAQ,CAAC,cAAc,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC;IAC9E,yBAAyB,EAAE,YAAY,CAAC;IACxC,4BAA4B,EAAE,QAAQ,CAAC,cAAc,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC;CAClF,CAAC;AAIF;;;GAGG;AACH,QAAA,MAAM,gBAAgB,mBAAoB,wBAAwB,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,YAAY,MAAM;;uBAE5F,aAAa,CAAC,cAAc,CAAC;;;CAkBxC,CAAC;AAEF,QAAA,MAAqB,cAAc,4CAYjC,CAAC;AAEH,QAAA,MAAM,WAAW;;;;;;;;;;;;;CAuBhB,CAAC;AAEF,KAAK,aAAa,GAAG,iBAAiB,CAAC;IACrC,sBAAsB,CAAC,EAAE,YAAY,CAAC;IACtC,6BAA6B,CAAC,EAAE,YAAY,CAAC;IAC7C,8BAA8B,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,IAAI,CAAC;IACnE,yBAAyB,CAAC,EAAE,YAAY,CAAC;IACzC,gCAAgC,CAAC,EAAE,YAAY,CAAC;IAChD,iCAAiC,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,IAAI,CAAC;CACvE,CAAC,CAAC;AAqEH,KAAK,gBAAgB,GAAG,eAAe,CAAC,qBAAqB,CAAC,OAAO,aAAa,CAAC,CAAC,GAAG;IACrF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,IAAI,CAAC;IAClD,IAAI,EAAE,cAAc,GAAG,YAAY,CAAC;CACrC,CAAC;AA4CF,KAAK,0BAA0B,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,MAAM,CAAC,CAAC;AAoB9E,KAAK,6BAA6B,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,MAAM,CAAC,CAAC;AAqBjF,KAAK,SAAS,GAAG,eAAe,CAAC,qBAAqB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG;IAC9E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AA4BF,KAAK,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;AA2BvG,eAAO,MAAM,IAAI;;qRA9Md,aAAa;;;;;;;CAoNf,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;AAEzD,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"Main.d.ts","sourceRoot":"","sources":["../../../../../src/components/Main/Main.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAsB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,KAAK,EAAE,EACZ,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,EAEb,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAOpB,MAAM,OAAO,CAAC;AAOf,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAQlD,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,QAAQ,CAAC,cAAc,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC;IACxE,wBAAwB,EAAE,OAAO,CAAC;IAClC,2BAA2B,EAAE,QAAQ,CAAC,cAAc,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC;CAC5E,CAAC;AA8BF,QAAA,MAAqB,cAAc,4CAYjC,CAAC;AAEH,QAAA,MAAM,WAAW;;;;;;;;;;;CAqBhB,CAAC;AAEF,KAAK,aAAa,GAAG,iBAAiB,CAAC;IACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5D,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,gCAAgC,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;CAChE,CAAC,CAAC;AAmEH,KAAK,gBAAgB,GAAG,eAAe,CAAC,qBAAqB,CAAC,OAAO,aAAa,CAAC,CAAC,GAAG;IACrF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC;IACvD,IAAI,EAAE,cAAc,GAAG,YAAY,CAAC;CACrC,CAAC;AA4CF,KAAK,0BAA0B,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC;AAoBtF,KAAK,6BAA6B,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC;AAqBzF,KAAK,SAAS,GAAG,eAAe,CAAC,qBAAqB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG;IAC9E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AA4BF,KAAK,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;AA2BvG,eAAO,MAAM,IAAI;;6QA5Md,aAAa;;;;;;;CAkNf,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC;AAEvC,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/types/src/components/Main/Main.stories.d.ts

@@ -4,7 +4,7 @@ type StoryMainArgs = {};
 declare const _default: {
     title: string;
     component: {
-        ({ navigationSidebarState: propsNavigationSidebarState, defaultNavigationSidebarState, onNavigationSidebarStateChange, complementarySidebarState: propsComplementarySidebarState, defaultComplementarySidebarState, onComplementarySidebarStateChange, children, ...props }: import("./Main").MainRootProps): React.JSX.Element;
+        ({ navigationSidebarOpen: propsNavigationSidebarOpen, defaultNavigationSidebarOpen, onNavigationSidebarOpenChange, complementarySidebarOpen: propsComplementarySidebarOpen, defaultComplementarySidebarOpen, onComplementarySidebarOpenChange, children, ...props }: import("./Main").MainRootProps): React.JSX.Element;
         displayName: string;
     };
     render: (_args: StoryMainArgs) => React.JSX.Element;

package/dist/types/src/components/Menus/DropdownMenu.d.ts

@@ -104,8 +104,12 @@ export declare const DropdownMenu: {
     SubTrigger: React.ForwardRefExoticComponent<DropdownMenuSubTriggerProps & React.RefAttributes<HTMLDivElement>>;
     SubContent: React.ForwardRefExoticComponent<DropdownMenuSubContentProps & React.RefAttributes<HTMLDivElement>>;
 };
-declare const useDropdownMenuMenuScope: (scope: Scope) => {
-    [__scopeProp: string]: Scope;
+declare const useDropdownMenuMenuScope: (scope: {
+    [scopeName: string]: React.Context<any>[];
+} | undefined) => {
+    [__scopeProp: string]: {
+        [scopeName: string]: React.Context<any>[];
+    } | undefined;
 };
 export { createDropdownMenuScope, useDropdownMenuContext, useDropdownMenuMenuScope };
 export type { DropdownMenuRootProps, DropdownMenuTriggerProps, DropdownMenuVirtualTriggerProps, DropdownMenuPortalProps, DropdownMenuContentProps, DropdownMenuViewportProps, DropdownMenuGroupProps, DropdownMenuLabelProps, DropdownMenuItemProps, DropdownMenuCheckboxItemProps, DropdownMenuRadioGroupProps, DropdownMenuRadioItemProps, DropdownMenuItemIndicatorProps, DropdownMenuSeparatorProps, DropdownMenuArrowProps, DropdownMenuSubProps, DropdownMenuSubTriggerProps, DropdownMenuSubContentProps, };

package/dist/types/src/components/Menus/DropdownMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownMenu.d.ts","sourceRoot":"","sources":["../../../../../src/components/Menus/DropdownMenu.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DropdownMenu.d.ts","sourceRoot":"","sources":["../../../../../src/components/Menus/DropdownMenu.tsx"],"names":[],"mappings":"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"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.7.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui",
-  "version": "0.7.5-labs.35b4b42",
+  "version": "0.7.5-labs.5f04cf6",
   "description": "Low-level React components for DXOS, applying a theme to a core group of primitives",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,49 +24,49 @@
   ],
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
-    "@fluentui/react-tabster": "9.23.3",
-    "@radix-ui/primitive": "1.1.1",
-    "@radix-ui/react-alert-dialog": "1.1.6",
-    "@radix-ui/react-avatar": "1.1.3",
-    "@radix-ui/react-checkbox": "1.1.4",
-    "@radix-ui/react-collapsible": "1.1.3",
-    "@radix-ui/react-compose-refs": "1.1.1",
-    "@radix-ui/react-context": "1.1.1",
-    "@radix-ui/react-context-menu": "2.2.6",
-    "@radix-ui/react-dialog": "1.1.6",
-    "@radix-ui/react-dismissable-layer": "1.1.5",
-    "@radix-ui/react-focus-guards": "1.1.1",
-    "@radix-ui/react-focus-scope": "1.1.2",
-    "@radix-ui/react-id": "1.1.0",
-    "@radix-ui/react-menu": "2.1.6",
-    "@radix-ui/react-popper": "1.2.2",
-    "@radix-ui/react-portal": "1.1.4",
-    "@radix-ui/react-presence": "1.1.2",
-    "@radix-ui/react-primitive": "2.0.2",
-    "@radix-ui/react-scroll-area": "1.2.3",
-    "@radix-ui/react-select": "2.1.6",
-    "@radix-ui/react-separator": "1.1.2",
-    "@radix-ui/react-slot": "1.1.2",
-    "@radix-ui/react-switch": "1.1.3",
-    "@radix-ui/react-toast": "1.2.6",
-    "@radix-ui/react-toggle": "1.1.2",
-    "@radix-ui/react-toggle-group": "1.1.2",
-    "@radix-ui/react-toolbar": "1.1.2",
-    "@radix-ui/react-tooltip": "1.1.8",
-    "@radix-ui/react-use-controllable-state": "1.1.0",
+    "@fluentui/react-tabster": "^9.19.0",
+    "@radix-ui/primitive": "^1.0.0",
+    "@radix-ui/react-alert-dialog": "^1.0.3",
+    "@radix-ui/react-avatar": "^1.0.2",
+    "@radix-ui/react-checkbox": "^1.0.3",
+    "@radix-ui/react-collapsible": "^1.0.2",
+    "@radix-ui/react-compose-refs": "^1.0.0",
+    "@radix-ui/react-context": "^1.0.0",
+    "@radix-ui/react-context-menu": "^2.1.5",
+    "@radix-ui/react-dialog": "^1.0.3",
+    "@radix-ui/react-dismissable-layer": "^1.1.1",
+    "@radix-ui/react-focus-guards": "^1.1.1",
+    "@radix-ui/react-focus-scope": "^1.1.0",
+    "@radix-ui/react-id": "^1.1.0",
+    "@radix-ui/react-menu": "^2.0.6",
+    "@radix-ui/react-popper": "^1.1.2",
+    "@radix-ui/react-portal": "^1.1.2",
+    "@radix-ui/react-presence": "^1.1.1",
+    "@radix-ui/react-primitive": "^1.0.2",
+    "@radix-ui/react-scroll-area": "^1.0.3",
+    "@radix-ui/react-select": "^1.2.1",
+    "@radix-ui/react-separator": "^1.0.3",
+    "@radix-ui/react-slot": "^1.0.1",
+    "@radix-ui/react-switch": "^1.0.3",
+    "@radix-ui/react-toast": "^1.2.1",
+    "@radix-ui/react-toggle": "^1.0.2",
+    "@radix-ui/react-toggle-group": "^1.0.3",
+    "@radix-ui/react-toolbar": "^1.0.3",
+    "@radix-ui/react-tooltip": "^1.1.2",
+    "@radix-ui/react-use-controllable-state": "^1.0.0",
     "aria-hidden": "^1.2.4",
     "date-fns": "^3.3.1",
     "i18next": "^21.10.0",
     "keyborg": "^2.5.0",
     "react-i18next": "^11.18.6",
     "react-remove-scroll": "^2.6.0",
-    "@dxos/debug": "0.7.5-labs.35b4b42",
-    "@dxos/log": "0.7.5-labs.35b4b42",
-    "@dxos/react-list": "0.7.5-labs.35b4b42",
-    "@dxos/react-hooks": "0.7.5-labs.35b4b42",
-    "@dxos/react-ui-types": "0.7.5-labs.35b4b42",
-    "@dxos/util": "0.7.5-labs.35b4b42",
-    "@dxos/react-input": "0.7.5-labs.35b4b42"
+    "@dxos/debug": "0.7.5-labs.5f04cf6",
+    "@dxos/react-hooks": "0.7.5-labs.5f04cf6",
+    "@dxos/react-input": "0.7.5-labs.5f04cf6",
+    "@dxos/log": "0.7.5-labs.5f04cf6",
+    "@dxos/react-list": "0.7.5-labs.5f04cf6",
+    "@dxos/util": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-types": "0.7.5-labs.5f04cf6"
   },
   "devDependencies": {
     "@dnd-kit/core": "^6.0.5",
@@ -78,15 +78,15 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.7.5-labs.35b4b42",
-    "@dxos/react-ui-theme": "0.7.5-labs.35b4b42",
-    "@dxos/util": "0.7.5-labs.35b4b42"
+    "@dxos/random": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6",
+    "@dxos/util": "0.7.5-labs.5f04cf6"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.7.5-labs.35b4b42"
+    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Avatars/Avatar.tsx

@@ -5,8 +5,8 @@
 import {
   Root as AvatarRootPrimitive,
   type AvatarProps as AvatarRootPrimitiveProps,
+  type ImageLoadingStatus,
   Fallback as AvatarFallbackPrimitive,
-  type AvatarImageProps as AvatarImagePrimitiveProps,
 } from '@radix-ui/react-avatar';
 import { createContext } from '@radix-ui/react-context';
 import { Primitive } from '@radix-ui/react-primitive';
@@ -243,7 +243,9 @@ const AvatarMaskedText = (props: AvatarMaskedTextProps) => {
   );
 };
 
-type AvatarImageProps = ComponentPropsWithRef<'image'> & Pick<AvatarImagePrimitiveProps, 'onLoadingStatusChange'>;
+type AvatarImageProps = ComponentPropsWithRef<'image'> & {
+  onLoadingStatusChange?: (status: ImageLoadingStatus) => void;
+};
 
 const AvatarImage = forwardRef<SVGImageElement, AvatarImageProps>(
   ({ onLoadingStatusChange, ...props }, forwardedRef) => {
@@ -262,7 +264,8 @@ const AvatarImage = forwardRef<SVGImageElement, AvatarImageProps>(
 
 type AvatarIconProps = {
   icon: string;
-} & Pick<AvatarImagePrimitiveProps, 'onLoadingStatusChange'>;
+  onLoadingStatusChange?: (status: ImageLoadingStatus) => void;
+};
 
 const AvatarIcon = forwardRef<SVGSVGElement, AvatarIconProps>(({ onLoadingStatusChange, ...props }, forwardedRef) => {
   const { size } = useAvatarContext('AvatarIcon');

package/src/components/Buttons/IconButton.tsx

@@ -8,7 +8,7 @@ import { Button, type ButtonProps } from './Button';
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
 import { Icon, type IconProps } from '../Icon';
-import { Tooltip, type TooltipContentProps } from '../Tooltip';
+import { Tooltip } from '../Tooltip';
 
 type IconButtonProps = Omit<ButtonProps, 'children'> &
   Pick<IconProps, 'icon' | 'size'> & {
@@ -19,15 +19,14 @@ type IconButtonProps = Omit<ButtonProps, 'children'> &
     iconClassNames?: ThemedClassName<any>['classNames'];
     tooltipPortal?: boolean;
     tooltipZIndex?: string;
-    tooltipSide?: TooltipContentProps['side'];
     suppressNextTooltip?: MutableRefObject<boolean>;
   };
 
 const IconOnlyButton = forwardRef<HTMLButtonElement, IconButtonProps>(
-  ({ tooltipPortal = true, tooltipZIndex: zIndex, tooltipSide, suppressNextTooltip, ...props }, forwardedRef) => {
+  ({ tooltipPortal = true, tooltipZIndex: zIndex, suppressNextTooltip, ...props }, forwardedRef) => {
     const [triggerTooltipOpen, setTriggerTooltipOpen] = useState(false);
     const content = (
-      <Tooltip.Content {...(zIndex && { style: { zIndex } })} side={tooltipSide}>
+      <Tooltip.Content {...(zIndex && { style: { zIndex } })}>
         {props.label}
         <Tooltip.Arrow />
       </Tooltip.Content>

package/src/components/Input/Input.tsx

@@ -307,7 +307,7 @@ const Switch = forwardRef<HTMLInputElement, InputScopedProps<SwitchProps>>(
     return (
       <input
         type='checkbox'
-        className='dx-checkbox--switch dx-focus-ring'
+        className='ch-checkbox--switch ch-focus-ring'
         checked={checked}
         onChange={(event) => {
           onCheckedChange(event.target.checked);

package/src/components/Main/Main.stories.tsx

@@ -24,7 +24,7 @@ const ComplementarySidebarToggle = () => {
 
 const StoryMain = (_args: StoryMainArgs) => {
   return (
-    <Main.Root>
+    <Main.Root defaultComplementarySidebarOpen>
       <Main.Overlay />
       <Main.NavigationSidebar classNames='p-4'>
         <p>Navigation sidebar content, hi!</p>

package/src/components/Main/Main.tsx

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