@dxos/plugin-navtree 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/src/components/Sidebar/L0Menu.tsx

@@ -2,15 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
-import { draggable, dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
-import { preserveOffsetOnSource } from '@atlaskit/pragmatic-drag-and-drop/element/preserve-offset-on-source';
-import { scrollJustEnoughIntoView } from '@atlaskit/pragmatic-drag-and-drop/element/scroll-just-enough-into-view';
 import {
   type Edge,
   attachClosestEdge,
   extractClosestEdge,
 } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
+import { draggable, dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
+import { preserveOffsetOnSource } from '@atlaskit/pragmatic-drag-and-drop/element/preserve-offset-on-source';
+import { scrollJustEnoughIntoView } from '@atlaskit/pragmatic-drag-and-drop/element/scroll-just-enough-into-view';
 import { useAtomValue } from '@effect-atom/atom-react';
 import React, {
   type MouseEvent,
@@ -29,6 +29,7 @@ import { DxAvatar } from '@dxos/lit-ui/react';
 import { useActionRunner } from '@dxos/plugin-graph';
 import {
   Icon,
+  IconButton,
   ListItem,
   ScrollArea,
   type ThemedClassName,
@@ -43,8 +44,9 @@ import { Tabs } from '@dxos/react-ui-tabs';
 import { mx } from '@dxos/ui-theme';
 import { arrayMove } from '@dxos/util';
 
-import { useNavTreeState } from '../../hooks';
-import { meta } from '../../meta';
+import { useNavTreeState } from '#hooks';
+import { meta } from '#meta';
+
 import { l0ItemType } from '../../util';
 import { useNavTreeContext } from '../NavTreeContext';
 import { UserAccountAvatar } from '../UserAccountAvatar';
@@ -85,12 +87,10 @@ const useL0ItemClick = ({ item, parent, path }: L0ItemProps, type: string) => {
       switch (type) {
         case 'action': {
           const { properties: { caller } = {} } = item;
-          return void runAction(item as Node.Action, caller ? { parent, caller } : { parent });
+          return void runAction(item as Node.Action, caller ? { parent, path, caller } : { parent, path });
         }
-
         case 'tab':
           return onTabChange?.(item);
-
         case 'link':
           return onSelect?.({ item, path, current: !getItem(path).current, option: event.altKey });
       }
@@ -103,36 +103,34 @@ const l0Breakpoints: Record<string, string> = {
   lg: 'hidden lg:grid',
 };
 
-const l0ItemRoot =
-  'group/l0item flex w-full justify-center items-center relative data[type!="collection"]:cursor-pointer dx-app-no-drag dx-focus-ring-group';
-
-const l0ItemContent = 'flex justify-center items-center dx-focus-ring-group-indicator transition-colors rounded-sm';
-
 const L0ItemRoot = memo(
-  forwardRef<HTMLElement, PropsWithChildren<L0ItemRootProps>>(
+  forwardRef<HTMLButtonElement, PropsWithChildren<L0ItemRootProps>>(
     ({ item, parent, path, onMouseEnter, children }, forwardedRef) => {
+      const { t } = useTranslation(meta.id);
       const { model } = useNavTreeContext();
       const itemPath = useMemo(() => [...path, item.id], [item.id, path]);
       const { id, testId } = useAtomValue(model.itemProps(itemPath));
-      const type = l0ItemType(item);
-
-      const { t } = useTranslation(meta.id);
       const localizedString = toLocalizedString(item.properties.label, t);
 
+      const type = l0ItemType(item);
       const handleClick = useL0ItemClick({ item, parent, path: itemPath }, type);
-      const rootProps =
-        type === 'tab'
-          ? { value: item.id, tabIndex: 0, onClick: handleClick, 'data-testid': testId, 'data-object-id': id }
-          : { onClick: handleClick, 'data-testid': testId, 'data-object-id': id };
 
       return (
         <Tooltip.Trigger asChild delayDuration={0} side='right' content={localizedString}>
           <Tabs.TabPrimitive
-            {...(rootProps as any)}
+            className={mx(
+              'group/l0item flex w-full justify-center items-center relative',
+              'dx-app-no-drag dx-focus-ring-group data[type!="collection"]:cursor-pointer',
+              l0Breakpoints[item.properties.l0Breakpoint],
+            )}
+            tabIndex={type === 'tab' ? 0 : undefined}
             data-type={type}
-            className={mx(l0ItemRoot, l0Breakpoints[item.properties.l0Breakpoint])}
-            ref={forwardedRef}
+            data-testid={testId}
+            data-object-id={id}
+            value={item.id}
+            onClick={handleClick}
             onMouseEnter={onMouseEnter}
+            ref={forwardedRef}
           >
             {children}
           </Tabs.TabPrimitive>
@@ -144,9 +142,8 @@ const L0ItemRoot = memo(
 
 export const L0ItemActiveTabIndicator = ({ classNames }: ThemedClassName<{}>) => (
   <div
-    role='none'
     className={mx(
-      'hidden group-aria-selected/l0item:block absolute start-0 inset-y-2 w-1 bg-accent-surface rounded-ie',
+      'hidden group-aria-selected/l0item:block absolute start-0 h-6 w-1.5 bg-accent-bg rounded-sm',
       classNames,
     )}
   />
@@ -155,13 +152,12 @@ export const L0ItemActiveTabIndicator = ({ classNames }: ThemedClassName<{}>) =>
 // TODO(burdon): Factor out pinned (non-draggable) items.
 const L0Item = memo(({ item, parent, path, pinned, onRearrange, onItemHover }: L0ItemProps) => {
   const { t } = useTranslation(meta.id);
-  const itemElement = useRef<HTMLElement | null>(null);
+  const itemElement = useRef<HTMLButtonElement | null>(null);
   const [closestEdge, setEdge] = useState<Edge | null>(null);
   const localizedString = toLocalizedString(item.properties.label, t);
   const hue = item.properties.hue ?? null;
 
   useLayoutEffect(() => {
-    // NOTE(thure): This is copied from StackItem, perhaps this should be DRYed out.
     if (!itemElement.current || !onRearrange) {
       return;
     }
@@ -221,14 +217,13 @@ const L0Item = memo(({ item, parent, path, pinned, onRearrange, onItemHover }: L
   return (
     <L0ItemRoot ref={itemElement} item={item} parent={parent} path={path} onMouseEnter={handleMouseEnter}>
       <div
-        role='none'
         data-frame={true}
         {...(hue && { style: { background: `var(--color-${hue}-surface)` } })}
         className={mx(
-          l0ItemContent,
+          'flex justify-center items-center dx-focus-ring-group-indicator transition-colors rounded-sm',
           pinned
-            ? 'p-2 group-hover/l0item:bg-active-surface'
-            : 'w-(--dx-l0-avatar-size) h-(--dx-l0-avatar-size) bg-active-surface',
+            ? 'p-2 group-hover/l0item:bg-current-surface'
+            : 'w-(--dx-l0-avatar-size) h-(--dx-l0-avatar-size) bg-current-surface',
         )}
       >
         <ItemAvatar item={item} />
@@ -244,13 +239,15 @@ const L0Item = memo(({ item, parent, path, pinned, onRearrange, onItemHover }: L
 
 const ItemAvatar = ({ item }: Pick<L0ItemProps, 'item'>) => {
   const { t } = useTranslation(meta.id);
-  const type = l0ItemType(item);
+
+  // Actions.
   if (item.properties.icon) {
     const hue = item.properties.hue ?? null;
-    const hueFgStyle = hue && { style: { color: `var(--color-${hue}-surface-text)` } };
+    const hueFgStyle = hue && { style: { color: `var(--color-${hue}-fg)` } };
     return <Icon icon={item.properties.icon} size={6} {...hueFgStyle} />;
   }
 
+  const type = l0ItemType(item);
   if (type === 'tab' && item.properties.disposition !== 'pin-end') {
     const hue = item.properties.hue ?? null;
     const localizedString = toLocalizedString(item.properties.label, t);
@@ -317,74 +314,58 @@ export const L0Menu = ({
 
   return (
     <Tabs.Tablist
+      data-tauri-drag-region
       classNames={[
         'group/l0 absolute z-[1] inset-y-0 start-0 rounded-is',
         'grid grid-cols-[var(--dx-l0-size)] grid-rows-[var(--dx-rail-size)_1fr_min-content_var(--dx-l0-size)] dx-contain-layout',
-        '!w-(--dx-l0-size) bg-toolbar-surface border-e border-subdued-separator dx-app-drag pb-[env(safe-area-inset-bottom)]',
+        'w-(--dx-l0-size) bg-l0-surface dx-app-drag pb-[env(safe-area-inset-bottom)]',
+        '[body[data-platform="macos"]_&]:pt-[30px]',
+        '[body[data-platform="ios"]_&]:pt-[max(env(safe-area-inset-top),0.25rem)]',
       ]}
     >
       {/* TODO(wittjosiah): Use L0Item trigger. */}
       <Menu.Root onAction={handleAction}>
-        <Menu.Trigger
-          asChild
-          data-testid='spacePlugin.addSpace'
-          className={mx(
-            l0ItemRoot,
-            'grid place-items-center dx-focus-ring-group',
-            '[body[data-platform="macos"]_&]:mt-[30px]',
-          )}
-        >
-          <Tooltip.Trigger content={t('app menu label')} side='right' asChild>
-            <Tabs.TabPrimitive value='options' asChild role='button'>
-              <div
-                role='none'
-                className={mx(
-                  l0ItemContent,
-                  'h-(--dx-rail-action) w-(--dx-rail-action) group-hover/l0item:bg-hover-surface',
-                )}
-              >
-                <Icon icon='ph--list--regular' size={5} />
-              </div>
-            </Tabs.TabPrimitive>
-          </Tooltip.Trigger>
+        <Menu.Trigger asChild data-testid='spacePlugin.addSpace'>
+          <div className='grid place-items-center'>
+            <IconButton
+              density='lg'
+              variant='ghost'
+              size={5}
+              icon='ph--list--regular'
+              iconOnly
+              square
+              label={t('app-menu.label')}
+            />
+          </div>
         </Menu.Trigger>
         <Menu.Content group={parent} items={menuActions} />
       </Menu.Root>
 
       {/* Space list. */}
-      <ScrollArea.Root thin orientation='vertical'>
-        <ScrollArea.Viewport>
-          <div
-            role='none'
-            className={mx([
-              'flex flex-col gap-1 pt-1',
-              '[body[data-platform="macos"]_&]:py-[30px]',
-              '[body[data-platform="ios"]_&]:py-[max(env(safe-area-inset-top),0.25rem)]',
-            ])}
-          >
-            {topLevelItems.map((item) => (
-              <L0Item
-                key={item.id}
-                item={item}
-                parent={parent}
-                path={path}
-                onItemHover={onItemHover}
-                {...(hasRearrangeableItems && { onRearrange: handleRearrange })}
-              />
-            ))}
-          </div>
+      <ScrollArea.Root centered thin orientation='vertical'>
+        <ScrollArea.Viewport classNames='flex flex-col gap-2 py-1'>
+          {topLevelItems.map((item) => (
+            <L0Item
+              key={item.id}
+              item={item}
+              parent={parent}
+              path={path}
+              onItemHover={onItemHover}
+              {...(hasRearrangeableItems && { onRearrange: handleRearrange })}
+            />
+          ))}
         </ScrollArea.Viewport>
       </ScrollArea.Root>
 
       {/* Actions. */}
-      <div role='none' className='grid grid-cols-1 auto-rows-(--dx-rail-action) pt-2'>
+      <div className='grid grid-cols-1 auto-rows-(--dx-rail-action) pt-2'>
         {pinnedItems.map((item) => (
           <L0Item key={item.id} item={item} parent={parent} path={path} pinned />
         ))}
       </div>
 
       {userAccountItem && (
-        <div role='none' className='grid dx-app-no-drag'>
+        <div className='grid dx-app-no-drag'>
           <L0ItemRoot key={userAccountItem.id} item={userAccountItem} parent={parent} path={path}>
             <UserAccountAvatar
               userId={userAccountItem.properties.userId}

package/src/components/Sidebar/L1Panel.tsx

@@ -2,24 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 import React, { memo, useCallback, useMemo } from 'react';
 
 import { Node } from '@dxos/app-graph';
+import { isPinnedWorkspace } from '@dxos/app-toolkit';
 import { useAppGraph } from '@dxos/app-toolkit/ui';
-import { Graph, useActionRunner, useConnections, useEdges } from '@dxos/plugin-graph';
+import { Graph, useActionRunner, useEdges } from '@dxos/plugin-graph';
 import { DensityProvider, IconButton, ScrollArea, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { Tree } from '@dxos/react-ui-list';
 import { Menu, type MenuItem } from '@dxos/react-ui-menu';
 import { Tabs } from '@dxos/react-ui-tabs';
 import { hoverableControlItem, hoverableOpenControlItem } from '@dxos/ui-theme';
 
-import { useActions, useIsAlternateTree, useLoadDescendents } from '../../hooks';
-import { meta } from '../../meta';
+import { getListActions, useActions, useLoadDescendents } from '#hooks';
+import { meta } from '#meta';
+
 import { NAV_TREE_ITEM } from '../NavTree';
 import { useNavTreeContext } from '../NavTreeContext';
-import { NavTreeItemAction, NavTreeItemColumns } from '../NavTreeItem';
+import { NavTreeItemColumns } from '../NavTreeItem/NavTreeItemColumns';
 
 export type L1PanelProps = {
   open?: boolean;
@@ -39,7 +40,7 @@ const L1Panel$ = ({ open, path, item, isCurrent, onBack }: L1PanelProps) => {
   const shouldRenderContent = isCurrent || isActivated;
 
   return (
-    <Tabs.Tabpanel
+    <Tabs.Panel
       key={item.id}
       value={item.id}
       classNames={[
@@ -54,7 +55,7 @@ const L1Panel$ = ({ open, path, item, isCurrent, onBack }: L1PanelProps) => {
       {...(!open && { inert: true })}
     >
       {shouldRenderContent && <L1PanelContent open={open} path={path} item={item} onBack={onBack} />}
-    </Tabs.Tabpanel>
+    </Tabs.Panel>
   );
 };
 
@@ -81,49 +82,28 @@ const useIsActivatedWorkspace = (item: Node.Node): boolean => {
 const L1PanelContent = ({ path, item, onBack }: Pick<L1PanelProps, 'open' | 'path' | 'item' | 'onBack'>) => {
   const navTreeContext = useNavTreeContext();
 
-  const alternateTree = useAlternateTreeItem(item);
-  const alternatePath = useMemo(() => [...path, item.id], [item.id, path]);
-  const isAlternate = useIsAlternateTree(alternatePath, item);
-
   return (
-    <DensityProvider density='fine'>
+    <DensityProvider density='md'>
       <L1PanelHeader path={path} item={item} onBack={onBack} />
       <ScrollArea.Root thin orientation='vertical'>
         <ScrollArea.Viewport>
-          {isAlternate && alternateTree ? (
-            <Tree
-              model={navTreeContext.model}
-              id={alternateTree.id}
-              rootId={alternateTree.id}
-              path={alternatePath}
-              levelOffset={5}
-              gridTemplateColumns='[tree-row-start] 1fr min-content min-content min-content [tree-row-end]'
-              renderColumns={NavTreeItemColumns}
-              blockInstruction={navTreeContext.blockInstruction}
-              canDrop={navTreeContext.canDrop}
-              canSelect={navTreeContext.canSelect}
-              onOpenChange={navTreeContext.onOpenChange}
-              onSelect={navTreeContext.onSelect}
-              onItemHover={navTreeContext.onItemHover}
-            />
-          ) : (
-            <Tree
-              model={navTreeContext.model}
-              id={item.id}
-              rootId={item.id}
-              path={path}
-              levelOffset={5}
-              gridTemplateColumns='[tree-row-start] 1fr min-content min-content min-content [tree-row-end]'
-              draggable
-              renderColumns={NavTreeItemColumns}
-              blockInstruction={navTreeContext.blockInstruction}
-              canDrop={navTreeContext.canDrop}
-              canSelect={navTreeContext.canSelect}
-              onOpenChange={navTreeContext.onOpenChange}
-              onSelect={navTreeContext.onSelect}
-              onItemHover={navTreeContext.onItemHover}
-            />
-          )}
+          <Tree
+            classNames='pt-[2px]'
+            model={navTreeContext.model}
+            id={item.id}
+            rootId={item.id}
+            path={path}
+            levelOffset={5}
+            draggable
+            gridTemplateColumns='[tree-row-start] minmax(0, 1fr) min-content min-content [tree-row-end]'
+            renderColumns={NavTreeItemColumns}
+            blockInstruction={navTreeContext.blockInstruction}
+            canDrop={navTreeContext.canDrop}
+            canSelect={navTreeContext.canSelect}
+            onOpenChange={navTreeContext.onOpenChange}
+            onSelect={navTreeContext.onSelect}
+            onItemHover={navTreeContext.onItemHover}
+          />
         </ScrollArea.Viewport>
       </ScrollArea.Root>
     </DensityProvider>
@@ -137,152 +117,113 @@ const L1PanelHeader = ({ item, path, onBack }: Pick<L1PanelProps, 'item' | 'path
   const { t } = useTranslation(meta.id);
   const { renderItemEnd: ItemEnd } = useNavTreeContext();
   const title = toLocalizedString(item.properties.label, t);
-  const backCapableWorkspace = item.id.startsWith('!');
+  const backCapableWorkspace = isPinnedWorkspace(item.id);
 
-  const { primaryAction, groupedActions, menuActions, onAction } = useL1MenuActions({ item, path });
+  const { menuActions, onAction } = useL1MenuActions({ item, path });
   useLoadDescendents(item);
 
   return (
-    <div className='flex w-full items-center border-b border-subdued-separator dx-app-drag dx-density-coarse pe-1'>
+    <div
+      data-tauri-drag-region
+      className='grid grid-cols-[28px_1fr_min-content_min-content] w-full items-center dx-app-drag dx-density-lg'
+    >
       {backCapableWorkspace ? (
         <IconButton
-          size={5}
-          density='coarse'
-          classNames={['shrink-0 px-2 pointer-fine:px-1', hoverableControlItem, hoverableOpenControlItem]}
+          classNames={[hoverableControlItem, hoverableOpenControlItem]}
           variant='ghost'
           icon='ph--caret-left--regular'
           iconOnly
-          label={t('button back')}
+          size={4}
+          label={t('button-back.button')}
           data-testid='treeView.primaryTreeButton'
           onClick={() => onBack?.()}
         />
       ) : (
-        <div className='w-6' />
+        <div />
       )}
-      <h2 className='flex-1 truncate min-w-0'>{title}</h2>
-      {/* TODO(wittjosiah): Reconcile with NavTreeItemColumns. */}
-      <div role='none' className='contents dx-app-no-drag'>
-        {primaryAction?.properties?.disposition === 'list-item-primary' && !primaryAction?.properties?.disabled && (
-          <NavTreeItemAction
-            testId={primaryAction.properties?.testId}
-            label={toLocalizedString(primaryAction.properties?.label, t)}
-            icon={primaryAction.properties?.icon ?? 'ph--placeholder--regular'}
-            parent={item}
-            monolithic={Node.isAction(primaryAction)}
-            menuActions={Node.isAction(primaryAction) ? [primaryAction] : groupedActions[primaryAction?.id ?? '']}
-            menuType={primaryAction.properties?.menuType}
-            caller={NAV_TREE_ITEM}
-          />
-        )}
-        {menuActions.length === 1 && (
-          <IconButton
-            size={5}
-            density='coarse'
-            classNames={['shrink-0 px-2 pointer-fine:px-1', hoverableControlItem, hoverableOpenControlItem]}
-            variant='ghost'
-            icon={menuActions[0].properties?.icon ?? 'ph--placeholder--regular'}
-            iconOnly
-            label={toLocalizedString(menuActions[0].properties?.label, t)}
-            data-testid={menuActions[0].properties?.testId}
-            onClick={() => onAction(menuActions[0] as Node.Action)}
-          />
-        )}
-        {menuActions.length > 1 && (
-          <Menu.Root caller={NAV_TREE_ITEM} onAction={onAction}>
-            <Menu.Trigger asChild>
-              <IconButton
-                size={5}
-                density='coarse'
-                classNames={['shrink-0 px-2 pointer-fine:px-1', hoverableControlItem, hoverableOpenControlItem]}
-                variant='ghost'
-                icon='ph--dots-three-vertical--regular'
-                iconOnly
-                label={t('tree item actions label')}
-                data-testid='navtree.treeItem.actionsLevel0'
-              />
-            </Menu.Trigger>
-            <Menu.Content group={item} items={menuActions as MenuItem[]} />
-          </Menu.Root>
-        )}
+      <h2 data-tauri-drag-region className='flex-1 truncate min-w-0'>
+        {title}
+      </h2>
+      <div className='contents dx-app-no-drag'>
+        <MenuActions item={item} menuActions={menuActions} onAction={onAction} />
         {ItemEnd && <ItemEnd node={item} open />}
       </div>
     </div>
   );
 };
 
+type L1MenuActions = {
+  menuActions: Node.Action[];
+  onAction: (action: Node.Action, params?: Node.InvokeProps) => void;
+};
+
 /**
- * Builds the menu actions for the L1 panel header, combining graph actions with a synthetic settings/back action.
+ * Header menu actions for an L1 workspace tab. Renders nothing for an empty
+ * `menuActions`, a single inline icon button for one action, and a
+ * `…`-menu trigger for multiple.
  */
-const useL1MenuActions = ({ item, path }: Pick<L1PanelProps, 'item' | 'path'>) => {
+const MenuActions = ({
+  item,
+  menuActions,
+  onAction,
+}: {
+  item: Node.Node;
+} & Pick<L1MenuActions, 'menuActions' | 'onAction'>) => {
   const { t } = useTranslation(meta.id);
-  const { setAlternateTree } = useNavTreeContext();
-  const { graph } = useAppGraph();
-  const runAction = useActionRunner();
 
-  const alternateTree = useAlternateTreeItem(item);
-  const alternatePath = useMemo(() => [...path, item.id], [item.id, path]);
-  const isAlternate = useIsAlternateTree(alternatePath, item);
+  if (menuActions.length === 0) {
+    return null;
+  }
+
+  if (menuActions.length === 1) {
+    return (
+      <IconButton
+        classNames={['shrink-0 px-2 pointer-fine:px-1', hoverableControlItem, hoverableOpenControlItem]}
+        variant='ghost'
+        icon={menuActions[0].properties?.icon ?? 'ph--circle-dashed--regular'}
+        iconOnly
+        size={4}
+        label={toLocalizedString(menuActions[0].properties?.label, t)}
+        data-testid={menuActions[0].properties?.testId}
+        onClick={() => onAction(menuActions[0] as Node.Action)}
+      />
+    );
+  }
 
-  // Graph actions.
-  const { actions: actionsProp, groupedActions } = useActions(item);
-  const [primaryAction, ...secondaryActions] = actionsProp.toSorted((a, _b) =>
-    a.properties?.disposition === 'list-item-primary' ? -1 : 1,
+  return (
+    <Menu.Root caller={NAV_TREE_ITEM} onAction={onAction}>
+      <Menu.Trigger asChild>
+        <IconButton
+          classNames={['shrink-0 px-2 pointer-fine:px-1', hoverableControlItem, hoverableOpenControlItem]}
+          variant='ghost'
+          icon='ph--dots-three-vertical--regular'
+          iconOnly
+          size={4}
+          label={t('tree-item-actions.label')}
+          data-testid='navtree.treeItem.actionsLevel0'
+        />
+      </Menu.Trigger>
+      <Menu.Content group={item} items={menuActions as MenuItem[]} />
+    </Menu.Root>
   );
+};
 
-  const graphMenuActions = (
-    primaryAction?.properties?.disposition === 'list-item-primary' ? secondaryActions : actionsProp
-  )
-    .flatMap((action) => (Node.isAction(action) ? [action] : []))
-    .filter((a) => ['list-item', 'list-item-primary'].includes(a.properties?.disposition));
-
-  // Synthetic settings/back action.
-  const settingsActionId = `${item.id}~settings`;
-  const settingsAction = useMemo((): Node.Action | undefined => {
-    if (!alternateTree) {
-      return undefined;
-    }
-    return {
-      id: settingsActionId,
-      type: Node.ActionType,
-      data: () => Effect.void,
-      properties: {
-        label: isAlternate ? ['button back', { ns: meta.id }] : (alternateTree.properties.label ?? alternateTree.id),
-        icon: isAlternate
-          ? 'ph--arrow-u-down-left--regular'
-          : (alternateTree.properties.icon ?? 'ph--placeholder--regular'),
-        disposition: 'list-item',
-        testId: isAlternate ? 'navtree.backToSpace' : 'navtree.spaceSettings',
-      },
-    } as Node.Action;
-  }, [alternateTree, isAlternate, settingsActionId, t]);
+/**
+ * Builds the menu actions for the L1 panel header.
+ */
+const useL1MenuActions = ({ item, path }: Pick<L1PanelProps, 'item' | 'path'>): L1MenuActions => {
+  const runAction = useActionRunner();
 
-  const menuActions = useMemo(
-    () => [...graphMenuActions, ...(settingsAction ? [settingsAction] : [])],
-    [graphMenuActions, settingsAction],
-  );
+  const menuActions = getListActions(useActions(item));
 
   const onAction = useCallback(
     (action: Node.Action, params?: Node.InvokeProps) => {
-      if (action.id === settingsActionId) {
-        if (alternateTree && !isAlternate) {
-          Graph.expand(graph, alternateTree.id, 'child');
-        }
-        setAlternateTree?.(alternatePath, !isAlternate);
-      } else {
-        void runAction(action, params);
-      }
+      void runAction(action, { ...params, path });
     },
-    [settingsActionId, setAlternateTree, alternatePath, isAlternate, runAction, graph, alternateTree],
+    [runAction, path],
   );
 
-  return { primaryAction, groupedActions, menuActions, onAction };
-};
-
-/** Finds the first child with disposition 'alternate-tree' using graph connections directly. */
-const useAlternateTreeItem = (item: Node.Node): Node.Node | undefined => {
-  const { graph } = useAppGraph();
-  const connections = useConnections(graph, item.id, 'child');
-  return connections.find((node) => node.properties.disposition === 'alternate-tree');
+  return { menuActions, onAction };
 };
 
 export const L1Panel = memo(L1Panel$);

package/src/components/Sidebar/L1Tabs.tsx

@@ -7,7 +7,6 @@ import React from 'react';
 import { type Node } from '@dxos/app-graph';
 
 import { l0ItemType } from '../../util';
-
 import { L1Panel, type L1PanelProps } from './L1Panel';
 
 export type L1TabsProps = Pick<L1PanelProps, 'open' | 'onBack'> & {

package/src/components/types.ts

@@ -8,7 +8,7 @@ import { type Node } from '@dxos/app-graph';
 import type { Density } from '@dxos/react-ui';
 import type { TreeModel, TreeProps } from '@dxos/react-ui-list';
 
-import type { NavTreeItemGraphNode } from '../types';
+import type { NavTreeItemGraphNode } from '#types';
 
 import type { L1PanelProps } from './Sidebar';
 
@@ -16,7 +16,6 @@ export type NavTreeContextValue = {
   model: TreeModel<NavTreeItemGraphNode>;
   popoverAnchorId?: string;
   renderItemEnd?: FC<{ node: Node.Node; open: boolean }>;
-  setAlternateTree?: (path: string[], open: boolean) => void;
   onTabChange?: (node: NavTreeItemGraphNode) => void;
 } & Pick<
   TreeProps<NavTreeItemGraphNode>,