[data-reveal-drawer='sidebar']) {
--sidebar-reveal-width: calc(100vw - 3.5rem);
--sidebar-reveal-radius: var(--studio-frame-radius, 1.5rem) 0 0 var(--studio-frame-radius, 1.5rem);
--sidebar-reveal-rest: 0;
--sidebar-reveal-settle: 320ms;
}
-[data-sidebar-reveal][data-sidebar-mobile-open='true'] {
+[data-sidebar-scope]:has(> [data-reveal-drawer='sidebar'][data-open='true']) {
--sidebar-reveal-rest: 1;
--sidebar-reveal-settle: 400ms;
}
-[data-sidebar-reveal] [data-sidebar-reveal-layer] {
+[data-sidebar-scope]:has(> [data-reveal-drawer='sidebar']) [data-sidebar-reveal-layer] {
--sidebar-reveal-progress: var(--sidebar-reveal-drag, var(--sidebar-reveal-rest));
- --sidebar-reveal-motion: var(--sidebar-reveal-duration, var(--sidebar-reveal-settle)) var(--sidebar-reveal-ease);
+ --sidebar-reveal-motion: var(--sidebar-reveal-duration, var(--sidebar-reveal-settle)) var(--reveal-ease);
}
@media (prefers-reduced-motion: reduce) {
- [data-sidebar-reveal] [data-sidebar-reveal-layer] {
+ [data-sidebar-scope]:has(> [data-reveal-drawer='sidebar']) [data-sidebar-reveal-layer] {
--sidebar-reveal-motion: 0ms;
}
}
@@ -60,15 +60,15 @@
opacity var(--sidebar-reveal-motion);
}
-[data-sidebar-reveal][data-sidebar-mobile-present='true'] [data-sidebar-reveal-layer='panel'] {
+[data-reveal-drawer='sidebar'][data-present='true'] [data-sidebar-reveal-layer='panel'] {
will-change: scale, opacity;
}
-[data-sidebar-reveal][data-sidebar-mobile-present='true'] [data-sidebar-reveal-layer='scrim'] {
+[data-reveal-drawer='sidebar'][data-present='true'] [data-sidebar-reveal-layer='scrim'] {
will-change: translate, opacity;
}
-[data-sidebar-reveal][data-sidebar-mobile-present='true'] [data-sidebar-reveal-layer='page'] {
+[data-sidebar-scope]:has(> [data-reveal-drawer='sidebar'][data-present='true']) [data-sidebar-reveal-layer='page'] {
position: relative;
z-index: 1;
overflow: clip;
diff --git a/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-reveal.tsx b/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-reveal.tsx
index 259eeb2544b..488704eac95 100644
--- a/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-reveal.tsx
+++ b/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-reveal.tsx
@@ -1,16 +1,12 @@
-import { useEffect, useEffectEvent, useRef } from 'react';
-import type { KeyboardEvent as ReactKeyboardEvent, MouseEvent, ReactNode } from 'react';
-import { flushSync } from 'react-dom';
+import type { MouseEvent, ReactNode } from 'react';
+import { createPortal, flushSync } from 'react-dom';
+import { RevealDrawer } from './reveal-drawer';
import { useSidebar } from './sidebar-context';
-import { REVEAL_EASE, useRevealGesture } from './use-reveal-gesture';
-import { focusRingInset } from '@/ds/primitives/transitions';
+import { useRevealGesture } from './use-reveal-gesture';
import { cn } from '@/lib/utils';
import './sidebar-reveal.css';
-const REVEAL_EASE_VAR = '--sidebar-reveal-ease';
-const TABBABLE = 'a[href], button, input, select, textarea, summary, [tabindex]';
-
type SidebarRevealProps = {
children: ReactNode;
className?: string;
@@ -18,42 +14,22 @@ type SidebarRevealProps = {
};
export function SidebarReveal({ children, className, onClick }: SidebarRevealProps) {
- const { scopeRef, openMobile, mobileTriggerRef, setOpenMobile, setMobileDrawerPresent } = useSidebar();
- const rootRef = useRef
(null);
- const panelRef = useRef(null);
- const scrimRef = useRef(null);
-
- useEffect(() => {
- const scope = scopeRef.current;
- if (!scope) return;
- scope.setAttribute('data-sidebar-reveal', '');
- scope.style.setProperty(REVEAL_EASE_VAR, REVEAL_EASE);
- return () => {
- scope.removeAttribute('data-sidebar-reveal');
- scope.style.removeProperty(REVEAL_EASE_VAR);
- };
- }, [scopeRef]);
-
- const returnFocus = useEffectEvent((root: Element) => {
- const focused = document.activeElement;
- if (!focused || focused === document.body || root.contains(focused)) {
- mobileTriggerRef.current?.focus({ preventScroll: true });
- }
- });
-
- useEffect(() => {
- const root = rootRef.current;
- if (!openMobile || !root) return;
- const releaseOutside = inertOutside(root);
- panelRef.current?.focus({ preventScroll: true });
- return () => {
- releaseOutside();
- returnFocus(root);
- };
- }, [openMobile]);
+ const {
+ scopeRef,
+ scope,
+ drawerOwnerRef,
+ openMobile,
+ mobileDrawerPresent,
+ mobileTriggerRef,
+ setOpenMobile,
+ setMobileDrawerPresent,
+ } = useSidebar();
useRevealGesture({
scopeRef,
+ ownerRef: drawerOwnerRef,
+ name: 'sidebar',
+ side: 'left',
open: openMobile,
onGrab: () => flushSync(() => setMobileDrawerPresent(true)),
onRelease: setOpenMobile,
@@ -62,73 +38,23 @@ export function SidebarReveal({ children, className, onClick }: SidebarRevealPro
},
});
- const closeOnEscape = (event: ReactKeyboardEvent) => {
- if (event.key !== 'Escape' || event.defaultPrevented) return;
- event.preventDefault();
- setOpenMobile(false);
- };
+ if (!scope) return null;
- return (
- …)` checks stay one level deep.
+ return createPortal(
+
setOpenMobile(false)}
+ triggerRef={mobileTriggerRef}
+ panelClassName={cn('left-0 w-(--sidebar-reveal-width)', className)}
+ onPanelClick={onClick}
>
- scrimRef.current?.focus()} />
-
- setOpenMobile(false)}
- className={cn('fixed inset-0 z-2 bg-fill', focusRingInset)}
- />
- focusFirstIn(panelRef.current)} />
-
+ {children}
+ ,
+ scope,
);
}
-
-function focusFirstIn(container: HTMLElement | null) {
- if (!container) return;
- for (const candidate of container.querySelectorAll(TABBABLE)) {
- if (!(candidate instanceof HTMLElement) || candidate.tabIndex < 0) continue;
- candidate.focus();
- if (document.activeElement === candidate) return;
- }
- container.focus();
-}
-
-function inertOutside(root: Element) {
- const marked: Element[] = [];
- let node = root;
- while (node !== document.body && node.parentElement) {
- const parent = node.parentElement;
- for (const sibling of parent.children) {
- if (sibling === node || sibling.hasAttribute('inert')) continue;
- sibling.setAttribute('inert', '');
- marked.push(sibling);
- }
- node = parent;
- }
- return () => {
- for (const element of marked) element.removeAttribute('inert');
- };
-}
diff --git a/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-root.test.tsx b/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-root.test.tsx
index e84d60a2bac..3bbcbc607fa 100644
--- a/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-root.test.tsx
+++ b/packages/playground-ui/src/ds/components/Sidebar/root/sidebar-root.test.tsx
@@ -993,7 +993,7 @@ describe('Sidebar', () => {
const mobileTrigger = screen.getByRole('button', { name: 'Open navigation menu' });
fireEvent.click(mobileTrigger);
- expect(screen.getByRole('dialog', { name: 'Navigation' }).getAttribute('data-mobile-mode')).toBe('takeover');
+ expect(screen.getByRole('dialog', { name: 'Navigation' }).getAttribute('data-reveal-drawer')).toBe('sidebar');
expect(screen.getByText('Observability')).toBeDefined();
expect(screen.queryByRole('button', { name: 'Toggle sidebar' })).toBeNull();
expect(document.querySelector('[data-sidebar-scope]')?.getAttribute('data-sidebar-mobile-present')).toBe('true');
diff --git a/packages/playground-ui/src/ds/components/Sidebar/root/use-reveal-gesture.ts b/packages/playground-ui/src/ds/components/Sidebar/root/use-reveal-gesture.ts
index 602eb2d4b5b..302bd07c307 100644
--- a/packages/playground-ui/src/ds/components/Sidebar/root/use-reveal-gesture.ts
+++ b/packages/playground-ui/src/ds/components/Sidebar/root/use-reveal-gesture.ts
@@ -5,9 +5,6 @@ const EASE = [0.32, 0.72, 0, 1] as const;
const EASE_START_SLOPE = EASE[1] / EASE[0];
export const REVEAL_EASE = `cubic-bezier(${EASE.join(', ')})`;
-const DRAG_VAR = '--sidebar-reveal-drag';
-const DURATION_VAR = '--sidebar-reveal-duration';
-
const LOCK_DISTANCE_PX = 8;
const TURN_DISTANCE_PX = 8;
const COMMIT_DISTANCE_PX = 40;
@@ -33,16 +30,44 @@ type Track = {
samples: Sample[];
};
+export type RevealSide = 'left' | 'right';
+
+/** The two edge drawers that share a scope. */
+export type RevealName = 'sidebar' | 'aside';
+
type RevealGestureOptions = {
scopeRef: RefObject;
+ /**
+ * The drawer holding the scope while open, dragged, or settling closed. Shared by both drawers so only one is ever
+ * out: a swipe that would start one is ignored while the other holds it.
+ */
+ ownerRef: RefObject;
+ /** Namespaces the layer attribute (`data--reveal-layer`) and the drag variables (`---reveal-*`). */
+ name: RevealName;
+ /** The screen edge the panel sits on. A left panel opens on a rightward swipe, a right panel on a leftward one. */
+ side: RevealSide;
open: boolean;
onGrab: () => void;
onRelease: (open: boolean) => void;
onSettled: () => void;
};
-export function useRevealGesture({ scopeRef, open, onGrab, onRelease, onSettled }: RevealGestureOptions) {
+export function useRevealGesture({
+ scopeRef,
+ ownerRef,
+ name,
+ side,
+ open,
+ onGrab,
+ onRelease,
+ onSettled,
+}: RevealGestureOptions) {
const settleRef = useRef(0);
+ const layerAttr = `data-${name}-reveal-layer`;
+ const dragVar = `--${name}-reveal-drag`;
+ const durationVar = `--${name}-reveal-duration`;
+ // Distances are tracked toward "open": positive opens whichever edge the panel is on.
+ const toward = side === 'left' ? 1 : -1;
const isOpen = useEffectEvent(() => open);
const handleGrab = useEffectEvent(onGrab);
const handleRelease = useEffectEvent(onRelease);
@@ -53,18 +78,20 @@ export function useRevealGesture({ scopeRef, open, onGrab, onRelease, onSettled
if (!scope) return;
const token = ++settleRef.current;
requestAnimationFrame(() => {
- const running = revealLayers(scope).flatMap(layer => layer.getAnimations());
+ const running = revealLayers(scope, layerAttr).flatMap(layer => layer.getAnimations());
void Promise.allSettled(running.map(animation => animation.finished)).then(() => {
if (token !== settleRef.current) return;
- clearRevealVar(revealLayers(scope), DURATION_VAR);
+ clearRevealVar(revealLayers(scope, layerAttr), durationVar);
+ if (!isOpen()) releaseOwner(ownerRef, name);
handleSettled();
});
});
});
useEffect(() => {
+ if (open) ownerRef.current = name;
settle();
- }, [open]);
+ }, [open, ownerRef, name]);
useEffect(() => {
const scope = scopeRef.current;
@@ -76,9 +103,9 @@ export function useRevealGesture({ scopeRef, open, onGrab, onRelease, onSettled
const committed = Math.abs(ended.offset - ended.origin) >= COMMIT_DISTANCE_PX;
const endsOpen = committed ? ended.heading > 0 : ended.startedOpen;
const distance = Math.abs((endsOpen ? ended.width : 0) - ended.offset);
- const speedTowardTarget = endsOpen ? velocity : -velocity;
- setRevealVar(ended.layers, DURATION_VAR, `${settleDuration(distance, speedTowardTarget)}ms`);
- clearRevealVar(ended.layers, DRAG_VAR);
+ const speedTowardTarget = (endsOpen ? velocity : -velocity) * toward;
+ setRevealVar(ended.layers, durationVar, `${settleDuration(distance, speedTowardTarget)}ms`);
+ clearRevealVar(ended.layers, dragVar);
handleRelease(endsOpen);
settle();
};
@@ -88,22 +115,25 @@ export function useRevealGesture({ scopeRef, open, onGrab, onRelease, onSettled
const dy = touch.clientY - current.startY;
if (Math.hypot(dx, dy) < LOCK_DISTANCE_PX) return 'pending';
- const layers = revealLayers(scope);
- const width = layerNamed(layers, 'panel')?.offsetWidth ?? 0;
+ if (ownerRef.current && ownerRef.current !== name) return 'ignored';
+ const layers = revealLayers(scope, layerAttr);
+ const width = layerNamed(layers, layerAttr, 'panel')?.offsetWidth ?? 0;
const opening = !isOpen();
- if (!width || Math.abs(dx) <= Math.abs(dy) || dx > 0 !== opening) return 'ignored';
+ if (!width || Math.abs(dx) <= Math.abs(dy) || dx * toward > 0 !== opening) return 'ignored';
if (ownsHorizontalSwipe(current.target, scope, dx)) return 'ignored';
current.locked = true;
current.startedOpen = !opening;
current.width = width;
current.startX += Math.sign(dx) * LOCK_DISTANCE_PX;
- current.origin = liveOffset(layerNamed(layers, 'scrim')) ?? (opening ? 0 : width);
- current.heading = Math.sign(dx);
+ const live = liveOffset(layerNamed(layers, layerAttr, 'scrim'));
+ current.origin = live === undefined ? (opening ? 0 : width) : live * toward;
+ current.heading = Math.sign(dx * toward);
current.turn = current.origin;
current.layers = layers;
- setRevealVar(layers, DURATION_VAR, '0ms');
+ setRevealVar(layers, durationVar, '0ms');
settleRef.current++;
+ ownerRef.current = name;
handleGrab();
return 'locked';
};
@@ -149,9 +179,9 @@ export function useRevealGesture({ scopeRef, open, onGrab, onRelease, onSettled
}
if (event.cancelable) event.preventDefault();
- current.offset = Math.min(current.width, Math.max(0, current.origin + touch.clientX - current.startX));
+ current.offset = Math.min(current.width, Math.max(0, current.origin + (touch.clientX - current.startX) * toward));
steer(current);
- setRevealVar(current.layers, DRAG_VAR, String(current.offset / current.width));
+ setRevealVar(current.layers, dragVar, String(current.offset / current.width));
};
const onTouchEnd = (event: TouchEvent) => {
@@ -172,19 +202,24 @@ export function useRevealGesture({ scopeRef, open, onGrab, onRelease, onSettled
scope.removeEventListener('touchend', onTouchEnd);
scope.removeEventListener('touchcancel', onTouchEnd);
settles.current++;
- const layers = revealLayers(scope);
- clearRevealVar(layers, DRAG_VAR);
- clearRevealVar(layers, DURATION_VAR);
+ const layers = revealLayers(scope, layerAttr);
+ clearRevealVar(layers, dragVar);
+ clearRevealVar(layers, durationVar);
+ releaseOwner(ownerRef, name);
};
- }, [scopeRef]);
+ }, [scopeRef, ownerRef, layerAttr, dragVar, durationVar, name, toward]);
}
-function revealLayers(scope: ParentNode) {
- return Array.from(scope.querySelectorAll('[data-sidebar-reveal-layer]'));
+function revealLayers(scope: ParentNode, layerAttr: string) {
+ return Array.from(scope.querySelectorAll(`[${layerAttr}]`));
}
-function layerNamed(layers: readonly HTMLElement[], name: 'panel' | 'scrim') {
- return layers.find(layer => layer.dataset.sidebarRevealLayer === name);
+function layerNamed(layers: readonly HTMLElement[], layerAttr: string, name: 'panel' | 'scrim') {
+ return layers.find(layer => layer.getAttribute(layerAttr) === name);
+}
+
+function releaseOwner(ownerRef: RefObject, name: RevealName) {
+ if (ownerRef.current === name) ownerRef.current = null;
}
function setRevealVar(layers: readonly HTMLElement[], name: string, value: string) {
diff --git a/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.css b/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.css
index a1e1519e017..fd906254dba 100644
--- a/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.css
+++ b/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.css
@@ -6,6 +6,6 @@ html:has([data-slot='app-shell']) {
overscroll-behavior-y: none;
}
-[data-sidebar-reveal][data-sidebar-mobile-present='true'] [data-slot='app-shell'] {
+[data-sidebar-scope]:has(> [data-reveal-drawer='sidebar'][data-present='true']) [data-slot='app-shell'] {
overflow-x: clip;
}
diff --git a/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.stories.tsx b/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.stories.tsx
index 90507cb5685..ee39e586f41 100644
--- a/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.stories.tsx
+++ b/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.stories.tsx
@@ -1,4 +1,5 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
+import { useRef, useState } from 'react';
import type { ReactNode } from 'react';
import { PageHeader } from '../page-header';
@@ -7,11 +8,12 @@ import { MainCard } from './main-card';
import { Breadcrumb, Crumb } from '@/ds/components/Breadcrumb';
import { LogoWithoutText } from '@/ds/components/Logo';
import { PageLayout } from '@/ds/components/PageLayout';
-import { Sidebar, SidebarProvider } from '@/ds/components/Sidebar';
+import { AsideReveal, Sidebar, SidebarProvider } from '@/ds/components/Sidebar';
import { TooltipProvider } from '@/ds/components/Tooltip';
import { IconMagnifyingGlass } from '@/ds/icons/central/IconMagnifyingGlass';
import { IconRobot } from '@/ds/icons/central/IconRobot';
import { IconSettingsGear5 } from '@/ds/icons/central/IconSettingsGear5';
+import { IconSidebarSimpleRightWide } from '@/ds/icons/central/IconSidebarSimpleRightWide';
import { WorkflowIcon } from '@/ds/icons/WorkflowIcon';
import { raisedSurfaceStyle } from '@/ds/primitives/raised-surface';
import { cn } from '@/lib/utils';
@@ -172,6 +174,62 @@ export const Mobile: Story = {
),
};
+function MobileWithAsideDemo() {
+ const [open, setOpen] = useState(false);
+ const triggerRef = useRef(null);
+ return (
+
+
+
+
}
+ mobileHeader={
+
+
+
+ Workspace
+
+ setOpen(!open)}
+ >
+
+
+
+ }
+ >
+
+
+
+
+
+ Details panel
+
+ Swiped in from the right edge, mirroring the navigation drawer on the left.
+
+
+
+
+
+ );
+}
+
+export const MobileWithAside: Story = {
+ parameters: {
+ viewport: { defaultViewport: 'mobile1' },
+ docs: {
+ description: {
+ story:
+ '`AsideReveal` is the right-edge counterpart of the navigation drawer. Swipe the page left or tap the panel button to slide the page left and uncover the panel; swipe right, tap the tinted strip, or press Escape to close. Only one drawer is out at a time.',
+ },
+ },
+ },
+ render: () => ,
+};
+
export const WithoutRouteHeader: Story = {
render: () => (
diff --git a/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.tsx b/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.tsx
index c4f6024cc06..eef5c983c89 100644
--- a/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.tsx
+++ b/packages/playground-ui/src/ds/new/layout/app-shell/app-shell.tsx
@@ -30,6 +30,7 @@ export function AppShell({ children, className, edgeToEdge, mobileHeader, ref, s
data-slot="app-shell-content"
className="flex h-full min-h-0 min-w-0 flex-col"
data-sidebar-reveal-layer="page"
+ data-aside-reveal-layer="page"
>
{mobileHeader}