@dxos/plugin-simple-layout 0.8.4-main.69d29f4 → 0.8.4-main.7996785055

package/src/components/SimpleLayout/AppBar.tsx

@@ -0,0 +1,93 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Atom, useAtomValue } from '@effect-atom/atom-react';
+import React, { Fragment } from 'react';
+
+import { IconButton, Popover, Toolbar, useTranslation } from '@dxos/react-ui';
+import { type ActionExecutor, type ActionGraphProps, Menu, useMenuActions } from '@dxos/react-ui-menu';
+import { composable, composableProps, osTranslations } from '@dxos/ui-theme';
+
+import { meta } from '../../meta';
+import { useMobileLayout } from '../MobileLayout';
+
+const APP_BAR_NAME = 'SimpleLayout.AppBar';
+
+export type AppBarProps = {
+  /** Title/label to display in the banner. */
+  title?: string;
+  /** Action graph atom for the dropdown menu. */
+  actions: Atom.Atom<ActionGraphProps>;
+  /** Whether to show the back button. */
+  showBackButton?: boolean;
+  /** Popover anchor ID for the dropdown trigger. */
+  popoverAnchorId?: string;
+  /** Action executor callback. */
+  onAction?: ActionExecutor;
+  /** Callback when back button is clicked. */
+  onBack?: () => void;
+};
+
+/**
+ * AppBar component that renders a title, optional back button, and actions dropdown.
+ */
+export const AppBar = composable<HTMLDivElement, AppBarProps>(
+  ({ classNames, title, actions, showBackButton, popoverAnchorId, onAction, onBack, ...props }, forwardedRef) => {
+    const { t } = useTranslation(meta.id);
+    const menuActions = useMenuActions(actions);
+    const actionsValue = useAtomValue(actions);
+    const hasActions = actionsValue.nodes.length > 0;
+    const { keyboardOpen } = useMobileLayout(APP_BAR_NAME);
+
+    // Fall back to app name if no title provided.
+    const displayTitle = title ?? t('current app name', { ns: osTranslations });
+
+    // Wrap the menu trigger with Popover.Anchor when the popoverAnchorId is set.
+    const AnchorRoot = popoverAnchorId ? Popover.Anchor : Fragment;
+
+    return (
+      <Toolbar.Root
+        {...composableProps(props, {
+          role: 'banner',
+          classNames: 'grid grid-cols-[var(--dx-rail-size)_1fr_var(--dx-rail-size)] items-center dx-density-fine',
+        })}
+        ref={forwardedRef}
+      >
+        {keyboardOpen ? (
+          <IconButton variant='ghost' icon='ph--x--regular' iconOnly label={t('done label')} />
+        ) : showBackButton ? (
+          <IconButton
+            variant='ghost'
+            icon='ph--caret-left--regular'
+            iconOnly
+            label={t('back label')}
+            onClick={onBack}
+          />
+        ) : (
+          <div />
+        )}
+        <h1 className='text-center truncate font-thin uppercase'>{displayTitle}</h1>
+        {hasActions ? (
+          <AnchorRoot>
+            <Menu.Root {...menuActions} caller={meta.id} onAction={onAction}>
+              <Menu.Trigger asChild>
+                <IconButton
+                  variant='ghost'
+                  icon='ph--dots-three-vertical--regular'
+                  iconOnly
+                  label={t('actions menu label')}
+                />
+              </Menu.Trigger>
+              <Menu.Content />
+            </Menu.Root>
+          </AnchorRoot>
+        ) : (
+          <span />
+        )}
+      </Toolbar.Root>
+    );
+  },
+);
+
+AppBar.displayName = APP_BAR_NAME;

package/src/components/SimpleLayout/Drawer.tsx

@@ -0,0 +1,96 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+import { getCompanionVariant } from '@dxos/app-toolkit';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
+import { type Node, useNode } from '@dxos/plugin-graph';
+import { ErrorFallback, Panel } from '@dxos/react-ui';
+import { Menu, useMenuActions } from '@dxos/react-ui-menu';
+
+import { useCompanions, useDrawerActions, useSimpleLayoutState } from '../../hooks';
+import { Loading } from '../Loading';
+
+const DRAWER_NAME = 'SimpleLayout.Drawer';
+
+/**
+ * Companion drawer component.
+ */
+export const Drawer = () => {
+  const { graph } = useAppGraph();
+  const { state: layoutState } = useSimpleLayoutState();
+
+  const placeholder = useMemo(() => <Loading />, []);
+
+  // Get all companions for the current active (primary) item.
+  const activeId = layoutState.active ?? layoutState.workspace;
+  const companions = useCompanions(activeId);
+  const { companionId, variant } = useSelectedCompanion(companions, layoutState.companionVariant);
+
+  // Get node for the selected companion.
+  const node = useNode(graph, companionId);
+  const parentNode = useNode(graph, activeId);
+
+  // Build Surface data for the companion content.
+  const data = useMemo(() => {
+    return (
+      node && {
+        attendableId: companionId,
+        subject: node.data,
+        companionTo: parentNode?.data,
+        properties: node.properties,
+        variant,
+      }
+    );
+  }, [companionId, node, parentNode, variant]);
+
+  // Get drawer actions (tabs + toolbar buttons).
+  const { actions, onAction } = useDrawerActions(DRAWER_NAME);
+  const menuActions = useMenuActions(actions);
+
+  return (
+    <Panel.Root>
+      <Panel.Toolbar>
+        <Menu.Root {...menuActions} alwaysActive onAction={onAction}>
+          <Menu.Toolbar />
+        </Menu.Root>
+      </Panel.Toolbar>
+      <Panel.Content>
+        <Surface.Surface role='article' data={data} limit={1} fallback={ErrorFallback} placeholder={placeholder} />
+      </Panel.Content>
+    </Panel.Root>
+  );
+};
+
+Drawer.displayName = DRAWER_NAME;
+
+/**
+ * Resolves which companion to show based on variant preference.
+ * Falls back to first available if preferred variant not available.
+ */
+const useSelectedCompanion = (companions: Node.Node[], preferredVariant?: string) => {
+  const selectedCompanion = useMemo(() => {
+    if (companions.length === 0) {
+      return undefined;
+    }
+
+    // Try to find companion matching the preferred variant.
+    if (preferredVariant) {
+      const preferred = companions.find((c) => getCompanionVariant(c.id) === preferredVariant);
+      if (preferred) {
+        return preferred;
+      }
+    }
+
+    // Fallback to first companion.
+    return companions[0];
+  }, [companions, preferredVariant]);
+
+  const companionId = selectedCompanion?.id;
+  const variant = companionId ? getCompanionVariant(companionId) : undefined;
+
+  return { selectedCompanion, companionId, variant };
+};

package/src/components/SimpleLayout/Main.tsx

@@ -2,80 +2,77 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback, useMemo } from 'react';
+import React, { useMemo } from 'react';
 
-import { Surface, useAppGraph } from '@dxos/app-framework/react';
-import { log } from '@dxos/log';
+import { Surface } from '@dxos/app-framework/ui';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { useNode } from '@dxos/plugin-graph';
-import { Main as NaturalMain } from '@dxos/react-ui';
-import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
-import { Mosaic } from '@dxos/react-ui-mosaic';
-import { mx } from '@dxos/ui-theme';
+import { ErrorFallback, Panel } from '@dxos/react-ui';
+import { useAttentionAttributes } from '@dxos/react-ui-attention';
 
-import { useSimpleLayoutState } from '../../hooks';
-import { ContentError } from '../ContentError';
-import { ContentLoading } from '../ContentLoading';
+import { useAppBarProps, useNavbarActions, useSimpleLayoutState } from '../../hooks';
+import { Loading } from '../Loading';
+import { useExpandPath } from '../hooks';
+import { useMobileLayout } from '../MobileLayout';
 
-import { Banner } from './Banner';
+import { AppBar } from './AppBar';
 import { NavBar } from './NavBar';
 
+const MAIN_NAME = 'SimpleLayout.Main';
+
 /**
- * Main root component.
+ * Main content component.
  */
 export const Main = () => {
   const { state } = useSimpleLayoutState();
   const id = state.active ?? state.workspace;
-  const showNavBar = !state.isPopover;
-  const { graph } = useAppGraph();
-  const node = useNode(graph, id);
+  const attentionAttrs = useAttentionAttributes(id);
+  const { keyboardOpen } = useMobileLayout(MAIN_NAME);
+  const { actions, onAction } = useNavbarActions();
+  const appBarProps = useAppBarProps();
 
-  const placeholder = useMemo(() => <ContentLoading />, []);
+  const placeholder = useMemo(() => <Loading />, []);
 
+  const { graph } = useAppGraph();
+  const node = useNode(graph, id);
   const data = useMemo(() => {
-    const { variant } = parseEntryId(id);
     return (
       node && {
         attendableId: id,
         subject: node.data,
         properties: node.properties,
         popoverAnchorId: state.popoverAnchorId,
-        variant,
       }
     );
   }, [id, node, node?.data, node?.properties, state.popoverAnchorId]);
 
-  const handleActiveIdChange = useCallback((nextActiveId: string | null) => {
-    log.info('navigate', { nextActiveId });
-  }, []);
+  useExpandPath(id);
+
+  // TODO(burdon): BUG: When showing ANY statusbar the size progressively shrinks when the keyboard opens/closes.
+  const showNavBar = !keyboardOpen && !state.isPopover && state.drawerState === 'closed';
 
   return (
-    <Mosaic.Root>
-      <NaturalMain.Root complementarySidebarState='closed' navigationSidebarState='closed'>
-        <NaturalMain.Content
-          bounce
-          classNames={mx(
-            'dx-mobile-main dx-mobile-main-scroll-area--flush',
-            'grid bs-full overflow-hidden',
-            showNavBar ? 'grid-rows-[min-content_1fr_min-content]' : 'grid-rows-[min-content_1fr]',
-          )}
-        >
-          <Banner classNames='border-be border-separator' node={node} />
-          <article className='contents'>
-            <Surface key={id} role='article' data={data} limit={1} fallback={ContentError} placeholder={placeholder} />
-          </article>
-          {showNavBar && (
-            <NavBar classNames='border-bs border-separator' activeId={id} onActiveIdChange={handleActiveIdChange} />
-          )}
-        </NaturalMain.Content>
-      </NaturalMain.Root>
-    </Mosaic.Root>
+    <Panel.Root {...attentionAttrs} className='dx-document'>
+      <Panel.Toolbar asChild>
+        <AppBar {...appBarProps} />
+      </Panel.Toolbar>
+      <Panel.Content role='article' className='bg-base-surface'>
+        <Surface.Surface
+          key={id}
+          role='article'
+          data={data}
+          limit={1}
+          fallback={ErrorFallback}
+          placeholder={placeholder}
+        />
+      </Panel.Content>
+      {showNavBar && (
+        <Panel.Statusbar asChild>
+          <NavBar actions={actions} onAction={onAction} />
+        </Panel.Statusbar>
+      )}
+    </Panel.Root>
   );
 };
 
-// TODO(wittjosiah): Factor out. Copied from deck plugin.
-const parseEntryId = (entryId: string) => {
-  const [id, variant] = entryId.split(ATTENDABLE_PATH_SEPARATOR);
-  return { id, variant };
-};
-
-Main.displayName = 'SimpleLayout.Main';
+Main.displayName = MAIN_NAME;

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

@@ -2,58 +2,163 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Atom } from '@effect-atom/atom-react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useMemo } from 'react';
+import { type Mock, expect, fn, screen, userEvent, within } from 'storybook/test';
 
-import { withPluginManager } from '@dxos/app-framework/testing';
-import { corePlugins } from '@dxos/plugin-testing';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { type ActionGraphProps, createGapSeparator, createMenuAction, createMenuItemGroup } from '@dxos/react-ui-menu';
+import { withRegistry } from '@dxos/storybook-utils';
 
 import { translations } from '../../translations';
 
 import { NavBar } from './NavBar';
 
+const MAIN_MENU_GROUP_ID = 'navbar-main-menu';
+
+const buildEmptyActions = (): ActionGraphProps => ({ nodes: [], edges: [] });
+
+const buildCompanionOnlyActions = (): ActionGraphProps => {
+  const result: ActionGraphProps = { nodes: [], edges: [] };
+  const companions = [
+    createMenuAction('companion-browse', () => console.log('Browse'), {
+      icon: 'ph--house--regular',
+      label: 'Browse',
+      iconOnly: true,
+    }),
+    createMenuAction('companion-notifications', () => console.log('Notifications'), {
+      icon: 'ph--bell--regular',
+      label: 'Notifications',
+      iconOnly: true,
+    }),
+    createMenuAction('companion-profile', () => console.log('Profile'), {
+      icon: 'ph--user--regular',
+      label: 'Profile',
+      iconOnly: true,
+    }),
+  ];
+  result.nodes.push(...companions);
+  result.edges.push(...companions.map((c) => ({ source: 'root', target: c.id, relation: 'child' })));
+  return result;
+};
+
+const buildDefaultActions = (): ActionGraphProps => {
+  const result: ActionGraphProps = { nodes: [], edges: [] };
+  const gapSeparator = createGapSeparator('navbar-gap');
+  const mainMenuGroup = createMenuItemGroup(MAIN_MENU_GROUP_ID, {
+    variant: 'dropdownMenu',
+    icon: 'ph--plus--regular',
+    iconOnly: true,
+    label: 'Main menu',
+    testId: 'simpleLayoutPlugin.addSpace',
+  });
+  const companions = [
+    createMenuAction('companion-browse', () => console.log('Browse'), {
+      icon: 'ph--house--regular',
+      label: 'Browse',
+      iconOnly: true,
+    }),
+    createMenuAction('companion-notifications', () => console.log('Notifications'), {
+      icon: 'ph--bell--regular',
+      label: 'Notifications',
+      iconOnly: true,
+    }),
+  ];
+  const menuActions = [
+    createMenuAction('action-create-space', () => console.log('Create space'), {
+      icon: 'ph--planet--regular',
+      label: 'Create space',
+    }),
+    createMenuAction('action-join-space', () => console.log('Join space'), {
+      icon: 'ph--sign-in--regular',
+      label: 'Join space',
+    }),
+    createMenuAction('action-settings', () => console.log('Settings'), {
+      icon: 'ph--gear--regular',
+      label: 'Settings',
+    }),
+  ];
+  result.nodes.push(...companions, ...gapSeparator.nodes, mainMenuGroup, ...menuActions);
+  result.edges.push(
+    ...companions.map((c) => ({ source: 'root', target: c.id, relation: 'child' })),
+    ...gapSeparator.edges,
+    { source: 'root', target: mainMenuGroup.id, relation: 'child' },
+    ...menuActions.map((action) => ({ source: MAIN_MENU_GROUP_ID, target: action.id, relation: 'child' })),
+  );
+  return result;
+};
+
 const meta = {
-  title: 'plugins/plugin-simple-layout/NavBar',
+  title: 'plugins/plugin-simple-layout/components/NavBar',
   component: NavBar,
-  decorators: [
-    withTheme,
-    withPluginManager({
-      plugins: [...corePlugins()],
-    }),
-  ],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' }), withRegistry],
   parameters: {
     layout: 'fullscreen',
     translations,
   },
-  argTypes: {
-    onActiveIdChange: { action: 'activeIdChanged' },
-  },
 } satisfies Meta<typeof NavBar>;
 
 export default meta;
 
 type Story = StoryObj<typeof meta>;
 
+const DefaultStory = ({ onAction }: { onAction: (action: { id: string }) => void }) => {
+  const actions = useMemo(() => Atom.make(buildDefaultActions()).pipe(Atom.keepAlive), []);
+
+  return <NavBar classNames='border-y border-separator' actions={actions} onAction={onAction} />;
+};
+
 export const Default: Story = {
+  tags: ['test'],
   args: {
-    activeId: undefined,
+    onAction: fn(),
+  } as any,
+  render: (args: any) => <DefaultStory onAction={args.onAction} />,
+  play: async ({ args, canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Verify the navbar renders with the toolbar.
+    await expect(canvas.getByRole('toolbar')).toBeInTheDocument();
+
+    // Test companion action click (Browse button).
+    const browseButton = canvas.getByRole('button', { name: /browse/i });
+    await expect(browseButton).toBeInTheDocument();
+    await userEvent.click(browseButton);
+    await expect(args.onAction).toHaveBeenCalledTimes(1);
+    await expect((args.onAction as Mock).mock.calls[0][0]).toHaveProperty('id', 'companion-browse');
+
+    // Test dropdown menu opens and action fires.
+    const menuTrigger = canvas.getByRole('button', { name: /main menu/i });
+    await expect(menuTrigger).toBeInTheDocument();
+    await userEvent.click(menuTrigger);
+
+    // Wait for menu to open and click an action (menu items render in a portal).
+    const createSpaceAction = await screen.findByRole('menuitem', { name: /create space/i });
+    await userEvent.click(createSpaceAction);
+    await expect(args.onAction).toHaveBeenCalledTimes(2);
+    await expect((args.onAction as Mock).mock.calls[1][0]).toHaveProperty('id', 'action-create-space');
   },
 };
 
-export const BrowseActive: Story = {
-  args: {
-    activeId: 'some-document',
-  },
+const CompanionsOnlyStory = () => {
+  const actions = useMemo(() => Atom.make(buildCompanionOnlyActions()).pipe(Atom.keepAlive), []);
+
+  return <NavBar actions={actions} onAction={(action) => console.log('Action:', action.id)} />;
 };
 
-export const NotificationsActive: Story = {
-  args: {
-    activeId: 'notifications',
-  },
+export const CompanionsOnly: Story = {
+  args: {} as any,
+  render: () => <CompanionsOnlyStory />,
 };
 
-export const ProfileActive: Story = {
-  args: {
-    activeId: 'profile',
-  },
+const EmptyStory = () => {
+  const actions = useMemo(() => Atom.make(buildEmptyActions()).pipe(Atom.keepAlive), []);
+
+  return <NavBar actions={actions} onAction={(action) => console.log('Action:', action.id)} />;
+};
+
+export const Empty: Story = {
+  args: {} as any,
+  render: () => <EmptyStory />,
 };

package/src/components/SimpleLayout/NavBar.tsx

@@ -2,73 +2,32 @@
 // 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 { mx } from '@dxos/ui-theme';
+import { type ActionExecutor, type ActionGraphProps, Menu, useMenuActions } from '@dxos/react-ui-menu';
+import { composable, composableProps } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+const NAVBAR_NAME = 'SimpleLayout.NavBar';
 
-export type NavBarProps = ThemedClassName<{
-  activeId?: string;
-  onActiveIdChange?: (nextActiveId: string | null) => void;
-}>;
-
-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');
+export type NavBarProps = {
+  /** Action graph atom for the toolbar. */
+  actions: Atom.Atom<ActionGraphProps>;
+  /** Action executor callback. */
+  onAction?: ActionExecutor;
+};
 
-  const isBrowseActive = activeId !== 'notifications' && activeId !== 'profile';
+/**
+ * Presentational navbar component that renders a toolbar from an action graph.
+ */
+export const NavBar = composable<HTMLDivElement, NavBarProps>(({ actions, onAction, ...props }, forwardedRef) => {
+  const menuActions = 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>
+    <Menu.Root {...menuActions} alwaysActive onAction={onAction}>
+      <Menu.Toolbar {...composableProps(props)} ref={forwardedRef} />
+    </Menu.Root>
   );
-};
+});
+
+NavBar.displayName = NAVBAR_NAME;