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

package/src/components/Lists/TreeDropIndicator.tsx

@@ -0,0 +1,70 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Instruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
+import React, { type HTMLAttributes, type CSSProperties } from 'react';
+
+// Tree item hitbox
+// https://github.com/atlassian/pragmatic-drag-and-drop/blob/main/packages/hitbox/constellation/index/about.mdx#tree-item
+
+type InstructionType = Exclude<Instruction, { type: 'instruction-blocked' }>['type'];
+type Orientation = 'sibling' | 'child';
+
+const edgeToOrientationMap: Record<InstructionType, Orientation> = {
+  'reorder-above': 'sibling',
+  'reorder-below': 'sibling',
+  'make-child': 'child',
+  reparent: 'child',
+};
+
+const orientationStyles: Record<Orientation, HTMLAttributes<HTMLElement>['className']> = {
+  // 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',
+};
+
+const instructionStyles: Record<InstructionType, HTMLAttributes<HTMLElement>['className']> = {
+  '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: '',
+};
+
+const strokeSize = 2;
+const terminalSize = 8;
+const offsetToAlignTerminalWithLine = (strokeSize - terminalSize) / 2;
+
+export type DropIndicatorProps = {
+  instruction: Instruction;
+  gap?: number;
+};
+
+export const TreeDropIndicator = ({ instruction, gap = 0 }: DropIndicatorProps) => {
+  const lineOffset = `calc(-0.5 * (${gap}px + ${strokeSize}px))`;
+  const isBlocked = instruction.type === 'instruction-blocked';
+  const desiredInstruction = isBlocked ? instruction.desired : instruction;
+  const orientation = edgeToOrientationMap[desiredInstruction.type];
+  if (isBlocked) {
+    return null;
+  }
+
+  return (
+    <div
+      style={
+        {
+          '--line-thickness': `${strokeSize}px`,
+          '--line-offset': `${lineOffset}`,
+          '--terminal-size': `${terminalSize}px`,
+          '--terminal-radius': `${terminalSize / 2}px`,
+          '--negative-terminal-size': `-${terminalSize}px`,
+          '--offset-terminal': `${offsetToAlignTerminalWithLine}px`,
+          '--horizontal-indent': `${desiredInstruction.currentLevel * desiredInstruction.indentPerLevel + 4}px`,
+        } as CSSProperties
+      }
+      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 ${orientationStyles[orientation]} ${instructionStyles[desiredInstruction.type]}`}
+    ></div>
+  );
+};

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

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

package/src/components/Main/Main.tsx

@@ -3,7 +3,6 @@
 //
 
 import { useFocusableGroup } from '@fluentui/react-tabster';
-import { useComposedRefs } from '@radix-ui/react-compose-refs';
 import { createContext } from '@radix-ui/react-context';
 import { Root as DialogRoot, DialogContent } from '@radix-ui/react-dialog';
 import { Primitive } from '@radix-ui/react-primitive';
@@ -29,7 +28,6 @@ import { useMediaQuery, useForwardedRef } from '@dxos/react-hooks';
 import { useSwipeToDismiss } from './useSwipeToDismiss';
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
-import { ElevationProvider } from '../ElevationProvider';
 
 const MAIN_ROOT_NAME = 'MainRoot';
 const NAVIGATION_SIDEBAR_NAME = 'NavigationSidebar';
@@ -37,12 +35,14 @@ const COMPLEMENTARY_SIDEBAR_NAME = 'ComplementarySidebar';
 const MAIN_NAME = 'Main';
 const GENERIC_CONSUMER_NAME = 'GenericConsumer';
 
+type SidebarState = 'expanded' | 'collapsed' | 'closed';
+
 type MainContextValue = {
   resizing: boolean;
-  navigationSidebarOpen: boolean;
-  setNavigationSidebarOpen: Dispatch<SetStateAction<boolean | undefined>>;
-  complementarySidebarOpen: boolean;
-  setComplementarySidebarOpen: Dispatch<SetStateAction<boolean | undefined>>;
+  navigationSidebarState: SidebarState;
+  setNavigationSidebarState: Dispatch<SetStateAction<SidebarState | undefined>>;
+  complementarySidebarState: SidebarState;
+  setComplementarySidebarState: Dispatch<SetStateAction<SidebarState | undefined>>;
 };
 
 const landmarkAttr = 'data-main-landmark';
@@ -75,73 +75,77 @@ const useLandmarkMover = (propsOnKeyDown: ComponentPropsWithoutRef<'div'>['onKey
 
 const [MainProvider, useMainContext] = createContext<MainContextValue>(MAIN_NAME, {
   resizing: false,
-  navigationSidebarOpen: false,
-  setNavigationSidebarOpen: (nextOpen) => {
+  navigationSidebarState: 'closed',
+  setNavigationSidebarState: (nextState) => {
     // TODO(burdon): Standardize with other context missing errors using raise.
     log.warn('Attempt to set sidebar state without initializing `MainRoot`');
   },
-  complementarySidebarOpen: false,
-  setComplementarySidebarOpen: (nextOpen) => {
+  complementarySidebarState: 'closed',
+  setComplementarySidebarState: (nextState) => {
     // TODO(burdon): Standardize with other context missing errors using raise.
     log.warn('Attempt to set sidebar state without initializing `MainRoot`');
   },
 });
 
 const useSidebars = (consumerName = GENERIC_CONSUMER_NAME) => {
-  const { setNavigationSidebarOpen, navigationSidebarOpen, setComplementarySidebarOpen, complementarySidebarOpen } =
+  const { setNavigationSidebarState, navigationSidebarState, setComplementarySidebarState, complementarySidebarState } =
     useMainContext(consumerName);
   return {
-    navigationSidebarOpen,
-    setNavigationSidebarOpen,
+    navigationSidebarState,
+    setNavigationSidebarState,
     toggleNavigationSidebar: useCallback(
-      () => setNavigationSidebarOpen(!navigationSidebarOpen),
-      [navigationSidebarOpen, setNavigationSidebarOpen],
+      () => setNavigationSidebarState(navigationSidebarState === 'expanded' ? 'closed' : 'expanded'),
+      [navigationSidebarState, setNavigationSidebarState],
     ),
-    openNavigationSidebar: useCallback(() => setNavigationSidebarOpen(true), [setNavigationSidebarOpen]),
-    closeNavigationSidebar: useCallback(() => setNavigationSidebarOpen(false), [setNavigationSidebarOpen]),
-    complementarySidebarOpen,
-    setComplementarySidebarOpen,
+    openNavigationSidebar: useCallback(() => setNavigationSidebarState('expanded'), []),
+    collapseNavigationSidebar: useCallback(() => setNavigationSidebarState('collapsed'), []),
+    closeNavigationSidebar: useCallback(() => setNavigationSidebarState('closed'), []),
+    complementarySidebarState,
+    setComplementarySidebarState,
     toggleComplementarySidebar: useCallback(
-      () => setComplementarySidebarOpen(!complementarySidebarOpen),
-      [complementarySidebarOpen, setComplementarySidebarOpen],
+      () => setComplementarySidebarState(complementarySidebarState === 'expanded' ? 'closed' : 'expanded'),
+      [complementarySidebarState, setComplementarySidebarState],
     ),
-    openComplementarySidebar: useCallback(() => setComplementarySidebarOpen(true), [setComplementarySidebarOpen]),
-    closeComplementarySidebar: useCallback(() => setComplementarySidebarOpen(false), [setComplementarySidebarOpen]),
+    openComplementarySidebar: useCallback(() => setComplementarySidebarState('expanded'), []),
+    collapseComplementarySidebar: useCallback(() => setComplementarySidebarState('collapsed'), []),
+    closeComplementarySidebar: useCallback(() => setComplementarySidebarState('closed'), []),
   };
 };
 
 type MainRootProps = PropsWithChildren<{
-  navigationSidebarOpen?: boolean;
-  defaultNavigationSidebarOpen?: boolean;
-  onNavigationSidebarOpenChange?: (nextOpen: boolean) => void;
-  complementarySidebarOpen?: boolean;
-  defaultComplementarySidebarOpen?: boolean;
-  onComplementarySidebarOpenChange?: (nextOpen: boolean) => void;
+  navigationSidebarState?: SidebarState;
+  defaultNavigationSidebarState?: SidebarState;
+  onNavigationSidebarStateChange?: (nextState: SidebarState) => void;
+  complementarySidebarState?: SidebarState;
+  defaultComplementarySidebarState?: SidebarState;
+  onComplementarySidebarStateChange?: (nextState: SidebarState) => void;
 }>;
 
 const resizeDebounce = 3000;
 
 const MainRoot = ({
-  navigationSidebarOpen: propsNavigationSidebarOpen,
-  defaultNavigationSidebarOpen,
-  onNavigationSidebarOpenChange,
-  complementarySidebarOpen: propsComplementarySidebarOpen,
-  defaultComplementarySidebarOpen,
-  onComplementarySidebarOpenChange,
+  navigationSidebarState: propsNavigationSidebarState,
+  defaultNavigationSidebarState,
+  onNavigationSidebarStateChange,
+  complementarySidebarState: propsComplementarySidebarState,
+  defaultComplementarySidebarState,
+  onComplementarySidebarStateChange,
   children,
   ...props
 }: MainRootProps) => {
   const [isLg] = useMediaQuery('lg', { ssr: false });
-  const [navigationSidebarOpen = isLg, setNavigationSidebarOpen] = useControllableState<boolean>({
-    prop: propsNavigationSidebarOpen,
-    defaultProp: defaultNavigationSidebarOpen,
-    onChange: onNavigationSidebarOpenChange,
-  });
-  const [complementarySidebarOpen = false, setComplementarySidebarOpen] = useControllableState<boolean>({
-    prop: propsComplementarySidebarOpen,
-    defaultProp: defaultComplementarySidebarOpen,
-    onChange: onComplementarySidebarOpenChange,
-  });
+  const [navigationSidebarState = isLg ? 'expanded' : 'collapsed', setNavigationSidebarState] =
+    useControllableState<SidebarState>({
+      prop: propsNavigationSidebarState,
+      defaultProp: defaultNavigationSidebarState,
+      onChange: onNavigationSidebarStateChange,
+    });
+  const [complementarySidebarState = isLg ? 'expanded' : 'collapsed', setComplementarySidebarState] =
+    useControllableState<SidebarState>({
+      prop: propsComplementarySidebarState,
+      defaultProp: defaultComplementarySidebarState,
+      onChange: onComplementarySidebarStateChange,
+    });
 
   const [resizing, setResizing] = useState(false);
   const resizeInterval = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -166,10 +170,10 @@ const MainRoot = ({
     <MainProvider
       {...props}
       {...{
-        navigationSidebarOpen,
-        setNavigationSidebarOpen,
-        complementarySidebarOpen,
-        setComplementarySidebarOpen,
+        navigationSidebarState,
+        setNavigationSidebarState,
+        complementarySidebarState,
+        setComplementarySidebarState,
       }}
       resizing={resizing}
     >
@@ -186,15 +190,15 @@ const handleOpenAutoFocus = (event: Event) => {
 
 type MainSidebarProps = ThemedClassName<ComponentPropsWithRef<typeof DialogContent>> & {
   swipeToDismiss?: boolean;
-  open: boolean;
+  state?: SidebarState;
   resizing?: boolean;
-  setOpen: Dispatch<SetStateAction<boolean | undefined>>;
+  onStateChange?: (nextState: SidebarState) => void;
   side: 'inline-start' | 'inline-end';
 };
 
 const MainSidebar = forwardRef<HTMLDivElement, MainSidebarProps>(
   (
-    { classNames, children, swipeToDismiss, onOpenAutoFocus, open, resizing, setOpen, side, ...props },
+    { classNames, children, swipeToDismiss, onOpenAutoFocus, state, resizing, onStateChange, side, ...props },
     forwardedRef,
   ) => {
     const [isLg] = useMediaQuery('lg', { ssr: false });
@@ -202,7 +206,7 @@ const MainSidebar = forwardRef<HTMLDivElement, MainSidebarProps>(
     const ref = useForwardedRef(forwardedRef);
     const noopRef = useRef(null);
     useSwipeToDismiss(swipeToDismiss ? ref : noopRef, {
-      onDismiss: () => setOpen(false),
+      onDismiss: () => onStateChange?.('closed'),
     });
     const handleKeyDown = useCallback(
       (event: KeyboardEvent<HTMLDivElement>) => {
@@ -215,36 +219,36 @@ const MainSidebar = forwardRef<HTMLDivElement, MainSidebarProps>(
     );
     const Root = isLg ? Primitive.div : DialogContent;
     return (
-      <DialogRoot open={open} modal={false}>
+      <DialogRoot open={state !== 'closed'} modal={false}>
         <Root
           {...(!isLg && { forceMount: true, tabIndex: -1, onOpenAutoFocus: onOpenAutoFocus ?? handleOpenAutoFocus })}
           {...props}
           data-side={side === 'inline-end' ? 'ie' : 'is'}
-          data-state={open ? 'open' : 'closed'}
+          data-state={state}
           data-resizing={resizing ? 'true' : 'false'}
           className={tx('main.sidebar', 'main__sidebar', {}, classNames)}
           onKeyDown={handleKeyDown}
-          {...(!open && { inert: 'true' })}
+          {...(state === 'closed' && { inert: 'true' })}
           ref={ref}
         >
-          <ElevationProvider elevation='group'>{children}</ElevationProvider>
+          {children}
         </Root>
       </DialogRoot>
     );
   },
 );
 
-type MainNavigationSidebarProps = Omit<MainSidebarProps, 'open' | 'setOpen' | 'side'>;
+type MainNavigationSidebarProps = Omit<MainSidebarProps, 'expanded' | 'side'>;
 
 const MainNavigationSidebar = forwardRef<HTMLDivElement, MainNavigationSidebarProps>((props, forwardedRef) => {
-  const { navigationSidebarOpen, setNavigationSidebarOpen, resizing } = useMainContext(NAVIGATION_SIDEBAR_NAME);
+  const { navigationSidebarState, setNavigationSidebarState, resizing } = useMainContext(NAVIGATION_SIDEBAR_NAME);
   const mover = useLandmarkMover(props.onKeyDown, '0');
   return (
     <MainSidebar
       {...mover}
       {...props}
-      open={navigationSidebarOpen}
-      setOpen={setNavigationSidebarOpen}
+      state={navigationSidebarState}
+      onStateChange={setNavigationSidebarState}
       resizing={resizing}
       side='inline-start'
       ref={forwardedRef}
@@ -254,18 +258,18 @@ const MainNavigationSidebar = forwardRef<HTMLDivElement, MainNavigationSidebarPr
 
 MainNavigationSidebar.displayName = NAVIGATION_SIDEBAR_NAME;
 
-type MainComplementarySidebarProps = Omit<MainSidebarProps, 'open' | 'setOpen' | 'side'>;
+type MainComplementarySidebarProps = Omit<MainSidebarProps, 'expanded' | 'side'>;
 
 const MainComplementarySidebar = forwardRef<HTMLDivElement, MainComplementarySidebarProps>((props, forwardedRef) => {
-  const { complementarySidebarOpen, setComplementarySidebarOpen, resizing } =
+  const { complementarySidebarState, setComplementarySidebarState, resizing } =
     useMainContext(COMPLEMENTARY_SIDEBAR_NAME);
   const mover = useLandmarkMover(props.onKeyDown, '2');
   return (
     <MainSidebar
       {...mover}
       {...props}
-      open={complementarySidebarOpen}
-      setOpen={setComplementarySidebarOpen}
+      state={complementarySidebarState}
+      onStateChange={setComplementarySidebarState}
       resizing={resizing}
       side='inline-end'
       ref={forwardedRef}
@@ -283,7 +287,7 @@ type MainProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.div>> &
 
 const MainContent = forwardRef<HTMLDivElement, MainProps>(
   ({ asChild, classNames, bounce, handlesFocus, children, role, ...props }: MainProps, forwardedRef) => {
-    const { navigationSidebarOpen, complementarySidebarOpen } = useMainContext(MAIN_NAME);
+    const { navigationSidebarState, complementarySidebarState } = useMainContext(MAIN_NAME);
     const { tx } = useThemeContext();
     const Root = asChild ? Slot : role ? 'div' : 'main';
 
@@ -294,8 +298,8 @@ const MainContent = forwardRef<HTMLDivElement, MainProps>(
         role={role}
         {...(handlesFocus && { ...mover })}
         {...props}
-        data-sidebar-inline-start-state={navigationSidebarOpen ? 'open' : 'closed'}
-        data-sidebar-inline-end-state={complementarySidebarOpen ? 'open' : 'closed'}
+        data-sidebar-inline-start-state={navigationSidebarState}
+        data-sidebar-inline-end-state={complementarySidebarState}
         className={tx('main.content', 'main', { bounce, handlesFocus }, classNames)}
         ref={forwardedRef}
       >
@@ -311,72 +315,37 @@ type MainOverlayProps = ThemedClassName<Omit<ComponentPropsWithRef<typeof Primit
 
 const MainOverlay = forwardRef<HTMLDivElement, MainOverlayProps>(({ classNames, ...props }, forwardedRef) => {
   const [isLg] = useMediaQuery('lg', { ssr: false });
-  const { navigationSidebarOpen, setNavigationSidebarOpen, complementarySidebarOpen, setComplementarySidebarOpen } =
+  const { navigationSidebarState, setNavigationSidebarState, complementarySidebarState, setComplementarySidebarState } =
     useMainContext(MAIN_NAME);
   const { tx } = useThemeContext();
   return (
     <div
       onClick={() => {
-        setNavigationSidebarOpen(false);
-        setComplementarySidebarOpen(false);
+        setNavigationSidebarState('collapsed');
+        setComplementarySidebarState('collapsed');
       }}
       {...props}
       className={tx(
         'main.overlay',
         'main__overlay',
-        { isLg, inlineStartSidebarOpen: navigationSidebarOpen, inlineEndSidebarOpen: complementarySidebarOpen },
+        { isLg, inlineStartSidebarOpen: navigationSidebarState, inlineEndSidebarOpen: complementarySidebarState },
         classNames,
       )}
-      data-state={navigationSidebarOpen || complementarySidebarOpen ? 'open' : 'closed'}
+      data-state={navigationSidebarState === 'expanded' || complementarySidebarState === 'expanded' ? 'open' : 'closed'}
       aria-hidden='true'
       ref={forwardedRef}
     />
   );
 });
 
-type MainNotchProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.div>>;
-
-const MainNotch = forwardRef<HTMLDivElement, MainNotchProps>(({ classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
-  // Notch is concerned with the nav sidebar, whichever side it might be on.
-  const { navigationSidebarOpen } = useMainContext(MAIN_NAME);
-  const notchElement = useRef<HTMLDivElement | null>(null);
-  const ref = useComposedRefs(forwardedRef, notchElement);
-
-  const handleKeyDown = useCallback(
-    (event: KeyboardEvent<HTMLDivElement>) => {
-      switch (event.key) {
-        case 'Escape':
-          props?.onKeyDown?.(event);
-          notchElement.current?.focus();
-      }
-    },
-    [props?.onKeyDown],
-  );
-
-  const mover = useLandmarkMover(handleKeyDown, '3');
-
-  return (
-    <div
-      role='toolbar'
-      {...mover}
-      {...props}
-      data-nav-sidebar-state={navigationSidebarOpen ? 'open' : 'closed'}
-      className={tx('main.notch', 'main__notch', {}, classNames)}
-      ref={ref}
-    />
-  );
-});
-
 export const Main = {
   Root: MainRoot,
   Content: MainContent,
   Overlay: MainOverlay,
   NavigationSidebar: MainNavigationSidebar,
   ComplementarySidebar: MainComplementarySidebar,
-  Notch: MainNotch,
 };
 
-export { useMainContext, useSidebars };
+export { useMainContext, useSidebars, useLandmarkMover };
 
-export type { MainRootProps, MainProps, MainOverlayProps, MainNavigationSidebarProps };
+export type { MainRootProps, MainProps, MainOverlayProps, MainNavigationSidebarProps, SidebarState };

package/src/components/Menus/ContextMenu.tsx

@@ -6,9 +6,9 @@ import { Primitive } from '@radix-ui/react-primitive';
 import { Slot } from '@radix-ui/react-slot';
 import React, { type ComponentPropsWithRef, forwardRef } from 'react';
 
-import { useThemeContext } from '../../hooks';
+import { useElevationContext, useThemeContext } from '../../hooks';
+import { useSafeCollisionPadding } from '../../hooks/useSafeCollisionPadding';
 import { type ThemedClassName } from '../../util';
-import { ElevationProvider } from '../ElevationProvider';
 
 type ContextMenuRootProps = ContextMenuPrimitive.ContextMenuProps;
 
@@ -27,16 +27,18 @@ type ContextMenuContentProps = ThemedClassName<ContextMenuPrimitive.ContextMenuC
 };
 
 const ContextMenuContent = forwardRef<HTMLDivElement, ContextMenuContentProps>(
-  ({ classNames, children, ...props }, forwardedRef) => {
+  ({ classNames, children, collisionPadding = 8, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
+    const elevation = useElevationContext();
+    const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
     return (
       <ContextMenuPrimitive.Content
-        collisionPadding={8}
         {...props}
-        className={tx('menu.content', 'menu', {}, classNames)}
+        collisionPadding={safeCollisionPadding}
+        className={tx('menu.content', 'menu', { elevation }, classNames)}
         ref={forwardedRef}
       >
-        <ElevationProvider elevation='chrome'>{children}</ElevationProvider>
+        {children}
       </ContextMenuPrimitive.Content>
     );
   },

package/src/components/Menus/DropdownMenu.tsx

@@ -28,7 +28,8 @@ import React, {
   type RefObject,
 } from 'react';
 
-import { useThemeContext } from '../../hooks';
+import { useElevationContext, useThemeContext } from '../../hooks';
+import { useSafeCollisionPadding } from '../../hooks/useSafeCollisionPadding';
 import { type ThemedClassName } from '../../util';
 
 type Direction = 'ltr' | 'rtl';
@@ -232,18 +233,20 @@ interface DropdownMenuContentProps extends Omit<MenuContentProps, 'onEntryFocus'
 
 const DropdownMenuContent = forwardRef<DropdownMenuContentElement, DropdownMenuContentProps>(
   (props: ScopedProps<DropdownMenuContentProps>, 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 (
       <MenuPrimitive.Content
         id={context.contentId}
         aria-labelledby={context.triggerId}
         {...menuScope}
         {...contentProps}
+        collisionPadding={safeCollisionPadding}
         ref={forwardedRef}
         onCloseAutoFocus={composeEventHandlers(props.onCloseAutoFocus, (event) => {
           if (!hasInteractedOutsideRef.current) {
@@ -261,7 +264,7 @@ const DropdownMenuContent = forwardRef<DropdownMenuContentElement, DropdownMenuC
             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

package/src/components/Popover/Popover.tsx

@@ -36,7 +36,8 @@ import React, {
 } from 'react';
 import { RemoveScroll } from 'react-remove-scroll';
 
-import { useThemeContext } from '../../hooks';
+import { useElevationContext, useThemeContext } from '../../hooks';
+import { useSafeCollisionPadding } from '../../hooks/useSafeCollisionPadding';
 import { type ThemedClassName } from '../../util';
 
 /* -------------------------------------------------------------------------------------------------
@@ -258,6 +259,7 @@ const PopoverContent = forwardRef<PopoverContentTypeElement, PopoverContentProps
     const portalContext = usePortalContext(CONTENT_NAME, props.__scopePopover);
     const { forceMount = portalContext.forceMount, ...contentProps } = props;
     const context = usePopoverContext(CONTENT_NAME, props.__scopePopover);
+
     return (
       <Presence present={forceMount || context.open}>
         {context.modal ? (
@@ -427,12 +429,15 @@ const PopoverContentImpl = forwardRef<PopoverContentImplElement, PopoverContentI
       onPointerDownOutside,
       onFocusOutside,
       onInteractOutside,
+      collisionPadding = 8,
       classNames,
       ...contentProps
     } = props;
     const context = usePopoverContext(CONTENT_NAME, __scopePopover);
     const popperScope = usePopperScope(__scopePopover);
     const { tx } = useThemeContext();
+    const elevation = useElevationContext();
+    const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
 
     // Make sure the whole tree has focus guards as our `Popover` may be
     // the last element in the DOM (because of the `Portal`)
@@ -461,7 +466,8 @@ const PopoverContentImpl = forwardRef<PopoverContentImplElement, PopoverContentI
             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,

package/src/components/ScrollArea/ScrollArea.stories.tsx

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import React, { type PropsWithChildren } from 'react';
 
 import { faker } from '@dxos/random';
-import { groupSurface, surfaceElevation } from '@dxos/react-ui-theme';
+import { groupSurface, surfaceShadow } from '@dxos/react-ui-theme';
 
 import { ScrollArea } from './ScrollArea';
 import { withTheme } from '../../testing';
@@ -17,7 +17,7 @@ faker.seed(1234);
 const StorybookScrollArea = ({ children }: PropsWithChildren<{}>) => {
   return (
     <ScrollArea.Root
-      classNames={['is-[300px] bs-[400px] rounded', groupSurface, surfaceElevation({ elevation: 'group' })]}
+      classNames={['is-[300px] bs-[400px] rounded', groupSurface, surfaceShadow({ elevation: 'positioned' })]}
     >
       <ScrollArea.Viewport classNames='rounded p-4'>
         <p>{children}</p>

package/src/components/Select/Select.tsx

@@ -6,7 +6,8 @@ import { CaretDown, CaretUp } from '@phosphor-icons/react';
 import * as SelectPrimitive from '@radix-ui/react-select';
 import React, { forwardRef } from 'react';
 
-import { useThemeContext } from '../../hooks';
+import { useElevationContext, useThemeContext } from '../../hooks';
+import { useSafeCollisionPadding } from '../../hooks/useSafeCollisionPadding';
 import { type ThemedClassName } from '../../util';
 import { Button, type ButtonProps } from '../Buttons';
 import { Icon } from '../Icon';
@@ -53,12 +54,15 @@ const SelectTriggerButton = forwardRef<HTMLButtonElement, SelectTriggerButtonPro
 type SelectContentProps = ThemedClassName<SelectPrimitive.SelectContentProps>;
 
 const SelectContent = forwardRef<HTMLDivElement, SelectContentProps>(
-  ({ classNames, children, ...props }, forwardedRef) => {
+  ({ classNames, children, collisionPadding = 8, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
+    const elevation = useElevationContext();
+    const safeCollisionPadding = useSafeCollisionPadding(collisionPadding);
     return (
       <SelectPrimitive.Content
         {...props}
-        className={tx('select.content', 'select__content', {}, classNames)}
+        collisionPadding={safeCollisionPadding}
+        className={tx('select.content', 'select__content', { elevation }, classNames)}
         position='popper'
         ref={forwardedRef}
       >

package/src/components/Separator/Separator.tsx

@@ -5,23 +5,26 @@ import {
   Separator as SeparatorPrimitive,
   type SeparatorProps as SeparatorPrimitiveProps,
 } from '@radix-ui/react-separator';
-import React from 'react';
+import React, { forwardRef } from 'react';
 
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
 
 type SeparatorProps = ThemedClassName<SeparatorPrimitiveProps>;
 
-const Separator = ({ classNames, orientation = 'horizontal', ...props }: SeparatorProps) => {
-  const { tx } = useThemeContext();
-  return (
-    <SeparatorPrimitive
-      orientation={orientation}
-      {...props}
-      className={tx('separator.root', 'separator', { orientation }, classNames)}
-    />
-  );
-};
+const Separator = forwardRef<HTMLDivElement, SeparatorProps>(
+  ({ classNames, orientation = 'horizontal', ...props }, forwardedRef) => {
+    const { tx } = useThemeContext();
+    return (
+      <SeparatorPrimitive
+        orientation={orientation}
+        {...props}
+        className={tx('separator.root', 'separator', { orientation }, classNames)}
+        ref={forwardedRef}
+      />
+    );
+  },
+);
 
 export type { SeparatorProps };