@dxos/react-ui 0.7.4 → 0.7.5-labs.071a3e2

package/dist/lib/browser/index.mjs

@@ -22,13 +22,36 @@ var useElevationContext = (propsElevation) => {
   return propsElevation ?? elevation;
 };
 
+// packages/ui/react-ui/src/hooks/useSafeArea.ts
+import { useCallback, useState } from "react";
+import { useResize } from "@dxos/react-hooks";
+var initialSafeArea = {
+  top: NaN,
+  right: NaN,
+  bottom: NaN,
+  left: NaN
+};
+var useSafeArea = () => {
+  const [padding, setPadding] = useState(initialSafeArea);
+  const handleResize = useCallback(() => {
+    setPadding({
+      top: parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-top")),
+      right: parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-right")),
+      bottom: parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-bottom")),
+      left: parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-left"))
+    });
+  }, []);
+  useResize(handleResize);
+  return padding;
+};
+
 // packages/ui/react-ui/src/hooks/useTranslationsContext.ts
 import { useContext as useContext4 } from "react";
 
 // packages/ui/react-ui/src/components/ThemeProvider/TranslationsProvider.tsx
 import { enUS as dtLocaleEnUs } from "date-fns/locale";
 import i18Next from "i18next";
-import React, { useEffect, createContext, useState, Suspense, useContext as useContext3 } from "react";
+import React, { useEffect, createContext, useState as useState2, Suspense, useContext as useContext3 } from "react";
 import { initReactI18next, useTranslation as useI18NextTranslation } from "react-i18next";
 var initialLng = "en-US";
 var initialNs = "dxos-common";
@@ -63,7 +86,7 @@ var useTranslation = (...args) => {
   };
 };
 var TranslationsProvider = ({ fallback, resourceExtensions, children, appNs, dtLocale }) => {
-  const [loaded, setLoaded] = useState(false);
+  const [loaded, setLoaded] = useState2(false);
   useEffect(() => {
     setLoaded(false);
     if (resourceExtensions && resourceExtensions.length) {
@@ -98,21 +121,18 @@ import { raise } from "@dxos/debug";
 var useThemeContext = () => useContext5(ThemeContext) ?? raise(new Error("Missing ThemeContext"));
 
 // packages/ui/react-ui/src/hooks/useVisualViewport.ts
-import { useEffect as useEffect2, useState as useState2 } from "react";
+import { useCallback as useCallback2, useState as useState3 } from "react";
+import { useResize as useResize2 } from "@dxos/react-hooks";
 var useVisualViewport = (deps) => {
-  const [width, setWidth] = useState2(null);
-  const [height, setHeight] = useState2(null);
-  useEffect2(() => {
-    const handleResize = () => {
-      if (window.visualViewport) {
-        setWidth(window.visualViewport.width);
-        setHeight(window.visualViewport.height);
-      }
-    };
-    window.visualViewport?.addEventListener("resize", handleResize);
-    handleResize();
-    return () => window.visualViewport?.removeEventListener("resize", handleResize);
-  }, deps ?? []);
+  const [width, setWidth] = useState3(null);
+  const [height, setHeight] = useState3(null);
+  const handleResize = useCallback2(() => {
+    if (window.visualViewport) {
+      setWidth(window.visualViewport.width);
+      setHeight(window.visualViewport.height);
+    }
+  }, []);
+  useResize2(handleResize);
   return {
     width,
     height
@@ -572,11 +592,33 @@ var ButtonGroup = /* @__PURE__ */ forwardRef7(({ children, elevation: propsEleva
 ButtonGroup.displayName = BUTTON_GROUP_NAME;
 
 // packages/ui/react-ui/src/components/Buttons/IconButton.tsx
-import React10, { forwardRef as forwardRef9 } from "react";
+import React10, { forwardRef as forwardRef9, useState as useState4 } from "react";
 
 // packages/ui/react-ui/src/components/Tooltip/Tooltip.tsx
 import { Provider as TooltipProviderPrimitive, Root as TooltipRootPrimitive, TooltipContent as TooltipContentPrimitive, TooltipTrigger as TooltipTriggerPrimitive, TooltipPortal as TooltipPortalPrimitive, TooltipArrow as TooltipArrowPrimitive } from "@radix-ui/react-tooltip";
 import React9, { forwardRef as forwardRef8 } from "react";
+
+// packages/ui/react-ui/src/hooks/useSafeCollisionPadding.ts
+import { useMemo } from "react";
+var propIsNumber = (prop) => Number.isFinite(prop);
+var propsIsRecord = (prop) => !!(prop && typeof prop === "object");
+var safePadding = (propsPadding, safePadding2, side) => {
+  return (propIsNumber(safePadding2[side]) ? safePadding2[side] : 0) + (propIsNumber(propsPadding) ? propsPadding : propsIsRecord(propsPadding) ? propsPadding[side] ?? 0 : 0);
+};
+var useSafeCollisionPadding = (collisionPadding) => {
+  const { safeAreaPadding } = useThemeContext();
+  return useMemo(() => ({
+    top: safePadding(collisionPadding, safeAreaPadding, "top"),
+    right: safePadding(collisionPadding, safeAreaPadding, "right"),
+    bottom: safePadding(collisionPadding, safeAreaPadding, "bottom"),
+    left: safePadding(collisionPadding, safeAreaPadding, "left")
+  }), [
+    collisionPadding,
+    safeAreaPadding
+  ]);
+};
+
+// packages/ui/react-ui/src/components/Tooltip/Tooltip.tsx
 var TooltipProvider = TooltipProviderPrimitive;
 var TooltipRoot = TooltipRootPrimitive;
 var TooltipPortal = TooltipPortalPrimitive;
@@ -589,13 +631,17 @@ var TooltipArrow = /* @__PURE__ */ forwardRef8(({ classNames, ...props }, forwar
     ref: forwardedRef
   });
 });
-var TooltipContent = /* @__PURE__ */ forwardRef8(({ classNames, ...props }, forwardedRef) => {
+var TooltipContent = /* @__PURE__ */ forwardRef8(({ classNames, collisionPadding = 8, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
+  const elevation = useElevationContext();
+  const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
   return /* @__PURE__ */ React9.createElement(TooltipContentPrimitive, {
     sideOffset: 4,
-    collisionPadding: 8,
     ...props,
-    className: tx("tooltip.content", "tooltip", {}, classNames),
+    collisionPadding: safeCollisionPadding,
+    className: tx("tooltip.content", "tooltip", {
+      elevation
+    }, classNames),
     ref: forwardedRef
   });
 });
@@ -609,20 +655,34 @@ var Tooltip = {
 };
 
 // packages/ui/react-ui/src/components/Buttons/IconButton.tsx
-var IconOnlyButton = /* @__PURE__ */ forwardRef9(({ tooltipPortal = true, tooltipZIndex: zIndex, ...props }, forwardedRef) => {
-  const content = /* @__PURE__ */ React10.createElement(Tooltip.Content, zIndex && {
-    style: {
-      zIndex
-    }
+var IconOnlyButton = /* @__PURE__ */ forwardRef9(({ tooltipPortal = true, tooltipZIndex: zIndex, tooltipSide, suppressNextTooltip, ...props }, forwardedRef) => {
+  const [triggerTooltipOpen, setTriggerTooltipOpen] = useState4(false);
+  const content = /* @__PURE__ */ React10.createElement(Tooltip.Content, {
+    ...zIndex && {
+      style: {
+        zIndex
+      }
+    },
+    side: tooltipSide
   }, props.label, /* @__PURE__ */ React10.createElement(Tooltip.Arrow, null));
-  return /* @__PURE__ */ React10.createElement(Tooltip.Root, null, /* @__PURE__ */ React10.createElement(Tooltip.Trigger, {
+  return /* @__PURE__ */ React10.createElement(Tooltip.Root, {
+    open: triggerTooltipOpen,
+    onOpenChange: (nextOpen) => {
+      if (suppressNextTooltip?.current) {
+        setTriggerTooltipOpen(false);
+        suppressNextTooltip.current = false;
+      } else {
+        setTriggerTooltipOpen(nextOpen);
+      }
+    }
+  }, /* @__PURE__ */ React10.createElement(Tooltip.Trigger, {
     asChild: true
   }, /* @__PURE__ */ React10.createElement(LabelledIconButton, {
     ...props,
     ref: forwardedRef
   })), tooltipPortal ? /* @__PURE__ */ React10.createElement(Tooltip.Portal, null, content) : content);
 });
-var LabelledIconButton = /* @__PURE__ */ forwardRef9(({ icon, size, iconOnly, label, classNames, iconClassNames, ...props }, forwardedRef) => {
+var LabelledIconButton = /* @__PURE__ */ forwardRef9(({ icon, size, iconOnly, label, classNames, iconClassNames, caretDown, suppressNextTooltip, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   return /* @__PURE__ */ React10.createElement(Button, {
     ...props,
@@ -634,7 +694,10 @@ var LabelledIconButton = /* @__PURE__ */ forwardRef9(({ icon, size, iconOnly, la
     classNames: iconClassNames
   }), /* @__PURE__ */ React10.createElement("span", {
     className: iconOnly ? "sr-only" : void 0
-  }, label));
+  }, label), caretDown && /* @__PURE__ */ React10.createElement(Icon, {
+    size: 3,
+    icon: "ph--caret-down--bold"
+  }));
 });
 var IconButton = /* @__PURE__ */ forwardRef9((props, forwardedRef) => props.iconOnly ? /* @__PURE__ */ React10.createElement(IconOnlyButton, {
   ...props,
@@ -687,7 +750,7 @@ var ToggleGroupItem = /* @__PURE__ */ forwardRef11(({ variant, elevation, densit
 });
 
 // packages/ui/react-ui/src/components/Clipboard/ClipboardProvider.tsx
-import React13, { createContext as createContext4, useCallback, useContext as useContext6, useState as useState3 } from "react";
+import React13, { createContext as createContext4, useCallback as useCallback3, useContext as useContext6, useState as useState5 } from "react";
 var ClipboardContext = /* @__PURE__ */ createContext4({
   textValue: "",
   setTextValue: async (_) => {
@@ -695,8 +758,8 @@ var ClipboardContext = /* @__PURE__ */ createContext4({
 });
 var useClipboard = () => useContext6(ClipboardContext);
 var ClipboardProvider = ({ children }) => {
-  const [textValue, setInternalTextValue] = useState3("");
-  const setTextValue = useCallback(async (nextValue) => {
+  const [textValue, setInternalTextValue] = useState5("");
+  const setTextValue = useCallback3(async (nextValue) => {
     await navigator.clipboard.writeText(nextValue);
     return setInternalTextValue(nextValue);
   }, []);
@@ -709,12 +772,12 @@ var ClipboardProvider = ({ children }) => {
 };
 
 // packages/ui/react-ui/src/components/Clipboard/CopyButton.tsx
-import React17, { useState as useState4 } from "react";
+import React17, { useState as useState6 } from "react";
 import { mx } from "@dxos/react-ui-theme";
 
 // packages/ui/react-ui/src/components/ThemeProvider/ThemeProvider.tsx
 import { createKeyborg } from "keyborg";
-import React16, { createContext as createContext7, useEffect as useEffect3 } from "react";
+import React16, { createContext as createContext7, useEffect as useEffect2, useMemo as useMemo2 } from "react";
 
 // packages/ui/react-ui/src/util/hasIosKeyboard.ts
 var hasIosKeyboard = () => {
@@ -745,27 +808,35 @@ var ElevationProvider = ({ elevation, children }) => /* @__PURE__ */ React15.cre
 
 // packages/ui/react-ui/src/components/ThemeProvider/ThemeProvider.tsx
 var ThemeContext = /* @__PURE__ */ createContext7(void 0);
-var ThemeProvider = ({ children, fallback = null, resourceExtensions, appNs, tx = (_path, defaultClassName, _styleProps, ..._options) => defaultClassName, themeMode = "dark", rootDensity = "fine", rootElevation = "base", ...rest }) => {
-  useEffect3(() => {
+var ThemeProvider = ({ children, fallback = null, resourceExtensions, appNs, tx = (_path, defaultClassName, _styleProps, ..._options) => defaultClassName, themeMode = "dark", rootDensity = "fine", ...rest }) => {
+  useEffect2(() => {
     if (document.defaultView) {
       const kb = createKeyborg(document.defaultView);
       kb.subscribe(handleInputModalityChange);
       return () => kb.unsubscribe(handleInputModalityChange);
     }
   }, []);
+  const safeAreaPadding = useSafeArea();
+  const contextValue = useMemo2(() => ({
+    tx,
+    themeMode,
+    hasIosKeyboard: hasIosKeyboard(),
+    safeAreaPadding,
+    ...rest
+  }), [
+    tx,
+    themeMode,
+    safeAreaPadding,
+    rest
+  ]);
   return /* @__PURE__ */ React16.createElement(ThemeContext.Provider, {
-    value: {
-      tx,
-      themeMode,
-      hasIosKeyboard: hasIosKeyboard(),
-      ...rest
-    }
+    value: contextValue
   }, /* @__PURE__ */ React16.createElement(TranslationsProvider, {
     fallback,
     resourceExtensions,
     appNs
   }, /* @__PURE__ */ React16.createElement(ElevationProvider, {
-    elevation: rootElevation
+    elevation: "base"
   }, /* @__PURE__ */ React16.createElement(DensityProvider, {
     density: rootDensity
   }, children))));
@@ -817,15 +888,14 @@ var CopyButtonIconOnly = ({ value, classNames, iconProps, variant, ...props }) =
   const { textValue, setTextValue } = useClipboard();
   const isCopied = textValue === value;
   const label = isCopied ? t("copy success label") : t("copy label");
-  const [open, setOpen] = useState4(false);
+  const [open, setOpen] = useState6(false);
   return /* @__PURE__ */ React17.createElement(Tooltip.Root, {
     delayDuration: 1500,
     open,
     onOpenChange: setOpen
   }, /* @__PURE__ */ React17.createElement(Tooltip.Portal, null, /* @__PURE__ */ React17.createElement(Tooltip.Content, {
     side: "bottom",
-    sideOffset: 12,
-    classNames: "z-30"
+    sideOffset: 12
   }, /* @__PURE__ */ React17.createElement("span", null, label), /* @__PURE__ */ React17.createElement(Tooltip.Arrow, null))), /* @__PURE__ */ React17.createElement(Tooltip.Trigger, {
     "aria-label": label,
     ...props,
@@ -856,7 +926,9 @@ var Clipboard = {
 import { createContext as createContext8 } from "@radix-ui/react-context";
 import { Root as DialogRootPrimitive, DialogTrigger as DialogTriggerPrimitive, DialogPortal as DialogPortalPrimitive, DialogOverlay as DialogOverlayPrimitive, DialogTitle as DialogTitlePrimitive, DialogDescription as DialogDescriptionPrimitive, DialogClose as DialogClosePrimitive, DialogContent as DialogContentPrimitive } from "@radix-ui/react-dialog";
 import React18, { forwardRef as forwardRef12 } from "react";
-var DialogRoot = DialogRootPrimitive;
+var DialogRoot = (props) => /* @__PURE__ */ React18.createElement(ElevationProvider, {
+  elevation: "dialog"
+}, /* @__PURE__ */ React18.createElement(DialogRootPrimitive, props));
 var DialogTrigger = DialogTriggerPrimitive;
 var DialogPortal = DialogPortalPrimitive;
 var DialogTitle = /* @__PURE__ */ forwardRef12(({ classNames, srOnly, ...props }, forwardedRef) => {
@@ -889,7 +961,7 @@ var DialogOverlay = /* @__PURE__ */ forwardRef12(({ classNames, children, blockA
   const { tx } = useThemeContext();
   return /* @__PURE__ */ React18.createElement(DialogOverlayPrimitive, {
     ...props,
-    className: tx("dialog.overlay", "dialog__overlay", {}, classNames, "data-[block-align=start]:justify-center", "data-[block-align=start]:items-start", "data-[block-align=center]:place-content-center"),
+    className: tx("dialog.overlay", "dialog__overlay", {}, classNames),
     ref: forwardedRef,
     "data-block-align": blockAlign
   }, /* @__PURE__ */ React18.createElement(OverlayLayoutProvider, {
@@ -906,9 +978,7 @@ var DialogContent = /* @__PURE__ */ forwardRef12(({ classNames, children, ...pro
       inOverlayLayout
     }, classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React18.createElement(ElevationProvider, {
-    elevation: "chrome"
-  }, children));
+  }, children);
 });
 DialogContent.displayName = DIALOG_CONTENT_NAME;
 var Dialog = {
@@ -926,7 +996,9 @@ var Dialog = {
 import { Root as AlertDialogRootPrimitive, AlertDialogTrigger as AlertDialogTriggerPrimitive, AlertDialogPortal as AlertDialogPortalPrimitive, AlertDialogOverlay as AlertDialogOverlayPrimitive, AlertDialogTitle as AlertDialogTitlePrimitive, AlertDialogDescription as AlertDialogDescriptionPrimitive, AlertDialogAction as AlertDialogActionPrimitive, AlertDialogCancel as AlertDialogCancelPrimitive, AlertDialogContent as AlertDialogContentPrimitive } from "@radix-ui/react-alert-dialog";
 import { createContext as createContext9 } from "@radix-ui/react-context";
 import React19, { forwardRef as forwardRef13 } from "react";
-var AlertDialogRoot = AlertDialogRootPrimitive;
+var AlertDialogRoot = (props) => /* @__PURE__ */ React19.createElement(ElevationProvider, {
+  elevation: "dialog"
+}, /* @__PURE__ */ React19.createElement(AlertDialogRootPrimitive, props));
 var AlertDialogTrigger = AlertDialogTriggerPrimitive;
 var AlertDialogPortal = AlertDialogPortalPrimitive;
 var AlertDialogCancel = AlertDialogCancelPrimitive;
@@ -977,9 +1049,7 @@ var AlertDialogContent = /* @__PURE__ */ forwardRef13(({ classNames, children, .
       inOverlayLayout
     }, classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React19.createElement(ElevationProvider, {
-    elevation: "chrome"
-  }, children));
+  }, children);
 });
 AlertDialogContent.displayName = ALERT_DIALOG_CONTENT_NAME;
 var AlertDialog = {
@@ -1002,16 +1072,18 @@ import React20, { forwardRef as forwardRef14 } from "react";
 var ContextMenuRoot = ContextMenuPrimitive.ContextMenu;
 var ContextMenuTrigger = ContextMenuPrimitive.Trigger;
 var ContextMenuPortal = ContextMenuPrimitive.Portal;
-var ContextMenuContent = /* @__PURE__ */ forwardRef14(({ classNames, children, ...props }, forwardedRef) => {
+var ContextMenuContent = /* @__PURE__ */ forwardRef14(({ classNames, children, collisionPadding = 8, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
+  const elevation = useElevationContext();
+  const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
   return /* @__PURE__ */ React20.createElement(ContextMenuPrimitive.Content, {
-    collisionPadding: 8,
     ...props,
-    className: tx("menu.content", "menu", {}, classNames),
+    collisionPadding: safeCollisionPadding,
+    className: tx("menu.content", "menu", {
+      elevation
+    }, classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React20.createElement(ElevationProvider, {
-    elevation: "chrome"
-  }, children));
+  }, children);
 });
 var ContextMenuViewport = /* @__PURE__ */ forwardRef14(({ classNames, asChild, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
@@ -1089,7 +1161,7 @@ import { createMenuScope } from "@radix-ui/react-menu";
 import { Primitive as Primitive7 } from "@radix-ui/react-primitive";
 import { Slot as Slot7 } from "@radix-ui/react-slot";
 import { useControllableState } from "@radix-ui/react-use-controllable-state";
-import React21, { useRef, useCallback as useCallback2, forwardRef as forwardRef15, useEffect as useEffect4 } from "react";
+import React21, { useRef, useCallback as useCallback4, forwardRef as forwardRef15, useEffect as useEffect3 } from "react";
 var DROPDOWN_MENU_NAME = "DropdownMenu";
 var [createDropdownMenuContext, createDropdownMenuScope] = createContextScope(DROPDOWN_MENU_NAME, [
   createMenuScope
@@ -1112,7 +1184,7 @@ var DropdownMenuRoot = (props) => {
     contentId: useId3(),
     open,
     onOpenChange: setOpen,
-    onOpenToggle: useCallback2(() => setOpen((prevOpen) => !prevOpen), [
+    onOpenToggle: useCallback4(() => setOpen((prevOpen) => !prevOpen), [
       setOpen
     ]),
     modal
@@ -1181,7 +1253,7 @@ var DropdownMenuVirtualTrigger = (props) => {
   const { __scopeDropdownMenu, virtualRef } = props;
   const context = useDropdownMenuContext(VIRTUAL_TRIGGER_NAME, __scopeDropdownMenu);
   const menuScope = useMenuScope(__scopeDropdownMenu);
-  useEffect4(() => {
+  useEffect3(() => {
     if (virtualRef.current) {
       context.triggerRef.current = virtualRef.current;
     }
@@ -1213,16 +1285,19 @@ var DropdownMenuViewport = /* @__PURE__ */ forwardRef15(({ classNames, asChild,
 });
 var CONTENT_NAME = "DropdownMenuContent";
 var DropdownMenuContent = /* @__PURE__ */ forwardRef15((props, forwardedRef) => {
-  const { __scopeDropdownMenu, classNames, ...contentProps } = props;
+  const { __scopeDropdownMenu, classNames, collisionPadding = 8, ...contentProps } = props;
   const { tx } = useThemeContext();
   const context = useDropdownMenuContext(CONTENT_NAME, __scopeDropdownMenu);
+  const elevation = useElevationContext();
   const menuScope = useMenuScope(__scopeDropdownMenu);
   const hasInteractedOutsideRef = useRef(false);
+  const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
   return /* @__PURE__ */ React21.createElement(MenuPrimitive.Content, {
     id: context.contentId,
     "aria-labelledby": context.triggerId,
     ...menuScope,
     ...contentProps,
+    collisionPadding: safeCollisionPadding,
     ref: forwardedRef,
     onCloseAutoFocus: composeEventHandlers(props.onCloseAutoFocus, (event) => {
       if (!hasInteractedOutsideRef.current) {
@@ -1239,7 +1314,9 @@ var DropdownMenuContent = /* @__PURE__ */ forwardRef15((props, forwardedRef) =>
         hasInteractedOutsideRef.current = true;
       }
     }),
-    className: tx("menu.content", "menu", {}, classNames),
+    className: tx("menu.content", "menu", {
+      elevation
+    }, classNames),
     style: {
       ...props.style,
       // re-namespace exposed content custom properties
@@ -1433,11 +1510,9 @@ var DropdownMenu = {
 var useDropdownMenuMenuScope = useMenuScope;
 
 // packages/ui/react-ui/src/components/Input/Input.tsx
-import { Check, Minus } from "@phosphor-icons/react";
-import { Root as CheckboxPrimitive, Indicator as CheckboxIndicatorPrimitive } from "@radix-ui/react-checkbox";
-import { Root as SwitchPrimitive, Thumb as SwitchThumbPrimitive } from "@radix-ui/react-switch";
+import { Root as CheckboxPrimitive } from "@radix-ui/react-checkbox";
 import { useControllableState as useControllableState2 } from "@radix-ui/react-use-controllable-state";
-import React22, { forwardRef as forwardRef16, Fragment, useCallback as useCallback3 } from "react";
+import React22, { forwardRef as forwardRef16, useCallback as useCallback5 } from "react";
 import { InputRoot, PinInput as PinInputPrimitive, TextInput as TextInputPrimitive, TextArea as TextAreaPrimitive, useInputContext, INPUT_NAME, Description as DescriptionPrimitive, DescriptionAndValidation as DescriptionAndValidationPrimitive, Label as LabelPrimitive, Validation as ValidationPrimitive } from "@dxos/react-input";
 var Label3 = /* @__PURE__ */ forwardRef16(({ srOnly, classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
@@ -1486,7 +1561,7 @@ var PinInput = /* @__PURE__ */ forwardRef16(({ density: propsDensity, elevation:
   const { tx } = useThemeContext();
   const density = useDensityContext(propsDensity);
   const elevation = useElevationContext(propsElevation);
-  const segmentClassName = useCallback3(({ focused, validationValence }) => tx("input.input", "input--pin-segment", {
+  const segmentClassName = useCallback5(({ focused, validationValence }) => tx("input.input", "input--pin-segment", {
     variant: "static",
     focused,
     disabled: props.disabled,
@@ -1563,7 +1638,6 @@ var Checkbox = /* @__PURE__ */ forwardRef16(({ __inputScope, checked: propsCheck
   });
   const { id, validationValence, descriptionId, errorMessageId } = useInputContext(INPUT_NAME, __inputScope);
   const { tx } = useThemeContext();
-  const Icon3 = checked === "indeterminate" ? Minus : checked ? Check : Fragment;
   return /* @__PURE__ */ React22.createElement(CheckboxPrimitive, {
     ...props,
     checked,
@@ -1578,42 +1652,37 @@ var Checkbox = /* @__PURE__ */ forwardRef16(({ __inputScope, checked: propsCheck
       size
     }, "shrink-0", classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React22.createElement(CheckboxIndicatorPrimitive, {
-    asChild: true
-  }, /* @__PURE__ */ React22.createElement(Icon3, checked && {
-    weight,
-    className: tx("input.checkboxIndicator", "input--checkbox__indicator", {
-      size
+  }, /* @__PURE__ */ React22.createElement(Icon, {
+    icon: checked === "indeterminate" ? "ph--minus--regular" : "ph--check--regular",
+    classNames: tx("input.checkboxIndicator", "input--checkbox__indicator", {
+      size,
+      checked
     })
-  })));
+  }));
 });
-var Switch = /* @__PURE__ */ forwardRef16(({ __inputScope, checked: propsChecked, defaultChecked: propsDefaultChecked, onCheckedChange: propsOnCheckedChange, size = 5, classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
+var Switch = /* @__PURE__ */ forwardRef16(({ __inputScope, checked: propsChecked, defaultChecked: propsDefaultChecked, onCheckedChange: propsOnCheckedChange, classNames, ...props }, forwardedRef) => {
   const [checked, onCheckedChange] = useControllableState2({
     prop: propsChecked,
-    defaultProp: propsDefaultChecked,
+    defaultProp: propsDefaultChecked ?? false,
     onChange: propsOnCheckedChange
   });
   const { id, validationValence, descriptionId, errorMessageId } = useInputContext(INPUT_NAME, __inputScope);
-  return /* @__PURE__ */ React22.createElement(SwitchPrimitive, {
-    ...props,
+  return /* @__PURE__ */ React22.createElement("input", {
+    type: "checkbox",
+    className: "dx-checkbox--switch dx-focus-ring",
     checked,
-    onCheckedChange,
+    onChange: (event) => {
+      onCheckedChange(event.target.checked);
+    },
     id,
     "aria-describedby": descriptionId,
+    ...props,
     ...validationValence === "error" && {
       "aria-invalid": "true",
       "aria-errormessage": errorMessageId
     },
-    className: tx("input.switch", "input--switch", {
-      size
-    }, classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React22.createElement(SwitchThumbPrimitive, {
-    className: tx("input.switchThumb", "input--switch__thumb", {
-      size
-    })
-  }));
+  });
 });
 var Input = {
   Root: InputRoot,
@@ -1631,14 +1700,54 @@ var Input = {
 // packages/ui/react-ui/src/components/Lists/List.tsx
 import { CaretDown, CaretRight } from "@phosphor-icons/react";
 import { Slot as Slot8 } from "@radix-ui/react-slot";
-import React23, { forwardRef as forwardRef17 } from "react";
+import React24, { forwardRef as forwardRef17 } from "react";
 import { List as ListPrimitive, ListItemHeading as ListPrimitiveItemHeading, ListItemOpenTrigger as ListPrimitiveItemOpenTrigger, ListItemCollapsibleContent, ListItem as ListPrimitiveItem, LIST_NAME, LIST_ITEM_NAME, useListContext, useListItemContext } from "@dxos/react-list";
+
+// packages/ui/react-ui/src/components/Lists/ListDropIndicator.tsx
+import React23 from "react";
+var edgeToOrientationMap = {
+  top: "horizontal",
+  bottom: "horizontal",
+  left: "vertical",
+  right: "vertical"
+};
+var orientationStyles = {
+  horizontal: "h-[--line-thickness] left-[calc(var(--line-inset)+var(--terminal-radius))] right-[--line-inset] before:left-[--terminal-inset]",
+  vertical: "w-[--line-thickness] top-[calc(var(--line-inset)+var(--terminal-radius))] bottom-[--line-inset] before:top-[--terminal-inset]"
+};
+var edgeStyles = {
+  top: "top-[--line-offset] before:top-[--offset-terminal]",
+  right: "right-[--line-offset] before:right-[--offset-terminal]",
+  bottom: "bottom-[--line-offset] before:bottom-[--offset-terminal]",
+  left: "left-[--line-offset] before:left-[--offset-terminal]"
+};
+var strokeSize = 2;
+var terminalSize = 8;
+var offsetToAlignTerminalWithLine = (strokeSize - terminalSize) / 2;
+var ListDropIndicator = ({ edge, gap = 0, lineInset = 0, terminalInset = lineInset - terminalSize }) => {
+  const orientation = edgeToOrientationMap[edge];
+  return /* @__PURE__ */ React23.createElement("div", {
+    role: "none",
+    style: {
+      "--line-thickness": `${strokeSize}px`,
+      "--line-offset": `calc(-0.5 * (${gap}px + ${strokeSize}px))`,
+      "--line-inset": `${lineInset}px`,
+      "--terminal-size": `${terminalSize}px`,
+      "--terminal-radius": `${terminalSize / 2}px`,
+      "--terminal-inset": `${terminalInset}px`,
+      "--offset-terminal": `${offsetToAlignTerminalWithLine}px`
+    },
+    className: `absolute z-10 pointer-events-none bg-accentSurface before:content-[''] before:w-[--terminal-size] before:h-[--terminal-size] box-border before:absolute before:border-[length:--line-thickness] before:border-solid before:border-accentSurface before:rounded-full ${orientationStyles[orientation]} ${edgeStyles[edge]}`
+  });
+};
+
+// packages/ui/react-ui/src/components/Lists/List.tsx
 var List = /* @__PURE__ */ forwardRef17(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const density = useDensityContext(props.density);
-  return /* @__PURE__ */ React23.createElement(DensityProvider, {
+  return /* @__PURE__ */ React24.createElement(DensityProvider, {
     density
-  }, /* @__PURE__ */ React23.createElement(ListPrimitive, {
+  }, /* @__PURE__ */ React24.createElement(ListPrimitive, {
     ...props,
     className: tx("list.root", "list", {}, classNames),
     ref: forwardedRef
@@ -1648,7 +1757,7 @@ var ListItemEndcap = /* @__PURE__ */ forwardRef17(({ children, classNames, asChi
   const Root5 = asChild ? Slot8 : "div";
   const density = useDensityContext();
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React23.createElement(Root5, {
+  return /* @__PURE__ */ React24.createElement(Root5, {
     ...!asChild && {
       role: "none"
     },
@@ -1662,7 +1771,7 @@ var ListItemEndcap = /* @__PURE__ */ forwardRef17(({ children, classNames, asChi
 var MockListItemOpenTrigger = ({ classNames, ...props }) => {
   const density = useDensityContext();
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React23.createElement("div", {
+  return /* @__PURE__ */ React24.createElement("div", {
     role: "none",
     ...props,
     className: tx("list.item.openTrigger", "list__listItem__openTrigger--mock", {
@@ -1673,7 +1782,7 @@ var MockListItemOpenTrigger = ({ classNames, ...props }) => {
 var ListItemHeading = /* @__PURE__ */ forwardRef17(({ children, classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const density = useDensityContext();
-  return /* @__PURE__ */ React23.createElement(ListPrimitiveItemHeading, {
+  return /* @__PURE__ */ React24.createElement(ListPrimitiveItemHeading, {
     ...props,
     className: tx("list.item.heading", "list__listItem__heading", {
       density
@@ -1686,13 +1795,13 @@ var ListItemOpenTrigger = /* @__PURE__ */ forwardRef17(({ __listItemScope, class
   const density = useDensityContext();
   const { open } = useListItemContext(LIST_ITEM_NAME, __listItemScope);
   const Icon3 = open ? CaretDown : CaretRight;
-  return /* @__PURE__ */ React23.createElement(ListPrimitiveItemOpenTrigger, {
+  return /* @__PURE__ */ React24.createElement(ListPrimitiveItemOpenTrigger, {
     ...props,
     className: tx("list.item.openTrigger", "list__listItem__openTrigger", {
       density
     }, classNames),
     ref: forwardedRef
-  }, children || /* @__PURE__ */ React23.createElement(Icon3, {
+  }, children || /* @__PURE__ */ React24.createElement(Icon3, {
     weight: "bold",
     className: tx("list.item.openTriggerIcon", "list__listItem__openTrigger__icon", {})
   }));
@@ -1700,7 +1809,7 @@ var ListItemOpenTrigger = /* @__PURE__ */ forwardRef17(({ __listItemScope, class
 var ListItemRoot = /* @__PURE__ */ forwardRef17(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const density = useDensityContext();
-  return /* @__PURE__ */ React23.createElement(ListPrimitiveItem, {
+  return /* @__PURE__ */ React24.createElement(ListPrimitiveItem, {
     ...props,
     className: tx("list.item.root", "list__listItem", {
       density,
@@ -1715,27 +1824,75 @@ var ListItem = {
   Heading: ListItemHeading,
   OpenTrigger: ListItemOpenTrigger,
   CollapsibleContent: ListItemCollapsibleContent,
-  MockOpenTrigger: MockListItemOpenTrigger
+  MockOpenTrigger: MockListItemOpenTrigger,
+  DropIndicator: ListDropIndicator
+};
+
+// packages/ui/react-ui/src/components/Lists/Tree.tsx
+import React26, { forwardRef as forwardRef18 } from "react";
+
+// packages/ui/react-ui/src/components/Lists/TreeDropIndicator.tsx
+import React25 from "react";
+var edgeToOrientationMap2 = {
+  "reorder-above": "sibling",
+  "reorder-below": "sibling",
+  "make-child": "child",
+  reparent: "child"
+};
+var orientationStyles2 = {
+  // TODO(wittjosiah): Stop using left/right here.
+  sibling: "bs-[--line-thickness] left-[--horizontal-indent] right-0 bg-accentSurface before:left-[--negative-terminal-size]",
+  child: "is-full block-start-0 block-end-0 border-[length:--line-thickness] before:invisible"
+};
+var instructionStyles = {
+  "reorder-above": "block-start-[--line-offset] before:block-start-[--offset-terminal]",
+  "reorder-below": "block-end-[--line-offset] before:block-end-[--offset-terminal]",
+  "make-child": "border-accentSurface",
+  // TODO(wittjosiah): This is not occurring in the current implementation.
+  reparent: ""
+};
+var strokeSize2 = 2;
+var terminalSize2 = 8;
+var offsetToAlignTerminalWithLine2 = (strokeSize2 - terminalSize2) / 2;
+var TreeDropIndicator = ({ instruction, gap = 0 }) => {
+  const lineOffset = `calc(-0.5 * (${gap}px + ${strokeSize2}px))`;
+  const isBlocked = instruction.type === "instruction-blocked";
+  const desiredInstruction = isBlocked ? instruction.desired : instruction;
+  const orientation = edgeToOrientationMap2[desiredInstruction.type];
+  if (isBlocked) {
+    return null;
+  }
+  return /* @__PURE__ */ React25.createElement("div", {
+    style: {
+      "--line-thickness": `${strokeSize2}px`,
+      "--line-offset": `${lineOffset}`,
+      "--terminal-size": `${terminalSize2}px`,
+      "--terminal-radius": `${terminalSize2 / 2}px`,
+      "--negative-terminal-size": `-${terminalSize2}px`,
+      "--offset-terminal": `${offsetToAlignTerminalWithLine2}px`,
+      "--horizontal-indent": `${desiredInstruction.currentLevel * desiredInstruction.indentPerLevel + 4}px`
+    },
+    className: `absolute z-10 pointer-events-none before:is-[--terminal-size] before:bs-[--terminal-size] box-border before:absolute before:border-[length:--line-thickness] before:border-solid before:border-accentSurface before:rounded-full ${orientationStyles2[orientation]} ${instructionStyles[desiredInstruction.type]}`
+  });
 };
 
 // packages/ui/react-ui/src/components/Lists/Tree.tsx
-import React24, { forwardRef as forwardRef18 } from "react";
 var TreeRoot = /* @__PURE__ */ forwardRef18((props, forwardedRef) => {
-  return /* @__PURE__ */ React24.createElement(List, {
+  return /* @__PURE__ */ React26.createElement(List, {
     ...props,
     ref: forwardedRef
   });
 });
 var TreeBranch = /* @__PURE__ */ forwardRef18(({ __listScope, ...props }, forwardedRef) => {
   const { headingId } = useListItemContext(LIST_ITEM_NAME, __listScope);
-  return /* @__PURE__ */ React24.createElement(List, {
+  return /* @__PURE__ */ React26.createElement(List, {
     ...props,
     "aria-labelledby": headingId,
     ref: forwardedRef
   });
 });
 var TreeItemRoot = /* @__PURE__ */ forwardRef18((props, forwardedRef) => {
-  return /* @__PURE__ */ React24.createElement(ListItem.Root, {
+  return /* @__PURE__ */ React26.createElement(ListItem.Root, {
     role: "treeitem",
     ...props,
     ref: forwardedRef
@@ -1754,7 +1911,8 @@ var TreeItem = {
   Heading: TreeItemHeading,
   Body: TreeItemBody,
   OpenTrigger: TreeItemOpenTrigger,
-  MockOpenTrigger: MockTreeItemOpenTrigger
+  MockOpenTrigger: MockTreeItemOpenTrigger,
+  DropIndicator: TreeDropIndicator
 };
 
 // packages/ui/react-ui/src/components/Lists/Treegrid.tsx
@@ -1763,7 +1921,7 @@ import { createContextScope as createContextScope2 } from "@radix-ui/react-conte
 import { Primitive as Primitive8 } from "@radix-ui/react-primitive";
 import { Slot as Slot9 } from "@radix-ui/react-slot";
 import { useControllableState as useControllableState3 } from "@radix-ui/react-use-controllable-state";
-import React25, { forwardRef as forwardRef19 } from "react";
+import React27, { forwardRef as forwardRef19 } from "react";
 var TREEGRID_ROW_NAME = "TreegridRow";
 var [createTreegridRowContext, createTreegridRowScope] = createContextScope2(TREEGRID_ROW_NAME, []);
 var [TreegridRowProvider, useTreegridRowContext] = createTreegridRowContext(TREEGRID_ROW_NAME);
@@ -1777,7 +1935,7 @@ var TreegridRoot = /* @__PURE__ */ forwardRef19(({ asChild, classNames, children
     tabbable: false,
     circular: true
   });
-  return /* @__PURE__ */ React25.createElement(Root5, {
+  return /* @__PURE__ */ React27.createElement(Root5, {
     role: "treegrid",
     ...arrowNavigationAttrs,
     ...props,
@@ -1808,11 +1966,11 @@ var TreegridRow = /* @__PURE__ */ forwardRef19(({ __treegridRowScope, asChild, c
     circular: false,
     memorizeCurrent: false
   });
-  return /* @__PURE__ */ React25.createElement(TreegridRowProvider, {
+  return /* @__PURE__ */ React27.createElement(TreegridRowProvider, {
     open,
     onOpenChange,
     scope: __treegridRowScope
-  }, /* @__PURE__ */ React25.createElement(Root5, {
+  }, /* @__PURE__ */ React27.createElement(Root5, {
     role: "row",
     "aria-level": level,
     className: tx("treegrid.row", "treegrid__row", {
@@ -1827,7 +1985,7 @@ var TreegridRow = /* @__PURE__ */ forwardRef19(({ __treegridRowScope, asChild, c
     ...props,
     id,
     ref: forwardedRef
-  }, /* @__PURE__ */ React25.createElement("div", {
+  }, /* @__PURE__ */ React27.createElement("div", {
     role: "none",
     className: "contents",
     ...arrowGroupAttrs
@@ -1835,7 +1993,7 @@ var TreegridRow = /* @__PURE__ */ forwardRef19(({ __treegridRowScope, asChild, c
 });
 var TreegridCell = /* @__PURE__ */ forwardRef19(({ classNames, children, indent, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React25.createElement("div", {
+  return /* @__PURE__ */ React27.createElement("div", {
     role: "gridcell",
     className: tx("treegrid.cell", "treegrid__cell", {
       indent
@@ -1856,18 +2014,17 @@ var Treegrid = {
 
 // packages/ui/react-ui/src/components/Main/Main.tsx
 import { useFocusableGroup as useFocusableGroup2 } from "@fluentui/react-tabster";
-import { useComposedRefs } from "@radix-ui/react-compose-refs";
 import { createContext as createContext10 } from "@radix-ui/react-context";
 import { Root as DialogRoot2, DialogContent as DialogContent2 } from "@radix-ui/react-dialog";
 import { Primitive as Primitive9 } from "@radix-ui/react-primitive";
 import { Slot as Slot10 } from "@radix-ui/react-slot";
 import { useControllableState as useControllableState4 } from "@radix-ui/react-use-controllable-state";
-import React26, { forwardRef as forwardRef20, useCallback as useCallback5, useEffect as useEffect6, useRef as useRef2, useState as useState6 } from "react";
+import React28, { forwardRef as forwardRef20, useCallback as useCallback7, useEffect as useEffect5, useRef as useRef2, useState as useState8 } from "react";
 import { log } from "@dxos/log";
 import { useMediaQuery, useForwardedRef } from "@dxos/react-hooks";
 
 // packages/ui/react-ui/src/components/Main/useSwipeToDismiss.ts
-import { useCallback as useCallback4, useEffect as useEffect5, useState as useState5 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect4, useState as useState7 } from "react";
 var MotionState;
 (function(MotionState2) {
   MotionState2[MotionState2["IDLE"] = 0] = "IDLE";
@@ -1882,22 +2039,22 @@ var useSwipeToDismiss = (ref, {
   /* side = 'inline-start' */
 }) => {
   const $root = ref.current;
-  const [motionState, setMotionState] = useState5(0);
-  const [gestureStartX, setGestureStartX] = useState5(0);
-  const setIdle = useCallback4(() => {
+  const [motionState, setMotionState] = useState7(0);
+  const [gestureStartX, setGestureStartX] = useState7(0);
+  const setIdle = useCallback6(() => {
     setMotionState(0);
     $root?.style.removeProperty("inset-inline-start");
     $root?.style.setProperty("transition-duration", "200ms");
   }, [
     $root
   ]);
-  const setFollowing = useCallback4(() => {
+  const setFollowing = useCallback6(() => {
     setMotionState(2);
     $root?.style.setProperty("transition-duration", "0ms");
   }, [
     $root
   ]);
-  const handlePointerDown = useCallback4(({ screenX }) => {
+  const handlePointerDown = useCallback6(({ screenX }) => {
     if (motionState === 0) {
       setMotionState(1);
       setGestureStartX(screenX);
@@ -1905,7 +2062,7 @@ var useSwipeToDismiss = (ref, {
   }, [
     motionState
   ]);
-  const handlePointerMove = useCallback4(({ screenX }) => {
+  const handlePointerMove = useCallback6(({ screenX }) => {
     if ($root) {
       const delta = Math.min(screenX - gestureStartX, 0);
       switch (motionState) {
@@ -1929,12 +2086,12 @@ var useSwipeToDismiss = (ref, {
     motionState,
     gestureStartX
   ]);
-  const handlePointerUp = useCallback4(() => {
+  const handlePointerUp = useCallback6(() => {
     setIdle();
   }, [
     setIdle
   ]);
-  useEffect5(() => {
+  useEffect4(() => {
     $root?.addEventListener("pointerdown", handlePointerDown);
     return () => {
       $root?.removeEventListener("pointerdown", handlePointerDown);
@@ -1943,7 +2100,7 @@ var useSwipeToDismiss = (ref, {
     $root,
     handlePointerDown
   ]);
-  useEffect5(() => {
+  useEffect4(() => {
     $root && document.documentElement.addEventListener("pointermove", handlePointerMove);
     return () => {
       document.documentElement.removeEventListener("pointermove", handlePointerMove);
@@ -1952,7 +2109,7 @@ var useSwipeToDismiss = (ref, {
     $root,
     handlePointerMove
   ]);
-  useEffect5(() => {
+  useEffect4(() => {
     $root && document.documentElement.addEventListener("pointerup", handlePointerUp);
     return () => {
       document.documentElement.removeEventListener("pointerup", handlePointerUp);
@@ -1972,7 +2129,7 @@ var MAIN_NAME = "Main";
 var GENERIC_CONSUMER_NAME = "GenericConsumer";
 var landmarkAttr = "data-main-landmark";
 var useLandmarkMover = (propsOnKeyDown, landmark) => {
-  const handleKeyDown = useCallback5((event) => {
+  const handleKeyDown = useCallback7((event) => {
     const target = event.target;
     if (event.target === event.currentTarget && event.key === "Tab" && target.hasAttribute(landmarkAttr)) {
       event.preventDefault();
@@ -2001,8 +2158,8 @@ var useLandmarkMover = (propsOnKeyDown, landmark) => {
 };
 var [MainProvider, useMainContext] = createContext10(MAIN_NAME, {
   resizing: false,
-  navigationSidebarOpen: false,
-  setNavigationSidebarOpen: (nextOpen) => {
+  navigationSidebarState: "closed",
+  setNavigationSidebarState: (nextState) => {
     log.warn("Attempt to set sidebar state without initializing `MainRoot`", void 0, {
       F: __dxlog_file,
       L: 81,
@@ -2010,8 +2167,8 @@ var [MainProvider, useMainContext] = createContext10(MAIN_NAME, {
       C: (f, a) => f(...a)
     });
   },
-  complementarySidebarOpen: false,
-  setComplementarySidebarOpen: (nextOpen) => {
+  complementarySidebarState: "closed",
+  setComplementarySidebarState: (nextState) => {
     log.warn("Attempt to set sidebar state without initializing `MainRoot`", void 0, {
       F: __dxlog_file,
       L: 86,
@@ -2021,52 +2178,46 @@ var [MainProvider, useMainContext] = createContext10(MAIN_NAME, {
   }
 });
 var useSidebars = (consumerName = GENERIC_CONSUMER_NAME) => {
-  const { setNavigationSidebarOpen, navigationSidebarOpen, setComplementarySidebarOpen, complementarySidebarOpen } = useMainContext(consumerName);
+  const { setNavigationSidebarState, navigationSidebarState, setComplementarySidebarState, complementarySidebarState } = useMainContext(consumerName);
   return {
-    navigationSidebarOpen,
-    setNavigationSidebarOpen,
-    toggleNavigationSidebar: useCallback5(() => setNavigationSidebarOpen(!navigationSidebarOpen), [
-      navigationSidebarOpen,
-      setNavigationSidebarOpen
-    ]),
-    openNavigationSidebar: useCallback5(() => setNavigationSidebarOpen(true), [
-      setNavigationSidebarOpen
-    ]),
-    closeNavigationSidebar: useCallback5(() => setNavigationSidebarOpen(false), [
-      setNavigationSidebarOpen
+    navigationSidebarState,
+    setNavigationSidebarState,
+    toggleNavigationSidebar: useCallback7(() => setNavigationSidebarState(navigationSidebarState === "expanded" ? "closed" : "expanded"), [
+      navigationSidebarState,
+      setNavigationSidebarState
     ]),
-    complementarySidebarOpen,
-    setComplementarySidebarOpen,
-    toggleComplementarySidebar: useCallback5(() => setComplementarySidebarOpen(!complementarySidebarOpen), [
-      complementarySidebarOpen,
-      setComplementarySidebarOpen
+    openNavigationSidebar: useCallback7(() => setNavigationSidebarState("expanded"), []),
+    collapseNavigationSidebar: useCallback7(() => setNavigationSidebarState("collapsed"), []),
+    closeNavigationSidebar: useCallback7(() => setNavigationSidebarState("closed"), []),
+    complementarySidebarState,
+    setComplementarySidebarState,
+    toggleComplementarySidebar: useCallback7(() => setComplementarySidebarState(complementarySidebarState === "expanded" ? "closed" : "expanded"), [
+      complementarySidebarState,
+      setComplementarySidebarState
     ]),
-    openComplementarySidebar: useCallback5(() => setComplementarySidebarOpen(true), [
-      setComplementarySidebarOpen
-    ]),
-    closeComplementarySidebar: useCallback5(() => setComplementarySidebarOpen(false), [
-      setComplementarySidebarOpen
-    ])
+    openComplementarySidebar: useCallback7(() => setComplementarySidebarState("expanded"), []),
+    collapseComplementarySidebar: useCallback7(() => setComplementarySidebarState("collapsed"), []),
+    closeComplementarySidebar: useCallback7(() => setComplementarySidebarState("closed"), [])
   };
 };
 var resizeDebounce = 3e3;
-var MainRoot = ({ navigationSidebarOpen: propsNavigationSidebarOpen, defaultNavigationSidebarOpen, onNavigationSidebarOpenChange, complementarySidebarOpen: propsComplementarySidebarOpen, defaultComplementarySidebarOpen, onComplementarySidebarOpenChange, children, ...props }) => {
+var MainRoot = ({ navigationSidebarState: propsNavigationSidebarState, defaultNavigationSidebarState, onNavigationSidebarStateChange, complementarySidebarState: propsComplementarySidebarState, defaultComplementarySidebarState, onComplementarySidebarStateChange, children, ...props }) => {
   const [isLg] = useMediaQuery("lg", {
     ssr: false
   });
-  const [navigationSidebarOpen = isLg, setNavigationSidebarOpen] = useControllableState4({
-    prop: propsNavigationSidebarOpen,
-    defaultProp: defaultNavigationSidebarOpen,
-    onChange: onNavigationSidebarOpenChange
+  const [navigationSidebarState = isLg ? "expanded" : "collapsed", setNavigationSidebarState] = useControllableState4({
+    prop: propsNavigationSidebarState,
+    defaultProp: defaultNavigationSidebarState,
+    onChange: onNavigationSidebarStateChange
   });
-  const [complementarySidebarOpen = false, setComplementarySidebarOpen] = useControllableState4({
-    prop: propsComplementarySidebarOpen,
-    defaultProp: defaultComplementarySidebarOpen,
-    onChange: onComplementarySidebarOpenChange
+  const [complementarySidebarState = isLg ? "expanded" : "collapsed", setComplementarySidebarState] = useControllableState4({
+    prop: propsComplementarySidebarState,
+    defaultProp: defaultComplementarySidebarState,
+    onChange: onComplementarySidebarStateChange
   });
-  const [resizing, setResizing] = useState6(false);
+  const [resizing, setResizing] = useState8(false);
   const resizeInterval = useRef2(null);
-  const handleResize = useCallback5(() => {
+  const handleResize = useCallback7(() => {
     setResizing(true);
     if (resizeInterval.current) {
       clearTimeout(resizeInterval.current);
@@ -2076,18 +2227,18 @@ var MainRoot = ({ navigationSidebarOpen: propsNavigationSidebarOpen, defaultNavi
       resizeInterval.current = null;
     }, resizeDebounce);
   }, []);
-  useEffect6(() => {
+  useEffect5(() => {
     window.addEventListener("resize", handleResize);
     return () => window.removeEventListener("resize", handleResize);
   }, [
     handleResize
   ]);
-  return /* @__PURE__ */ React26.createElement(MainProvider, {
+  return /* @__PURE__ */ React28.createElement(MainProvider, {
     ...props,
-    navigationSidebarOpen,
-    setNavigationSidebarOpen,
-    complementarySidebarOpen,
-    setComplementarySidebarOpen,
+    navigationSidebarState,
+    setNavigationSidebarState,
+    complementarySidebarState,
+    setComplementarySidebarState,
     resizing
   }, children);
 };
@@ -2095,7 +2246,7 @@ MainRoot.displayName = MAIN_ROOT_NAME;
 var handleOpenAutoFocus = (event) => {
   !document.body.hasAttribute("data-is-keyboard") && event.preventDefault();
 };
-var MainSidebar = /* @__PURE__ */ forwardRef20(({ classNames, children, swipeToDismiss, onOpenAutoFocus, open, resizing, setOpen, side, ...props }, forwardedRef) => {
+var MainSidebar = /* @__PURE__ */ forwardRef20(({ classNames, children, swipeToDismiss, onOpenAutoFocus, state, resizing, onStateChange, side, ...props }, forwardedRef) => {
   const [isLg] = useMediaQuery("lg", {
     ssr: false
   });
@@ -2103,9 +2254,9 @@ var MainSidebar = /* @__PURE__ */ forwardRef20(({ classNames, children, swipeToD
   const ref = useForwardedRef(forwardedRef);
   const noopRef = useRef2(null);
   useSwipeToDismiss(swipeToDismiss ? ref : noopRef, {
-    onDismiss: () => setOpen(false)
+    onDismiss: () => onStateChange?.("closed")
   });
-  const handleKeyDown = useCallback5((event) => {
+  const handleKeyDown = useCallback7((event) => {
     if (event.key === "Escape") {
       event.target.closest("[data-tabster]")?.focus();
     }
@@ -2114,10 +2265,10 @@ var MainSidebar = /* @__PURE__ */ forwardRef20(({ classNames, children, swipeToD
     props.onKeyDown
   ]);
   const Root5 = isLg ? Primitive9.div : DialogContent2;
-  return /* @__PURE__ */ React26.createElement(DialogRoot2, {
-    open,
+  return /* @__PURE__ */ React28.createElement(DialogRoot2, {
+    open: state !== "closed",
     modal: false
-  }, /* @__PURE__ */ React26.createElement(Root5, {
+  }, /* @__PURE__ */ React28.createElement(Root5, {
     ...!isLg && {
       forceMount: true,
       tabIndex: -1,
@@ -2125,26 +2276,24 @@ var MainSidebar = /* @__PURE__ */ forwardRef20(({ classNames, children, swipeToD
     },
     ...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 && {
+    ...state === "closed" && {
       inert: "true"
     },
     ref
-  }, /* @__PURE__ */ React26.createElement(ElevationProvider, {
-    elevation: "group"
-  }, children)));
+  }, children));
 });
 var MainNavigationSidebar = /* @__PURE__ */ forwardRef20((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 /* @__PURE__ */ React26.createElement(MainSidebar, {
+  return /* @__PURE__ */ React28.createElement(MainSidebar, {
     ...mover,
     ...props,
-    open: navigationSidebarOpen,
-    setOpen: setNavigationSidebarOpen,
+    state: navigationSidebarState,
+    onStateChange: setNavigationSidebarState,
     resizing,
     side: "inline-start",
     ref: forwardedRef
@@ -2152,13 +2301,13 @@ var MainNavigationSidebar = /* @__PURE__ */ forwardRef20((props, forwardedRef) =
 });
 MainNavigationSidebar.displayName = NAVIGATION_SIDEBAR_NAME;
 var MainComplementarySidebar = /* @__PURE__ */ forwardRef20((props, forwardedRef) => {
-  const { complementarySidebarOpen, setComplementarySidebarOpen, resizing } = useMainContext(COMPLEMENTARY_SIDEBAR_NAME);
+  const { complementarySidebarState, setComplementarySidebarState, resizing } = useMainContext(COMPLEMENTARY_SIDEBAR_NAME);
   const mover = useLandmarkMover(props.onKeyDown, "2");
-  return /* @__PURE__ */ React26.createElement(MainSidebar, {
+  return /* @__PURE__ */ React28.createElement(MainSidebar, {
     ...mover,
     ...props,
-    open: complementarySidebarOpen,
-    setOpen: setComplementarySidebarOpen,
+    state: complementarySidebarState,
+    onStateChange: setComplementarySidebarState,
     resizing,
     side: "inline-end",
     ref: forwardedRef
@@ -2166,18 +2315,18 @@ var MainComplementarySidebar = /* @__PURE__ */ forwardRef20((props, forwardedRef
 });
 MainNavigationSidebar.displayName = NAVIGATION_SIDEBAR_NAME;
 var MainContent = /* @__PURE__ */ forwardRef20(({ asChild, classNames, bounce, handlesFocus, children, role, ...props }, forwardedRef) => {
-  const { navigationSidebarOpen, complementarySidebarOpen } = useMainContext(MAIN_NAME);
+  const { navigationSidebarState, complementarySidebarState } = useMainContext(MAIN_NAME);
   const { tx } = useThemeContext();
   const Root5 = asChild ? Slot10 : role ? "div" : "main";
   const mover = useLandmarkMover(props.onKeyDown, "1");
-  return /* @__PURE__ */ React26.createElement(Root5, {
+  return /* @__PURE__ */ React28.createElement(Root5, {
     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
@@ -2190,62 +2339,37 @@ var MainOverlay = /* @__PURE__ */ forwardRef20(({ classNames, ...props }, forwar
   const [isLg] = useMediaQuery("lg", {
     ssr: false
   });
-  const { navigationSidebarOpen, setNavigationSidebarOpen, complementarySidebarOpen, setComplementarySidebarOpen } = useMainContext(MAIN_NAME);
+  const { navigationSidebarState, setNavigationSidebarState, complementarySidebarState, setComplementarySidebarState } = useMainContext(MAIN_NAME);
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React26.createElement("div", {
+  return /* @__PURE__ */ React28.createElement("div", {
     onClick: () => {
-      setNavigationSidebarOpen(false);
-      setComplementarySidebarOpen(false);
+      setNavigationSidebarState("collapsed");
+      setComplementarySidebarState("collapsed");
     },
     ...props,
     className: tx("main.overlay", "main__overlay", {
       isLg,
-      inlineStartSidebarOpen: navigationSidebarOpen,
-      inlineEndSidebarOpen: complementarySidebarOpen
+      inlineStartSidebarOpen: navigationSidebarState,
+      inlineEndSidebarOpen: complementarySidebarState
     }, classNames),
-    "data-state": navigationSidebarOpen || complementarySidebarOpen ? "open" : "closed",
+    "data-state": navigationSidebarState === "expanded" || complementarySidebarState === "expanded" ? "open" : "closed",
     "aria-hidden": "true",
     ref: forwardedRef
   });
 });
-var MainNotch = /* @__PURE__ */ forwardRef20(({ classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
-  const { navigationSidebarOpen } = useMainContext(MAIN_NAME);
-  const notchElement = useRef2(null);
-  const ref = useComposedRefs(forwardedRef, notchElement);
-  const handleKeyDown = useCallback5((event) => {
-    switch (event.key) {
-      case "Escape":
-        props?.onKeyDown?.(event);
-        notchElement.current?.focus();
-    }
-  }, [
-    props?.onKeyDown
-  ]);
-  const mover = useLandmarkMover(handleKeyDown, "3");
-  return /* @__PURE__ */ React26.createElement("div", {
-    role: "toolbar",
-    ...mover,
-    ...props,
-    "data-nav-sidebar-state": navigationSidebarOpen ? "open" : "closed",
-    className: tx("main.notch", "main__notch", {}, classNames),
-    ref
-  });
-});
 var Main = {
   Root: MainRoot,
   Content: MainContent,
   Overlay: MainOverlay,
   NavigationSidebar: MainNavigationSidebar,
-  ComplementarySidebar: MainComplementarySidebar,
-  Notch: MainNotch
+  ComplementarySidebar: MainComplementarySidebar
 };
 
 // packages/ui/react-ui/src/components/Message/Message.tsx
 import { createContext as createContext11 } from "@radix-ui/react-context";
 import { Primitive as Primitive10 } from "@radix-ui/react-primitive";
 import { Slot as Slot11 } from "@radix-ui/react-slot";
-import React27, { forwardRef as forwardRef21 } from "react";
+import React29, { forwardRef as forwardRef21 } from "react";
 import { useId as useId4 } from "@dxos/react-hooks";
 var MESSAGE_NAME = "Message";
 var [MessageProvider, useMessageContext] = createContext11(MESSAGE_NAME);
@@ -2255,10 +2379,10 @@ var MessageRoot = /* @__PURE__ */ forwardRef21(({ asChild, valence, elevation: p
   const descriptionId = useId4("message__description", propsDescriptionId);
   const elevation = useElevationContext(propsElevation);
   const Root5 = asChild ? Slot11 : Primitive10.div;
-  return /* @__PURE__ */ React27.createElement(MessageProvider, {
+  return /* @__PURE__ */ React29.createElement(MessageProvider, {
     titleId,
     descriptionId
-  }, /* @__PURE__ */ React27.createElement(Root5, {
+  }, /* @__PURE__ */ React29.createElement(Root5, {
     ...props,
     className: tx("message.root", "message", {
       valence,
@@ -2275,7 +2399,7 @@ var MessageTitle = /* @__PURE__ */ forwardRef21(({ asChild, className, children,
   const { tx } = useThemeContext();
   const { titleId } = useMessageContext(MESSAGE_TITLE_NAME);
   const Root5 = asChild ? Slot11 : Primitive10.h2;
-  return /* @__PURE__ */ React27.createElement(Root5, {
+  return /* @__PURE__ */ React29.createElement(Root5, {
     ...props,
     className: tx("message.title", "message__title", {}, className),
     id: titleId,
@@ -2288,7 +2412,7 @@ var MessageBody = /* @__PURE__ */ forwardRef21(({ asChild, className, children,
   const { tx } = useThemeContext();
   const { descriptionId } = useMessageContext(MESSAGE_BODY_NAME);
   const Root5 = asChild ? Slot11 : Primitive10.p;
-  return /* @__PURE__ */ React27.createElement(Root5, {
+  return /* @__PURE__ */ React29.createElement(Root5, {
     ...props,
     className: tx("message.body", "message__body", {}, className),
     id: descriptionId,
@@ -2304,7 +2428,7 @@ var Message = {
 
 // packages/ui/react-ui/src/components/Popover/Popover.tsx
 import { composeEventHandlers as composeEventHandlers2 } from "@radix-ui/primitive";
-import { useComposedRefs as useComposedRefs2 } from "@radix-ui/react-compose-refs";
+import { useComposedRefs } from "@radix-ui/react-compose-refs";
 import { createContextScope as createContextScope3 } from "@radix-ui/react-context";
 import { DismissableLayer } from "@radix-ui/react-dismissable-layer";
 import { useFocusGuards } from "@radix-ui/react-focus-guards";
@@ -2318,7 +2442,7 @@ import { Primitive as Primitive11 } from "@radix-ui/react-primitive";
 import { Slot as Slot12 } from "@radix-ui/react-slot";
 import { useControllableState as useControllableState5 } from "@radix-ui/react-use-controllable-state";
 import { hideOthers } from "aria-hidden";
-import React28, { forwardRef as forwardRef22, useRef as useRef3, useCallback as useCallback6, useState as useState7, useEffect as useEffect7 } from "react";
+import React30, { forwardRef as forwardRef22, useRef as useRef3, useCallback as useCallback8, useState as useState9, useEffect as useEffect6 } from "react";
 import { RemoveScroll } from "react-remove-scroll";
 var POPOVER_NAME = "Popover";
 var [createPopoverContext, createPopoverScope] = createContextScope3(POPOVER_NAME, [
@@ -2330,24 +2454,24 @@ var PopoverRoot = (props) => {
   const { __scopePopover, children, open: openProp, defaultOpen, onOpenChange, modal = false } = props;
   const popperScope = usePopperScope(__scopePopover);
   const triggerRef = useRef3(null);
-  const [hasCustomAnchor, setHasCustomAnchor] = useState7(false);
+  const [hasCustomAnchor, setHasCustomAnchor] = useState9(false);
   const [open = false, setOpen] = useControllableState5({
     prop: openProp,
     defaultProp: defaultOpen,
     onChange: onOpenChange
   });
-  return /* @__PURE__ */ React28.createElement(PopperPrimitive.Root, popperScope, /* @__PURE__ */ React28.createElement(PopoverProvider, {
+  return /* @__PURE__ */ React30.createElement(PopperPrimitive.Root, popperScope, /* @__PURE__ */ React30.createElement(PopoverProvider, {
     scope: __scopePopover,
     contentId: useId5(),
     triggerRef,
     open,
     onOpenChange: setOpen,
-    onOpenToggle: useCallback6(() => setOpen((prevOpen) => !prevOpen), [
+    onOpenToggle: useCallback8(() => setOpen((prevOpen) => !prevOpen), [
       setOpen
     ]),
     hasCustomAnchor,
-    onCustomAnchorAdd: useCallback6(() => setHasCustomAnchor(true), []),
-    onCustomAnchorRemove: useCallback6(() => setHasCustomAnchor(false), []),
+    onCustomAnchorAdd: useCallback8(() => setHasCustomAnchor(true), []),
+    onCustomAnchorRemove: useCallback8(() => setHasCustomAnchor(false), []),
     modal
   }, children));
 };
@@ -2358,14 +2482,14 @@ var PopoverAnchor = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
   const context = usePopoverContext(ANCHOR_NAME, __scopePopover);
   const popperScope = usePopperScope(__scopePopover);
   const { onCustomAnchorAdd, onCustomAnchorRemove } = context;
-  useEffect7(() => {
+  useEffect6(() => {
     onCustomAnchorAdd();
     return () => onCustomAnchorRemove();
   }, [
     onCustomAnchorAdd,
     onCustomAnchorRemove
   ]);
-  return /* @__PURE__ */ React28.createElement(PopperPrimitive.Anchor, {
+  return /* @__PURE__ */ React30.createElement(PopperPrimitive.Anchor, {
     ...popperScope,
     ...anchorProps,
     ref: forwardedRef
@@ -2377,8 +2501,8 @@ var PopoverTrigger = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
   const { __scopePopover, ...triggerProps } = props;
   const context = usePopoverContext(TRIGGER_NAME2, __scopePopover);
   const popperScope = usePopperScope(__scopePopover);
-  const composedTriggerRef = useComposedRefs2(forwardedRef, context.triggerRef);
-  const trigger = /* @__PURE__ */ React28.createElement(Primitive11.button, {
+  const composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef);
+  const trigger = /* @__PURE__ */ React30.createElement(Primitive11.button, {
     type: "button",
     "aria-haspopup": "dialog",
     "aria-expanded": context.open,
@@ -2388,7 +2512,7 @@ var PopoverTrigger = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
     ref: composedTriggerRef,
     onClick: composeEventHandlers2(props.onClick, context.onOpenToggle)
   });
-  return context.hasCustomAnchor ? trigger : /* @__PURE__ */ React28.createElement(PopperPrimitive.Anchor, {
+  return context.hasCustomAnchor ? trigger : /* @__PURE__ */ React30.createElement(PopperPrimitive.Anchor, {
     asChild: true,
     ...popperScope
   }, trigger);
@@ -2399,12 +2523,12 @@ var PopoverVirtualTrigger = (props) => {
   const { __scopePopover, virtualRef } = props;
   const context = usePopoverContext(VIRTUAL_TRIGGER_NAME2, __scopePopover);
   const popperScope = usePopperScope(__scopePopover);
-  useEffect7(() => {
+  useEffect6(() => {
     if (virtualRef.current) {
       context.triggerRef.current = virtualRef.current;
     }
   });
-  return /* @__PURE__ */ React28.createElement(PopperPrimitive.Anchor, {
+  return /* @__PURE__ */ React30.createElement(PopperPrimitive.Anchor, {
     ...popperScope,
     virtualRef
   });
@@ -2417,12 +2541,12 @@ var [PortalProvider, usePortalContext] = createPopoverContext(PORTAL_NAME2, {
 var PopoverPortal = (props) => {
   const { __scopePopover, forceMount, children, container } = props;
   const context = usePopoverContext(PORTAL_NAME2, __scopePopover);
-  return /* @__PURE__ */ React28.createElement(PortalProvider, {
+  return /* @__PURE__ */ React30.createElement(PortalProvider, {
     scope: __scopePopover,
     forceMount
-  }, /* @__PURE__ */ React28.createElement(Presence, {
+  }, /* @__PURE__ */ React30.createElement(Presence, {
     present: forceMount || context.open
-  }, /* @__PURE__ */ React28.createElement(PortalPrimitive, {
+  }, /* @__PURE__ */ React30.createElement(PortalPrimitive, {
     asChild: true,
     container
   }, children)));
@@ -2433,12 +2557,12 @@ var PopoverContent = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
   const portalContext = usePortalContext(CONTENT_NAME2, props.__scopePopover);
   const { forceMount = portalContext.forceMount, ...contentProps } = props;
   const context = usePopoverContext(CONTENT_NAME2, props.__scopePopover);
-  return /* @__PURE__ */ React28.createElement(Presence, {
+  return /* @__PURE__ */ React30.createElement(Presence, {
     present: forceMount || context.open
-  }, context.modal ? /* @__PURE__ */ React28.createElement(PopoverContentModal, {
+  }, context.modal ? /* @__PURE__ */ React30.createElement(PopoverContentModal, {
     ...contentProps,
     ref: forwardedRef
-  }) : /* @__PURE__ */ React28.createElement(PopoverContentNonModal, {
+  }) : /* @__PURE__ */ React30.createElement(PopoverContentNonModal, {
     ...contentProps,
     ref: forwardedRef
   }));
@@ -2447,18 +2571,18 @@ PopoverContent.displayName = CONTENT_NAME2;
 var PopoverContentModal = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
   const context = usePopoverContext(CONTENT_NAME2, props.__scopePopover);
   const contentRef = useRef3(null);
-  const composedRefs = useComposedRefs2(forwardedRef, contentRef);
+  const composedRefs = useComposedRefs(forwardedRef, contentRef);
   const isRightClickOutsideRef = useRef3(false);
-  useEffect7(() => {
+  useEffect6(() => {
     const content = contentRef.current;
     if (content) {
       return hideOthers(content);
     }
   }, []);
-  return /* @__PURE__ */ React28.createElement(RemoveScroll, {
+  return /* @__PURE__ */ React30.createElement(RemoveScroll, {
     as: Slot12,
     allowPinchZoom: true
-  }, /* @__PURE__ */ React28.createElement(PopoverContentImpl, {
+  }, /* @__PURE__ */ React30.createElement(PopoverContentImpl, {
     ...props,
     ref: composedRefs,
     // we make sure we're not trapping once it's been closed
@@ -2490,7 +2614,7 @@ var PopoverContentNonModal = /* @__PURE__ */ forwardRef22((props, forwardedRef)
   const context = usePopoverContext(CONTENT_NAME2, props.__scopePopover);
   const hasInteractedOutsideRef = useRef3(false);
   const hasPointerDownOutsideRef = useRef3(false);
-  return /* @__PURE__ */ React28.createElement(PopoverContentImpl, {
+  return /* @__PURE__ */ React30.createElement(PopoverContentImpl, {
     ...props,
     ref: forwardedRef,
     trapFocus: false,
@@ -2526,18 +2650,20 @@ var PopoverContentNonModal = /* @__PURE__ */ forwardRef22((props, forwardedRef)
   });
 });
 var PopoverContentImpl = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
-  const { __scopePopover, trapFocus, onOpenAutoFocus, onCloseAutoFocus, disableOutsidePointerEvents, onEscapeKeyDown, onPointerDownOutside, onFocusOutside, onInteractOutside, classNames, ...contentProps } = props;
+  const { __scopePopover, trapFocus, onOpenAutoFocus, onCloseAutoFocus, disableOutsidePointerEvents, onEscapeKeyDown, onPointerDownOutside, onFocusOutside, onInteractOutside, collisionPadding = 8, classNames, ...contentProps } = props;
   const context = usePopoverContext(CONTENT_NAME2, __scopePopover);
   const popperScope = usePopperScope(__scopePopover);
   const { tx } = useThemeContext();
+  const elevation = useElevationContext();
+  const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
   useFocusGuards();
-  return /* @__PURE__ */ React28.createElement(FocusScope, {
+  return /* @__PURE__ */ React30.createElement(FocusScope, {
     asChild: true,
     loop: true,
     trapped: trapFocus,
     onMountAutoFocus: onOpenAutoFocus,
     onUnmountAutoFocus: onCloseAutoFocus
-  }, /* @__PURE__ */ React28.createElement(DismissableLayer, {
+  }, /* @__PURE__ */ React30.createElement(DismissableLayer, {
     asChild: true,
     disableOutsidePointerEvents,
     onInteractOutside,
@@ -2545,13 +2671,16 @@ var PopoverContentImpl = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
     onPointerDownOutside,
     onFocusOutside,
     onDismiss: () => context.onOpenChange(false)
-  }, /* @__PURE__ */ React28.createElement(PopperPrimitive.Content, {
+  }, /* @__PURE__ */ React30.createElement(PopperPrimitive.Content, {
     "data-state": getState(context.open),
     role: "dialog",
     id: context.contentId,
     ...popperScope,
     ...contentProps,
-    className: tx("popover.content", "popover", {}, classNames),
+    collisionPadding: safeCollisionPadding,
+    className: tx("popover.content", "popover", {
+      elevation
+    }, classNames),
     ref: forwardedRef,
     style: {
       ...contentProps.style,
@@ -2570,7 +2699,7 @@ var CLOSE_NAME = "PopoverClose";
 var PopoverClose = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
   const { __scopePopover, ...closeProps } = props;
   const context = usePopoverContext(CLOSE_NAME, __scopePopover);
-  return /* @__PURE__ */ React28.createElement(Primitive11.button, {
+  return /* @__PURE__ */ React30.createElement(Primitive11.button, {
     type: "button",
     ...closeProps,
     ref: forwardedRef,
@@ -2583,7 +2712,7 @@ var PopoverArrow = /* @__PURE__ */ forwardRef22((props, forwardedRef) => {
   const { __scopePopover, classNames, ...arrowProps } = props;
   const popperScope = usePopperScope(__scopePopover);
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React28.createElement(PopperPrimitive.Arrow, {
+  return /* @__PURE__ */ React30.createElement(PopperPrimitive.Arrow, {
     ...popperScope,
     ...arrowProps,
     className: tx("popover.arrow", "popover__arrow", {}, classNames),
@@ -2594,7 +2723,7 @@ PopoverArrow.displayName = ARROW_NAME2;
 var PopoverViewport = /* @__PURE__ */ forwardRef22(({ classNames, asChild, constrainInline = true, constrainBlock = true, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const Root5 = asChild ? Slot12 : Primitive11.div;
-  return /* @__PURE__ */ React28.createElement(Root5, {
+  return /* @__PURE__ */ React30.createElement(Root5, {
     ...props,
     className: tx("popover.viewport", "popover__viewport", {
       constrainInline,
@@ -2617,10 +2746,10 @@ var Popover = {
 };
 
 // packages/ui/react-ui/src/components/Status/Status.tsx
-import React29, { forwardRef as forwardRef23 } from "react";
+import React31, { forwardRef as forwardRef23 } from "react";
 var Status = /* @__PURE__ */ forwardRef23(({ classNames, children, progress = 0, indeterminate, variant, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React29.createElement("span", {
+  return /* @__PURE__ */ React31.createElement("span", {
     role: "status",
     ...props,
     className: tx("status.root", "status", {
@@ -2628,7 +2757,7 @@ var Status = /* @__PURE__ */ forwardRef23(({ classNames, children, progress = 0,
       variant
     }, classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React29.createElement("span", {
+  }, /* @__PURE__ */ React31.createElement("span", {
     role: "none",
     className: tx("status.bar", "status__bar", {
       indeterminate,
@@ -2644,10 +2773,10 @@ var Status = /* @__PURE__ */ forwardRef23(({ classNames, children, progress = 0,
 
 // packages/ui/react-ui/src/components/ScrollArea/ScrollArea.tsx
 import { Root as ScrollAreaPrimitiveRoot, Viewport as ScrollAreaPrimitiveViewport, Scrollbar as ScrollAreaPrimitiveScrollbar, Thumb as ScrollAreaPrimitiveThumb, Corner as ScrollAreaPrimitiveCorner } from "@radix-ui/react-scroll-area";
-import React30, { forwardRef as forwardRef24 } from "react";
+import React32, { forwardRef as forwardRef24 } from "react";
 var ScrollAreaRoot = /* @__PURE__ */ forwardRef24(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React30.createElement(ScrollAreaPrimitiveRoot, {
+  return /* @__PURE__ */ React32.createElement(ScrollAreaPrimitiveRoot, {
     ...props,
     className: tx("scrollArea.root", "scroll-area", {}, classNames),
     ref: forwardedRef
@@ -2655,7 +2784,7 @@ var ScrollAreaRoot = /* @__PURE__ */ forwardRef24(({ classNames, ...props }, for
 });
 var ScrollAreaViewport = /* @__PURE__ */ forwardRef24(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React30.createElement(ScrollAreaPrimitiveViewport, {
+  return /* @__PURE__ */ React32.createElement(ScrollAreaPrimitiveViewport, {
     ...props,
     className: tx("scrollArea.viewport", "scroll-area", {}, classNames),
     ref: forwardedRef
@@ -2663,7 +2792,7 @@ var ScrollAreaViewport = /* @__PURE__ */ forwardRef24(({ classNames, ...props },
 });
 var ScrollAreaScrollbar = /* @__PURE__ */ forwardRef24(({ classNames, variant = "fine", ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React30.createElement(ScrollAreaPrimitiveScrollbar, {
+  return /* @__PURE__ */ React32.createElement(ScrollAreaPrimitiveScrollbar, {
     "data-variant": variant,
     ...props,
     className: tx("scrollArea.scrollbar", "scroll-area__scrollbar", {}, classNames),
@@ -2672,7 +2801,7 @@ var ScrollAreaScrollbar = /* @__PURE__ */ forwardRef24(({ classNames, variant =
 });
 var ScrollAreaThumb = /* @__PURE__ */ forwardRef24(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React30.createElement(ScrollAreaPrimitiveThumb, {
+  return /* @__PURE__ */ React32.createElement(ScrollAreaPrimitiveThumb, {
     ...props,
     className: tx("scrollArea.thumb", "scroll-area__thumb", {}, classNames),
     ref: forwardedRef
@@ -2680,7 +2809,7 @@ var ScrollAreaThumb = /* @__PURE__ */ forwardRef24(({ classNames, ...props }, fo
 });
 var ScrollAreaCorner = /* @__PURE__ */ forwardRef24(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React30.createElement(ScrollAreaPrimitiveCorner, {
+  return /* @__PURE__ */ React32.createElement(ScrollAreaPrimitiveCorner, {
     ...props,
     className: tx("scrollArea.corner", "scroll-area__corner", {}, classNames),
     ref: forwardedRef
@@ -2697,7 +2826,7 @@ var ScrollArea = {
 // packages/ui/react-ui/src/components/Select/Select.tsx
 import { CaretDown as CaretDown2, CaretUp } from "@phosphor-icons/react";
 import * as SelectPrimitive from "@radix-ui/react-select";
-import React31, { forwardRef as forwardRef25 } from "react";
+import React33, { forwardRef as forwardRef25 } from "react";
 var SelectRoot = SelectPrimitive.Root;
 var SelectTrigger = SelectPrimitive.Trigger;
 var SelectValue = SelectPrimitive.Value;
@@ -2705,52 +2834,57 @@ var SelectIcon = SelectPrimitive.Icon;
 var SelectPortal = SelectPrimitive.Portal;
 var SelectTriggerButton = /* @__PURE__ */ forwardRef25(({ children, placeholder, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.Trigger, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.Trigger, {
     asChild: true,
     ref: forwardedRef
-  }, /* @__PURE__ */ React31.createElement(Button, props, /* @__PURE__ */ React31.createElement(SelectPrimitive.Value, {
+  }, /* @__PURE__ */ React33.createElement(Button, props, /* @__PURE__ */ React33.createElement(SelectPrimitive.Value, {
     placeholder
-  }, children), /* @__PURE__ */ React31.createElement("span", {
+  }, children), /* @__PURE__ */ React33.createElement("span", {
     className: "w-1 flex-1"
-  }), /* @__PURE__ */ React31.createElement(SelectPrimitive.Icon, {
+  }), /* @__PURE__ */ React33.createElement(SelectPrimitive.Icon, {
     asChild: true
-  }, /* @__PURE__ */ React31.createElement(CaretDown2, {
+  }, /* @__PURE__ */ React33.createElement(CaretDown2, {
     className: tx("select.triggerIcon", "select__trigger__icon", {}),
     weight: "bold"
   }))));
 });
-var SelectContent = /* @__PURE__ */ forwardRef25(({ classNames, children, ...props }, forwardedRef) => {
+var SelectContent = /* @__PURE__ */ forwardRef25(({ classNames, children, collisionPadding = 8, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.Content, {
+  const elevation = useElevationContext();
+  const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.Content, {
     ...props,
-    className: tx("select.content", "select__content", {}, classNames),
+    collisionPadding: safeCollisionPadding,
+    className: tx("select.content", "select__content", {
+      elevation
+    }, classNames),
     position: "popper",
     ref: forwardedRef
   }, children);
 });
 var SelectScrollUpButton2 = /* @__PURE__ */ forwardRef25(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.SelectScrollUpButton, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.SelectScrollUpButton, {
     ...props,
     className: tx("select.scrollButton", "select__scroll-button--up", {}, classNames),
     ref: forwardedRef
-  }, children ?? /* @__PURE__ */ React31.createElement(CaretUp, {
+  }, children ?? /* @__PURE__ */ React33.createElement(CaretUp, {
     weight: "bold"
   }));
 });
 var SelectScrollDownButton2 = /* @__PURE__ */ forwardRef25(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.SelectScrollDownButton, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.SelectScrollDownButton, {
     ...props,
     className: tx("select.scrollButton", "select__scroll-button--down", {}, classNames),
     ref: forwardedRef
-  }, children ?? /* @__PURE__ */ React31.createElement(CaretDown2, {
+  }, children ?? /* @__PURE__ */ React33.createElement(CaretDown2, {
     weight: "bold"
   }));
 });
 var SelectViewport2 = /* @__PURE__ */ forwardRef25(({ classNames, asChild, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.SelectViewport, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.SelectViewport, {
     ...props,
     className: tx("select.viewport", "select__viewport", {}, classNames),
     ref: forwardedRef
@@ -2758,7 +2892,7 @@ var SelectViewport2 = /* @__PURE__ */ forwardRef25(({ classNames, asChild, child
 });
 var SelectItem = /* @__PURE__ */ forwardRef25(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.Item, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.Item, {
     ...props,
     className: tx("select.item", "option", {}, classNames),
     ref: forwardedRef
@@ -2767,7 +2901,7 @@ var SelectItem = /* @__PURE__ */ forwardRef25(({ classNames, ...props }, forward
 var SelectItemText = SelectPrimitive.ItemText;
 var SelectItemIndicator = /* @__PURE__ */ forwardRef25(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.ItemIndicator, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.ItemIndicator, {
     ...props,
     className: tx("select.itemIndicator", "option__indicator", {}, classNames),
     ref: forwardedRef
@@ -2775,13 +2909,13 @@ var SelectItemIndicator = /* @__PURE__ */ forwardRef25(({ classNames, children,
 });
 var SelectOption = /* @__PURE__ */ forwardRef25(({ children, classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.Item, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.Item, {
     ...props,
     className: tx("select.item", "option", {}, classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React31.createElement(SelectPrimitive.ItemText, null, children), /* @__PURE__ */ React31.createElement("span", {
+  }, /* @__PURE__ */ React33.createElement(SelectPrimitive.ItemText, null, children), /* @__PURE__ */ React33.createElement("span", {
     className: "grow w-1"
-  }), /* @__PURE__ */ React31.createElement(Icon, {
+  }), /* @__PURE__ */ React33.createElement(Icon, {
     icon: "ph--check--regular"
   }));
 });
@@ -2789,7 +2923,7 @@ var SelectGroup = SelectPrimitive.Group;
 var SelectLabel = SelectPrimitive.Label;
 var SelectSeparator = /* @__PURE__ */ forwardRef25(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.Separator, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.Separator, {
     ...props,
     className: tx("select.separator", "select__separator", {}, classNames),
     ref: forwardedRef
@@ -2797,7 +2931,7 @@ var SelectSeparator = /* @__PURE__ */ forwardRef25(({ classNames, ...props }, fo
 });
 var SelectArrow = /* @__PURE__ */ forwardRef25(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React31.createElement(SelectPrimitive.Arrow, {
+  return /* @__PURE__ */ React33.createElement(SelectPrimitive.Arrow, {
     ...props,
     className: tx("select.arrow", "select__arrow", {}, classNames),
     ref: forwardedRef
@@ -2826,30 +2960,32 @@ var Select = {
 
 // packages/ui/react-ui/src/components/Separator/Separator.tsx
 import { Separator as SeparatorPrimitive } from "@radix-ui/react-separator";
-import React32 from "react";
-var Separator4 = ({ classNames, orientation = "horizontal", ...props }) => {
+import React34, { forwardRef as forwardRef26 } from "react";
+var Separator4 = /* @__PURE__ */ forwardRef26(({ classNames, orientation = "horizontal", ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React32.createElement(SeparatorPrimitive, {
+  return /* @__PURE__ */ React34.createElement(SeparatorPrimitive, {
     orientation,
     ...props,
     className: tx("separator.root", "separator", {
       orientation
-    }, classNames)
+    }, classNames),
+    ref: forwardedRef
   });
-};
+});
 
 // packages/ui/react-ui/src/components/Tag/Tag.tsx
 import { Primitive as Primitive12 } from "@radix-ui/react-primitive";
 import { Slot as Slot13 } from "@radix-ui/react-slot";
-import React33, { forwardRef as forwardRef26 } from "react";
-var Tag = /* @__PURE__ */ forwardRef26(({ asChild, palette, classNames, ...props }, forwardedRef) => {
+import React35, { forwardRef as forwardRef27 } from "react";
+var Tag = /* @__PURE__ */ forwardRef27(({ asChild, palette = "neutral", classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const Root5 = asChild ? Slot13 : Primitive12.span;
-  return /* @__PURE__ */ React33.createElement(Root5, {
+  return /* @__PURE__ */ React35.createElement(Root5, {
     ...props,
-    className: tx("tag.root", "tag", {
+    className: tx("tag.root", "dx-tag", {
       palette
     }, classNames),
+    "data-hue": palette,
     ref: forwardedRef
   });
 });
@@ -2858,56 +2994,56 @@ var Tag = /* @__PURE__ */ forwardRef26(({ asChild, palette, classNames, ...props
 import { Primitive as Primitive13 } from "@radix-ui/react-primitive";
 import { Slot as Slot14 } from "@radix-ui/react-slot";
 import { ToastProvider as ToastProviderPrimitive, ToastViewport as ToastViewportPrimitive, Root as ToastRootPrimitive, ToastTitle as ToastTitlePrimitive, ToastDescription as ToastDescriptionPrimitive, ToastAction as ToastActionPrimitive, ToastClose as ToastClosePrimitive } from "@radix-ui/react-toast";
-import React34, { forwardRef as forwardRef27 } from "react";
+import React36, { forwardRef as forwardRef28 } from "react";
 var ToastProvider = ToastProviderPrimitive;
-var ToastViewport = /* @__PURE__ */ forwardRef27(({ classNames, ...props }, forwardedRef) => {
+var ToastViewport = /* @__PURE__ */ forwardRef28(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React34.createElement(ToastViewportPrimitive, {
+  return /* @__PURE__ */ React36.createElement(ToastViewportPrimitive, {
     className: tx("toast.viewport", "toast-viewport", {}, classNames),
     ref: forwardedRef
   });
 });
-var ToastRoot = /* @__PURE__ */ forwardRef27(({ classNames, children, ...props }, forwardedRef) => {
+var ToastRoot = /* @__PURE__ */ forwardRef28(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React34.createElement(ToastRootPrimitive, {
+  return /* @__PURE__ */ React36.createElement(ToastRootPrimitive, {
     ...props,
     className: tx("toast.root", "toast", {}, classNames),
     ref: forwardedRef
-  }, /* @__PURE__ */ React34.createElement(ElevationProvider, {
-    elevation: "chrome"
+  }, /* @__PURE__ */ React36.createElement(ElevationProvider, {
+    elevation: "toast"
   }, children));
 });
-var ToastBody = /* @__PURE__ */ forwardRef27(({ asChild, classNames, ...props }, forwardedRef) => {
+var ToastBody = /* @__PURE__ */ forwardRef28(({ asChild, classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const Root5 = asChild ? Slot14 : Primitive13.div;
-  return /* @__PURE__ */ React34.createElement(Root5, {
+  return /* @__PURE__ */ React36.createElement(Root5, {
     ...props,
     className: tx("toast.body", "toast__body", {}, classNames),
     ref: forwardedRef
   });
 });
-var ToastTitle = /* @__PURE__ */ forwardRef27(({ asChild, classNames, ...props }, forwardedRef) => {
+var ToastTitle = /* @__PURE__ */ forwardRef28(({ asChild, classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const Root5 = asChild ? Slot14 : ToastTitlePrimitive;
-  return /* @__PURE__ */ React34.createElement(Root5, {
+  return /* @__PURE__ */ React36.createElement(Root5, {
     ...props,
     className: tx("toast.title", "toast__title", {}, classNames),
     ref: forwardedRef
   });
 });
-var ToastDescription = /* @__PURE__ */ forwardRef27(({ asChild, classNames, ...props }, forwardedRef) => {
+var ToastDescription = /* @__PURE__ */ forwardRef28(({ asChild, classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const Root5 = asChild ? Slot14 : ToastDescriptionPrimitive;
-  return /* @__PURE__ */ React34.createElement(Root5, {
+  return /* @__PURE__ */ React36.createElement(Root5, {
     ...props,
     className: tx("toast.description", "toast__description", {}, classNames),
     ref: forwardedRef
   });
 });
-var ToastActions = /* @__PURE__ */ forwardRef27(({ asChild, classNames, ...props }, forwardedRef) => {
+var ToastActions = /* @__PURE__ */ forwardRef28(({ asChild, classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   const Root5 = asChild ? Slot14 : Primitive13.div;
-  return /* @__PURE__ */ React34.createElement(Root5, {
+  return /* @__PURE__ */ React36.createElement(Root5, {
     ...props,
     className: tx("toast.actions", "toast__actions", {}, classNames),
     ref: forwardedRef
@@ -2929,55 +3065,63 @@ var Toast = {
 
 // packages/ui/react-ui/src/components/Toolbar/Toolbar.tsx
 import * as ToolbarPrimitive from "@radix-ui/react-toolbar";
-import React35, { forwardRef as forwardRef28 } from "react";
-var ToolbarRoot = /* @__PURE__ */ forwardRef28(({ classNames, children, ...props }, forwardedRef) => {
+import React37, { forwardRef as forwardRef29 } from "react";
+var ToolbarRoot = /* @__PURE__ */ forwardRef29(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return /* @__PURE__ */ React35.createElement(ToolbarPrimitive.Root, {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.Root, {
     ...props,
     className: tx("toolbar.root", "toolbar", {}, classNames),
     ref: forwardedRef
   }, children);
 });
-var ToolbarButton = /* @__PURE__ */ forwardRef28((props, forwardedRef) => {
-  return /* @__PURE__ */ React35.createElement(ToolbarPrimitive.Button, {
+var ToolbarButton = /* @__PURE__ */ forwardRef29((props, forwardedRef) => {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.Button, {
     asChild: true
-  }, /* @__PURE__ */ React35.createElement(Button, {
+  }, /* @__PURE__ */ React37.createElement(Button, {
     ...props,
     ref: forwardedRef
   }));
 });
-var ToolbarToggle = /* @__PURE__ */ forwardRef28((props, forwardedRef) => {
-  return /* @__PURE__ */ React35.createElement(ToolbarPrimitive.Button, {
+var ToolbarIconButton = /* @__PURE__ */ forwardRef29((props, forwardedRef) => {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.Button, {
     asChild: true
-  }, /* @__PURE__ */ React35.createElement(Toggle, {
+  }, /* @__PURE__ */ React37.createElement(IconButton, {
     ...props,
     ref: forwardedRef
   }));
 });
-var ToolbarLink = /* @__PURE__ */ forwardRef28((props, forwardedRef) => {
-  return /* @__PURE__ */ React35.createElement(ToolbarPrimitive.Link, {
+var ToolbarToggle = /* @__PURE__ */ forwardRef29((props, forwardedRef) => {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.Button, {
     asChild: true
-  }, /* @__PURE__ */ React35.createElement(Link, {
+  }, /* @__PURE__ */ React37.createElement(Toggle, {
     ...props,
     ref: forwardedRef
   }));
 });
-var ToolbarToggleGroup2 = /* @__PURE__ */ forwardRef28(({ classNames, children, elevation, ...props }, forwardedRef) => {
-  return /* @__PURE__ */ React35.createElement(ToolbarPrimitive.ToolbarToggleGroup, {
+var ToolbarLink = /* @__PURE__ */ forwardRef29((props, forwardedRef) => {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.Link, {
+    asChild: true
+  }, /* @__PURE__ */ React37.createElement(Link, {
+    ...props,
+    ref: forwardedRef
+  }));
+});
+var ToolbarToggleGroup2 = /* @__PURE__ */ forwardRef29(({ classNames, children, elevation, ...props }, forwardedRef) => {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.ToolbarToggleGroup, {
     ...props,
     asChild: true
-  }, /* @__PURE__ */ React35.createElement(ButtonGroup, {
+  }, /* @__PURE__ */ React37.createElement(ButtonGroup, {
     classNames,
     children,
     elevation,
     ref: forwardedRef
   }));
 });
-var ToolbarToggleGroupItem = /* @__PURE__ */ forwardRef28(({ variant, density, elevation, classNames, children, ...props }, forwardedRef) => {
-  return /* @__PURE__ */ React35.createElement(ToolbarPrimitive.ToolbarToggleItem, {
+var ToolbarToggleGroupItem = /* @__PURE__ */ forwardRef29(({ variant, density, elevation, classNames, children, ...props }, forwardedRef) => {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.ToolbarToggleItem, {
     ...props,
     asChild: true
-  }, /* @__PURE__ */ React35.createElement(Button, {
+  }, /* @__PURE__ */ React37.createElement(Button, {
     variant,
     density,
     elevation,
@@ -2986,26 +3130,42 @@ var ToolbarToggleGroupItem = /* @__PURE__ */ forwardRef28(({ variant, density, e
     ref: forwardedRef
   }));
 });
-var ToolbarSeparator = (props) => {
-  return /* @__PURE__ */ React35.createElement(ToolbarPrimitive.Separator, {
+var ToolbarToggleGroupIconItem = /* @__PURE__ */ forwardRef29(({ variant, density, elevation, classNames, icon, label, iconOnly, ...props }, forwardedRef) => {
+  return /* @__PURE__ */ React37.createElement(ToolbarPrimitive.ToolbarToggleItem, {
+    ...props,
     asChild: true
-  }, /* @__PURE__ */ React35.createElement(Separator4, {
-    orientation: "vertical",
-    ...props
+  }, /* @__PURE__ */ React37.createElement(IconButton, {
+    variant,
+    density,
+    elevation,
+    classNames,
+    icon,
+    label,
+    iconOnly,
+    ref: forwardedRef
   }));
-};
-var ToolbarExpander = () => /* @__PURE__ */ React35.createElement("div", {
-  className: "grow"
+});
+var ToolbarSeparator = /* @__PURE__ */ forwardRef29(({ variant = "line", ...props }, forwardedRef) => {
+  return variant === "line" ? /* @__PURE__ */ React37.createElement(ToolbarPrimitive.Separator, {
+    asChild: true
+  }, /* @__PURE__ */ React37.createElement(Separator4, {
+    ...props,
+    ref: forwardedRef
+  })) : /* @__PURE__ */ React37.createElement(ToolbarPrimitive.Separator, {
+    className: "grow",
+    ref: forwardedRef
+  });
 });
 var Toolbar = {
   Root: ToolbarRoot,
   Button: ToolbarButton,
+  IconButton: ToolbarIconButton,
   Link: ToolbarLink,
   Toggle: ToolbarToggle,
   ToggleGroup: ToolbarToggleGroup2,
   ToggleGroupItem: ToolbarToggleGroupItem,
-  Separator: ToolbarSeparator,
-  Expander: ToolbarExpander
+  ToggleGroupIconItem: ToolbarToggleGroupIconItem,
+  Separator: ToolbarSeparator
 };
 export {
   AlertDialog,
@@ -3056,6 +3216,7 @@ export {
   createDropdownMenuScope,
   createPopoverScope,
   hasIosKeyboard,
+  initialSafeArea,
   isLabel,
   toLocalizedString,
   useAvatarContext,
@@ -3065,9 +3226,11 @@ export {
   useDropdownMenuContext,
   useDropdownMenuMenuScope,
   useElevationContext,
+  useLandmarkMover,
   useListContext,
   useListItemContext,
   useMainContext,
+  useSafeArea,
   useSidebars,
   useThemeContext,
   useTranslation,