@dxos/plugin-simple-layout 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/src/components/SimpleLayout/NavBar.tsx

@@ -2,73 +2,39 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type Atom } from '@effect-atom/atom-react';
 import React from 'react';
 
-import { useAppGraph } from '@dxos/app-framework/react';
-import { Node, useActionRunner, useConnections } from '@dxos/plugin-graph';
-import { IconButton, type ThemedClassName, Toolbar, Tooltip, useTranslation } from '@dxos/react-ui';
-import { DropdownMenu, MenuProvider } from '@dxos/react-ui-menu';
+import { type ThemedClassName } from '@dxos/react-ui';
+import {
+  type ActionExecutor,
+  type ActionGraphProps,
+  MenuProvider,
+  ToolbarMenu,
+  useMenuActions,
+} from '@dxos/react-ui-menu';
 import { mx } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+const NAVBAR_NAME = 'SimpleLayout.NavBar';
 
 export type NavBarProps = ThemedClassName<{
-  activeId?: string;
-  onActiveIdChange?: (nextActiveId: string | null) => void;
+  /** Action graph atom for the toolbar. */
+  actions: Atom.Atom<ActionGraphProps>;
+  /** Action executor callback. */
+  onAction?: ActionExecutor;
 }>;
 
-export const NavBar = ({ classNames, activeId, onActiveIdChange }: NavBarProps) => {
-  const { t } = useTranslation(meta.id);
-  const { graph } = useAppGraph();
-  const runAction = useActionRunner();
-
-  const connections = useConnections(graph, Node.RootId);
-  const menuActions = connections.filter((node) => node.properties.disposition === 'menu');
-
-  const isBrowseActive = activeId !== 'notifications' && activeId !== 'profile';
+/**
+ * Presentational navbar component that renders a toolbar from an action graph.
+ */
+export const NavBar = ({ classNames, actions, onAction }: NavBarProps) => {
+  const menu = useMenuActions(actions);
 
   return (
-    <Toolbar.Root classNames={mx('justify-center', classNames)}>
-      <MenuProvider onAction={runAction}>
-        <DropdownMenu.Root items={menuActions}>
-          <Tooltip.Trigger asChild content={t('app menu label')}>
-            <DropdownMenu.Trigger asChild data-testid='spacePlugin.addSpace'>
-              <IconButton icon='ph--plus--regular' iconOnly label={t('main menu label')} />
-            </DropdownMenu.Trigger>
-          </Tooltip.Trigger>
-        </DropdownMenu.Root>
-      </MenuProvider>
-      {/*
-        <ButtonGroup>
-          <IconButton
-            {...buttonProps}
-            label={t('browse label')}
-            icon='ph--squares-four--regular'
-            onClick={() => onActiveIdChange?.(null)}
-            variant={isBrowseActive ? 'primary' : 'default'}
-            {...(isBrowseActive && { 'aria-current': 'location' })}
-          />
-          <IconButton
-            {...buttonProps}
-            label={t('notifications label')}
-            icon='ph--bell-simple--regular'
-            onClick={() => onActiveIdChange?.('notifications')}
-            variant={activeId === 'notifications' ? 'primary' : 'default'}
-            {...(activeId === 'notifications' && { 'aria-current': 'location' })}
-          />
-          <Button
-            variant={activeId === 'profile' ? 'primary' : 'default'}
-            onClick={() => onActiveIdChange?.('profile')}
-            classNames={buttonProps.classNames}
-          >
-            <span className='sr-only'>{t('profile label')}</span>
-            <Avatar.Root>
-              <Avatar.Label classNames='sr-only'>Profile display name</Avatar.Label>
-              <Avatar.Content size={8} status='active' hue='cyan' fallback='🗿' />
-            </Avatar.Root>
-          </Button>
-        </ButtonGroup>
-      */}
-    </Toolbar.Root>
+    <MenuProvider {...menu} onAction={onAction} alwaysActive>
+      <ToolbarMenu density='coarse' classNames={mx(classNames)} />
+    </MenuProvider>
   );
 };
+
+NavBar.displayName = NAVBAR_NAME;

package/src/components/SimpleLayout/SimpleLayout.stories.tsx

@@ -5,14 +5,15 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvents, Capabilities, Capability, Plugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { ClientOperation, ClientPlugin } from '@dxos/plugin-client';
 import { SearchPlugin } from '@dxos/plugin-search';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { SpaceOperation } from '@dxos/plugin-space/types';
 import { corePlugins } from '@dxos/plugin-testing';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { translations as searchTranslation } from '@dxos/react-ui-searchlist';
 import { Collection } from '@dxos/schema';
 
@@ -24,18 +25,18 @@ import { translations } from '../../translations';
 import { SimpleLayout } from './SimpleLayout';
 
 const TestPlugin = Plugin.define<SimpleLayoutPluginOptions>(pluginMeta).pipe(
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
   Plugin.addModule(({ isPopover = false }) => ({
     id: Capability.getModuleTag(State),
-    activatesOn: Common.ActivationEvent.Startup,
-    activatesAfter: [Common.ActivationEvent.LayoutReady],
+    activatesOn: ActivationEvents.Startup,
+    activatesAfter: [AppActivationEvents.LayoutReady],
     activate: () => State({ initialState: { isPopover } } satisfies SimpleLayoutStateOptions),
   })),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
   Plugin.addModule({
     id: 'setup',
-    activatesOn: Common.ActivationEvent.OperationInvokerReady,
+    activatesOn: ActivationEvents.OperationInvokerReady,
     activate: Effect.fnUntraced(function* () {
-      const { invoke } = yield* Capability.get(Common.Capability.OperationInvoker);
+      const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);
       yield* invoke(ClientOperation.CreateIdentity, {});
       const { space: work } = yield* invoke(SpaceOperation.Create, { name: 'Work Space' });
       const { space: sharedProject } = yield* invoke(SpaceOperation.Create, { name: 'Shared Project' });
@@ -91,10 +92,22 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
+/**
+ * NOTE: To expose to iphone on network:
+ * `moon run storybook-react:serve dev -H 0.0.0.0`
+ */
 export const Default: Story = {
-  decorators: [withTheme, createPluginManager({ isPopover: false })],
+  decorators: [
+    withTheme(),
+    withLayout({ layout: 'column', classNames: 'relative' }),
+    createPluginManager({ isPopover: false }),
+  ],
 };
 
 export const Popover: Story = {
-  decorators: [withTheme, createPluginManager({ isPopover: true })],
+  decorators: [
+    withTheme(),
+    withLayout({ layout: 'column', classNames: 'relative' }),
+    createPluginManager({ isPopover: true }),
+  ],
 };

package/src/components/SimpleLayout/SimpleLayout.tsx

@@ -2,19 +2,58 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
+import { Splitter, type SplitterMode } from '@dxos/react-ui';
+import { Mosaic } from '@dxos/react-ui-mosaic';
+
+import { useSimpleLayoutState } from '../../hooks';
 import { Dialog } from '../Dialog';
+import { MobileLayout } from '../MobileLayout';
 import { PopoverContent, PopoverRoot } from '../Popover';
 
+import { Drawer } from './Drawer';
 import { Main } from './Main';
 
+// TODO(burdon): Mobile/Desktop variance?
 export const SimpleLayout = () => {
+  const { state } = useSimpleLayoutState();
+  const [keyboardOpen, setKeyboardOpen] = useState(false);
+  const [splitterMode, setSplitterMode] = useState<SplitterMode>('upper');
+
+  const drawerRef = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    if (keyboardOpen) {
+      // Determine which panel has focus and expand that one.
+      const activeElement = document.activeElement;
+      const drawerHasFocus = drawerRef.current?.contains(activeElement);
+      setSplitterMode(drawerHasFocus ? 'lower' : 'upper');
+    } else {
+      setSplitterMode(state.drawerState === 'closed' ? 'upper' : state.drawerState === 'open' ? 'both' : 'lower');
+    }
+  }, [state.drawerState, keyboardOpen]);
+
   return (
-    <PopoverRoot>
-      <Main />
-      <Dialog />
-      <PopoverContent />
-    </PopoverRoot>
+    <Mosaic.Root classNames='contents'>
+      <MobileLayout.Root
+        classNames='bg-toolbarSurface'
+        onKeyboardOpenChange={(keyboardOpen: boolean) => setKeyboardOpen(keyboardOpen)}
+      >
+        <MobileLayout.Panel safe={{ top: true, bottom: splitterMode === 'upper' }}>
+          <PopoverRoot>
+            <Splitter.Root mode={splitterMode} ratio={0.55}>
+              <Splitter.Panel position='upper'>
+                <Main />
+              </Splitter.Panel>
+              <Splitter.Panel position='lower' ref={drawerRef}>
+                <Drawer />
+              </Splitter.Panel>
+            </Splitter.Root>
+            <Dialog />
+            <PopoverContent />
+          </PopoverRoot>
+        </MobileLayout.Panel>
+      </MobileLayout.Root>
+    </Mosaic.Root>
   );
 };

package/src/components/SimpleLayout/index.ts

@@ -2,4 +2,7 @@
 // Copyright 2026 DXOS.org
 //
 
+export * from './AppBar';
+export * from './Main';
+export * from './NavBar';
 export * from './SimpleLayout';

package/src/components/Workspace/Workspace.tsx

@@ -4,11 +4,12 @@
 
 import React, { useCallback, useEffect, useRef } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useAppGraph, useOperationInvoker } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { type Node, useConnections } from '@dxos/plugin-graph';
-import { Avatar, Icon, Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { Card, Layout, Mosaic, type StackTileComponent } from '@dxos/react-ui-mosaic';
+import { Avatar, Icon, Layout, ScrollArea, Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { Card, Mosaic, type MosaicStackTileComponent } from '@dxos/react-ui-mosaic';
 import { SearchList, useSearchListItem, useSearchListResults } from '@dxos/react-ui-searchlist';
 import { mx } from '@dxos/ui-theme';
 
@@ -20,9 +21,10 @@ export type WorkspaceProps = {
 };
 
 /**
- *
+ * Displays the contents of a workspace disposition graph node as a searchable list.
+ * Shows direct children of the workspace with icons and labels,
+ * allowing users to filter via search and navigate by selecting an item.
  */
-// TODO(burdon): Rename or motivate name in comment.
 export const Workspace = ({ id }: WorkspaceProps) => {
   const { t } = useTranslation(meta.id);
   const { graph } = useAppGraph();
@@ -46,9 +48,11 @@ export const Workspace = ({ id }: WorkspaceProps) => {
         </Toolbar.Root>
         <SearchList.Content>
           <Mosaic.Container asChild>
-            <Mosaic.Viewport padding>
-              <Mosaic.Stack items={results} getId={(child) => child.id} Tile={WorkspaceChildTile} />
-            </Mosaic.Viewport>
+            <ScrollArea.Root orientation='vertical'>
+              <ScrollArea.Viewport classNames='p-2'>
+                <Mosaic.Stack items={results} getId={(child) => child.id} Tile={WorkspaceChildTile} />
+              </ScrollArea.Viewport>
+            </ScrollArea.Root>
           </Mosaic.Container>
         </SearchList.Content>
       </SearchList.Root>
@@ -56,7 +60,8 @@ export const Workspace = ({ id }: WorkspaceProps) => {
   );
 };
 
-const WorkspaceChildTile: StackTileComponent<Node.Node> = ({ data }) => {
+const WorkspaceChildTile: MosaicStackTileComponent<Node.Node> = (props) => {
+  const data = props.data;
   const { t } = useTranslation(meta.id);
   const { invokeSync } = useOperationInvoker();
   const ref = useRef<HTMLDivElement>(null);
@@ -66,7 +71,7 @@ const WorkspaceChildTile: StackTileComponent<Node.Node> = ({ data }) => {
   const name = toLocalizedString(data.properties.label, t);
 
   const handleSelect = useCallback(
-    () => invokeSync(Common.LayoutOperation.Open, { subject: [data.id] }),
+    () => invokeSync(LayoutOperation.Open, { subject: [data.id] }),
     [invokeSync, data.id],
   );
 

package/src/components/hooks.ts

@@ -4,7 +4,7 @@
 
 import { useEffect } from 'react';
 
-import { useAppGraph } from '@dxos/app-framework/react';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { Graph } from '@dxos/plugin-graph';
 
 /**
@@ -14,17 +14,13 @@ export const useLoadDescendents = (nodeId?: string) => {
   const { graph } = useAppGraph();
 
   useEffect(() => {
-    const frame = requestAnimationFrame(() => {
-      if (nodeId) {
-        // First level: expand the node itself.
-        Graph.expand(graph, nodeId, 'outbound');
-        // Second level: expand each child.
-        Graph.getConnections(graph, nodeId, 'outbound').forEach((child) => {
-          Graph.expand(graph, child.id, 'outbound');
-        });
-      }
-    });
-
-    return () => cancelAnimationFrame(frame);
+    if (nodeId) {
+      // First level: expand the node itself.
+      Graph.expand(graph, nodeId, 'outbound');
+      // Second level: expand each child.
+      Graph.getConnections(graph, nodeId, 'outbound').forEach((child) => {
+        Graph.expand(graph, child.id, 'outbound');
+      });
+    }
   }, [nodeId, graph]);
 };

package/src/components/index.ts

@@ -4,6 +4,7 @@
 
 export * from './ContentLoading';
 export * from './Home';
+export * from './MobileLayout';
 export * from './Popover';
 export * from './SimpleLayout';
 export * from './Workspace';

package/src/hooks/actions.ts

@@ -0,0 +1,85 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Atom } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+
+import { type Capabilities } from '@dxos/app-framework';
+import { type AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import { Node } from '@dxos/plugin-graph';
+import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
+import { type ActionGraphProps } from '@dxos/react-ui-menu';
+import { byPosition } from '@dxos/util';
+
+import { type SimpleLayoutState } from '../types';
+
+// TODO(wittjosiah): Factor out to shared location with plugin-deck.
+export const PLANK_COMPANION_TYPE = 'dxos.org/plugin/deck/plank-companion';
+
+export type CompanionActionsConfig = {
+  /** Prefix for companion action IDs (e.g. 'navbar' or 'drawer') */
+  idPrefix: string;
+  /** Optional: highlight companion with this variant */
+  selectedVariant?: string;
+  /** invokeSync function for dispatching operations */
+  invokeSync: Capabilities.OperationInvoker['invokeSync'];
+};
+
+/**
+ * Creates action graph nodes and edges for companion actions.
+ * Shared logic between useNavbarActions and useDrawerActions.
+ */
+// TODO(burdon): Use builder pattern.
+export const createCompanionActions = (
+  graph: AppCapabilities.AppGraph['graph'],
+  stateAtom: Atom.Atom<SimpleLayoutState>,
+  get: (atom: Atom.Atom<any>) => any,
+  config: CompanionActionsConfig,
+): Pick<ActionGraphProps, 'nodes' | 'edges'> => {
+  const { idPrefix, selectedVariant, invokeSync } = config;
+
+  // Derive activeId from state atom.
+  const state = get(stateAtom);
+  const activeId = state.active ?? state.workspace;
+
+  // Get companions from graph connections for activeId.
+  const activeConnections = activeId ? get(graph.connections(activeId)) : [];
+  const companions = activeConnections
+    .filter((node: Node.Node) => node.type === PLANK_COMPANION_TYPE)
+    .toSorted((a: Node.Node, b: Node.Node) => byPosition(a.properties, b.properties));
+
+  const nodes: ActionGraphProps['nodes'] = [];
+  const edges: ActionGraphProps['edges'] = [];
+
+  // Add companion actions.
+  // TODO(burdon): Cap at 6 items.
+  companions.forEach((companion: Node.Node) => {
+    // Extract variant for highlighting if needed.
+    const [, companionVariant] = companion.id.split(ATTENDABLE_PATH_SEPARATOR);
+
+    const companionAction = {
+      id: `${idPrefix}-companion-${companion.id}`,
+      type: Node.ActionType,
+      properties: {
+        icon: companion.properties.icon ?? 'ph--placeholder--regular',
+        label: companion.properties.label,
+        iconOnly: true,
+        // Conditionally add variant highlighting.
+        ...(selectedVariant !== undefined && {
+          variant: selectedVariant === companionVariant ? 'primary' : 'ghost',
+        }),
+      },
+      data: () =>
+        Effect.sync(() =>
+          invokeSync(LayoutOperation.Open, {
+            subject: [companion.id],
+          }),
+        ),
+    };
+    nodes.push(companionAction);
+    edges.push({ source: 'root', target: companionAction.id });
+  });
+
+  return { nodes, edges };
+};

package/src/hooks/index.ts

@@ -2,4 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
+export * from './useAppBarProps';
+export * from './useCompanions';
+export * from './actions';
+export * from './useDrawerActions';
+export * from './useNavbarActions';
 export * from './useSimpleLayoutState';

package/src/hooks/useAppBarProps.ts

@@ -0,0 +1,112 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Atom, useAtomValue } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+import { useCallback, useMemo } from 'react';
+
+import { useCapability, useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
+import { Graph, Node, useActionRunner, useNode } from '@dxos/plugin-graph';
+import { toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { type ActionGraphProps } from '@dxos/react-ui-menu';
+
+import { type AppBarProps } from '../components';
+import { meta } from '../meta';
+import { SimpleLayoutState as SimpleLayoutStateCapability } from '../types';
+
+/**
+ * Hook that computes all AppBar props from the app graph.
+ * Derives activeId from state atom. Returns props ready to spread into the AppBar component.
+ */
+export const useAppBarProps = (): Omit<AppBarProps, 'classNames'> => {
+  const { t } = useTranslation(meta.id);
+  const stateAtom = useCapability(SimpleLayoutStateCapability);
+  const state = useAtomValue(stateAtom);
+  const { graph } = useAppGraph();
+  const { invokeSync } = useOperationInvoker();
+  const runAction = useActionRunner();
+
+  // Derive activeId from state.
+  const activeId = state.active ?? state.workspace;
+  const node = useNode(graph, activeId);
+
+  // Compute title from node label.
+  const title = node ? toLocalizedString(node.properties.label, t) : undefined;
+
+  // Build actions atom filtering by disposition.
+  // Derive activeId from state atom so we don't need to recreate this atom when it changes.
+  const actionsAtom = useMemo(
+    () =>
+      Atom.make((get): ActionGraphProps => {
+        const state = get(stateAtom);
+        const activeId = state.active ?? state.workspace;
+        const allActions = activeId ? get(graph.actions(activeId)) : [];
+        const filtered = allActions.filter((action) =>
+          ['list-item', 'list-item-primary', 'heading-list-item'].includes(action.properties.disposition),
+        );
+        const nodes: ActionGraphProps['nodes'] = filtered as ActionGraphProps['nodes'];
+        const edges: ActionGraphProps['edges'] = filtered.map((action) => ({ source: 'root', target: action.id }));
+
+        // Add alternate-tree action (e.g. Settings) from the workspace node.
+        const workspaceConnections = state.workspace ? get(graph.connections(state.workspace)) : [];
+        const alternateTreeNode = workspaceConnections.find(
+          (node: Node.Node) => node.properties.disposition === 'alternate-tree',
+        );
+        if (alternateTreeNode && activeId !== alternateTreeNode.id) {
+          const settingsAction = {
+            id: `appbar-settings-${alternateTreeNode.id}`,
+            type: Node.ActionType,
+            data: () => Effect.sync(() => invokeSync(LayoutOperation.Open, { subject: [alternateTreeNode.id] })),
+            properties: {
+              label: alternateTreeNode.properties.label ?? alternateTreeNode.id,
+              icon: alternateTreeNode.properties.icon ?? 'ph--placeholder--regular',
+            },
+          };
+          nodes.push(settingsAction);
+          edges.push({ source: 'root', target: settingsAction.id });
+        }
+
+        return { nodes, edges };
+      }),
+    [graph, stateAtom],
+  );
+
+  // Back button logic.
+  const showBackButton = activeId !== undefined && activeId !== Node.RootId;
+
+  const onBack = useCallback(() => {
+    if (state.active) {
+      const isWorkspace = Graph.getNode(graph, state.active).pipe(
+        Option.map((node) => node.properties.disposition === 'workspace'),
+        Option.getOrElse(() => false),
+      );
+
+      // If history is empty and this is a workspace, go to home.
+      if (state.history.length === 0 && isWorkspace) {
+        invokeSync(LayoutOperation.SwitchWorkspace, { subject: Node.RootId });
+      } else {
+        // Otherwise, close (which will pop from history or clear active).
+        invokeSync(LayoutOperation.Close, { subject: [state.active] });
+      }
+    } else {
+      invokeSync(LayoutOperation.SwitchWorkspace, { subject: Node.RootId });
+    }
+  }, [graph, invokeSync, state.active, state.history.length]);
+
+  // Compute popover anchor ID.
+  const popoverAnchorId =
+    node && state.popoverAnchorId === `dxos.org/ui/${meta.id}/${node.id}` ? state.popoverAnchorId : undefined;
+
+  return {
+    title,
+    actions: actionsAtom,
+    showBackButton,
+    popoverAnchorId,
+    onBack: onBack,
+    onAction: runAction,
+  };
+};

package/src/hooks/useCompanions.ts

@@ -0,0 +1,22 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo } from 'react';
+
+import { useAppGraph } from '@dxos/app-toolkit/ui';
+import { useConnections } from '@dxos/plugin-graph';
+import { byPosition } from '@dxos/util';
+
+import { PLANK_COMPANION_TYPE } from './actions';
+
+/**
+ * @deprecated Adopt the pattern from useNavbarActions (deriving from graph atoms)
+ *   or merge the Drawer companion display into the NavBar component.
+ */
+export const useCompanions = (nodeId?: string) => {
+  const { graph } = useAppGraph();
+  const nodes = useConnections(graph, nodeId);
+  const companions = nodes.filter((node) => node.type === PLANK_COMPANION_TYPE);
+  return useMemo(() => companions.toSorted((a, b) => byPosition(a.properties, b.properties)), [companions]);
+};