@dxos/plugin-simple-layout 0.8.4-main.fcc0d83b33 → 0.8.4-staging.60fe92afc8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-simple-layout",
-  "version": "0.8.4-main.fcc0d83b33",
+  "version": "0.8.4-staging.60fe92afc8",
   "description": "Simple layout plugin for minimal UI contexts like popover windows.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,31 +8,67 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#hooks": "./src/hooks/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
-    "#translations": "./src/translations.ts",
-    "#types": "./src/types/index.ts"
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": "./src/SimpleLayoutPlugin.ts",
+      "types": "./dist/types/src/SimpleLayoutPlugin.d.ts",
+      "default": "./dist/lib/neutral/SimpleLayoutPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
     "./translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "browser": "./dist/lib/browser/translations.mjs",
-      "node": "./dist/lib/node-esm/translations.mjs"
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -41,52 +77,49 @@
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
     "@radix-ui/react-context": "1.1.1",
-    "@tauri-apps/plugin-deep-link": "^2.2.0",
-    "@tauri-apps/plugin-haptics": "^2.3.2",
-    "@dxos/app-framework": "0.8.4-main.fcc0d83b33",
-    "@dxos/app-toolkit": "0.8.4-main.fcc0d83b33",
-    "@dxos/async": "0.8.4-main.fcc0d83b33",
-    "@dxos/echo": "0.8.4-main.fcc0d83b33",
-    "@dxos/compute": "0.8.4-main.fcc0d83b33",
-    "@dxos/context": "0.8.4-main.fcc0d83b33",
-    "@dxos/effect": "0.8.4-main.fcc0d83b33",
-    "@dxos/plugin-client": "0.8.4-main.fcc0d83b33",
-    "@dxos/plugin-graph": "0.8.4-main.fcc0d83b33",
-    "@dxos/log": "0.8.4-main.fcc0d83b33",
-    "@dxos/react-ui-attention": "0.8.4-main.fcc0d83b33",
-    "@dxos/react-ui-menu": "0.8.4-main.fcc0d83b33",
-    "@dxos/react-ui-mosaic": "0.8.4-main.fcc0d83b33",
-    "@dxos/react-ui-stack": "0.8.4-main.fcc0d83b33",
-    "@dxos/react-ui-search": "0.8.4-main.fcc0d83b33",
-    "@dxos/schema": "0.8.4-main.fcc0d83b33",
-    "@dxos/util": "0.8.4-main.fcc0d83b33"
+    "@tauri-apps/plugin-deep-link": "^2.4.9",
+    "@dxos/app-framework": "0.8.4-staging.60fe92afc8",
+    "@dxos/compute": "0.8.4-staging.60fe92afc8",
+    "@dxos/app-toolkit": "0.8.4-staging.60fe92afc8",
+    "@dxos/context": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo": "0.8.4-staging.60fe92afc8",
+    "@dxos/log": "0.8.4-staging.60fe92afc8",
+    "@dxos/keys": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-client": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-graph": "0.8.4-staging.60fe92afc8",
+    "@dxos/effect": "0.8.4-staging.60fe92afc8",
+    "@dxos/async": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-attention": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-menu": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-mosaic": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-search": "0.8.4-staging.60fe92afc8",
+    "@dxos/util": "0.8.4-staging.60fe92afc8"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.20.0",
+    "effect": "3.21.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/app-graph": "0.8.4-main.fcc0d83b33",
-    "@dxos/plugin-preview": "0.8.4-main.fcc0d83b33",
-    "@dxos/plugin-search": "0.8.4-main.fcc0d83b33",
-    "@dxos/plugin-testing": "0.8.4-main.fcc0d83b33",
-    "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
-    "@dxos/plugin-space": "0.8.4-main.fcc0d83b33",
-    "@dxos/schema": "0.8.4-main.fcc0d83b33",
-    "@dxos/storybook-utils": "0.8.4-main.fcc0d83b33",
-    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33"
+    "vite": "^8.0.16",
+    "@dxos/app-graph": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-preview": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-testing": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-space": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
+    "@dxos/schema": "0.8.4-staging.60fe92afc8",
+    "@dxos/storybook-utils": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-search": "0.8.4-staging.60fe92afc8"
   },
   "peerDependencies": {
-    "effect": "3.20.0",
+    "effect": "3.21.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
-    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33"
+    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui": "0.8.4-staging.60fe92afc8"
   },
   "publishConfig": {
     "access": "public"

package/src/SimpleLayoutPlugin.ts

@@ -50,8 +50,10 @@ export const SimpleLayoutPlugin = Plugin.define<SimpleLayoutPluginOptions>(meta)
   }),
   Plugin.addModule({
     id: Capability.getModuleTag(UrlHandler),
-    activatesOn: ActivationEvent.allOf(ActivationEvents.OperationInvokerReady, SimpleLayoutEvents.StateReady),
+    activatesOn: ActivationEvent.allOf(ActivationEvents.ProcessManagerReady, SimpleLayoutEvents.StateReady),
     activate: UrlHandler,
   }),
   Plugin.make,
 );
+
+export default SimpleLayoutPlugin;

package/src/capabilities/app-graph-builder.ts

@@ -11,7 +11,7 @@ import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* GraphBuilder.createExtension({
-      id: 'org.dxos.plugin.simple-layout.not-found',
+      id: 'org.dxos.plugin.simpleLayout.notFound',
       match: NodeMatcher.whenRoot,
       connector: () => Effect.succeed([AppNode.makeNotFound()]),
     });

package/src/capabilities/react-surface.tsx

@@ -30,15 +30,15 @@ export default Capability.makeModule(() =>
         component: () => <Home />,
       }),
       Surface.create({
-        id: 'not-found',
+        id: 'notFound',
         role: 'article',
         filter: (data): data is SurfaceData => data.attendableId === NOT_FOUND_PATH,
         component: () => <NotFoundArticle />,
       }),
       Surface.create({
-        id: 'nav-branch',
+        id: 'navBranch',
         role: 'article',
-        position: 'fallback',
+        position: 'last',
         filter: (data): data is SurfaceData => {
           const props = data.properties as Record<string, any>;
           return ALLOWED_DISPOSITIONS.includes(props?.disposition) || props?.role === 'branch';

package/src/capabilities/state.tsx

@@ -9,10 +9,9 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { Node } from '@dxos/plugin-graph';
 
-import { type SimpleLayoutState } from '#types';
-import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
-const defaultState: SimpleLayoutState = {
+const defaultState: SimpleLayoutCapabilities.SimpleLayoutState = {
   dialogOpen: false,
   workspace: Node.RootId,
   previousWorkspace: Node.RootId,
@@ -23,12 +22,12 @@ const defaultState: SimpleLayoutState = {
 };
 
 export type SimpleLayoutStateOptions = {
-  initialState?: Partial<SimpleLayoutState>;
+  initialState?: Partial<SimpleLayoutCapabilities.SimpleLayoutState>;
 };
 
 export default Capability.makeModule(({ initialState }: SimpleLayoutStateOptions = {}) =>
   Effect.sync(() => {
-    const stateAtom = Atom.make<SimpleLayoutState>({ ...defaultState, ...initialState });
+    const stateAtom = Atom.make<SimpleLayoutCapabilities.SimpleLayoutState>({ ...defaultState, ...initialState });
 
     const layoutAtom = Atom.make((get): AppCapabilities.Layout => {
       const state = get(stateAtom);
@@ -45,7 +44,7 @@ export default Capability.makeModule(({ initialState }: SimpleLayoutStateOptions
     });
 
     return [
-      Capability.contributes(SimpleLayoutStateCapability, stateAtom),
+      Capability.contributes(SimpleLayoutCapabilities.State, stateAtom),
       Capability.contributes(AppCapabilities.Layout, layoutAtom),
     ];
   }),

package/src/capabilities/url-handler.ts

@@ -6,11 +6,11 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities, LayoutOperation, fromUrlPath, getWorkspaceFromPath, toUrlPath } from '@dxos/app-toolkit';
-import { runAndForwardErrors } from '@dxos/effect';
+import { EffectEx } from '@dxos/effect';
 import { log } from '@dxos/log';
 import { isTauri } from '@dxos/util';
 
-import { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 /**
  * URL handler for simple layout that syncs browser URL with layout state.
@@ -32,7 +32,7 @@ export default Capability.makeModule(
           handlers.map((handler) => handler(url)),
           { concurrency: 'unbounded' },
         );
-      }).pipe(Effect.provideService(Capability.Service, capabilities), runAndForwardErrors);
+      }).pipe(Effect.provideService(Capability.Service, capabilities), EffectEx.runAndForwardErrors);
 
     /**
      * Handle navigation from a URL.
@@ -99,19 +99,22 @@ export default Capability.makeModule(
     // Sync URL with layout state changes.
     let lastWorkspace: string | undefined;
     let lastActive: string | undefined;
-    const unsubscribe = yield* Capabilities.subscribeAtom(SimpleLayoutStateCapability, (state: SimpleLayoutState) => {
-      const { workspace, active } = state;
-
-      if (workspace !== lastWorkspace || active !== lastActive) {
-        lastWorkspace = workspace;
-        lastActive = active;
-
-        const path = active ? toUrlPath(active) : toUrlPath(workspace);
-        if (window.location.pathname !== path) {
-          history.pushState(null, '', `${path}${window.location.search}`);
+    const unsubscribe = yield* Capabilities.subscribeAtom(
+      SimpleLayoutCapabilities.State,
+      (state: SimpleLayoutCapabilities.SimpleLayoutState) => {
+        const { workspace, active } = state;
+
+        if (workspace !== lastWorkspace || active !== lastActive) {
+          lastWorkspace = workspace;
+          lastActive = active;
+
+          const path = active ? toUrlPath(active) : toUrlPath(workspace);
+          if (window.location.pathname !== path) {
+            history.pushState(null, '', `${path}${window.location.search}`);
+          }
         }
-      }
-    });
+      },
+    );
 
     return Capability.contributes(Capabilities.Null, null, () =>
       Effect.sync(() => {

package/src/components/Home/Home.tsx

@@ -100,11 +100,11 @@ const WorkspaceTile: MosaicStackTileComponent<Node.Node> = (props) => {
       fullWidth
       tabIndex={-1} // TODO(burdon): Use Mosaic.Focus.
       data-selected={isSelected}
-      classNames={mx('dx-focus-ring', isSelected && 'bg-hover-overlay')}
+      classNames={mx('dx-focus-ring', isSelected && 'bg-selected-surface')}
       onClick={handleSelect}
       ref={cardRef}
     >
-      <Card.Toolbar density='fine'>
+      <Card.Header density='md'>
         <Avatar.Root>
           <Avatar.Content
             icon={data.properties.icon}
@@ -117,7 +117,7 @@ const WorkspaceTile: MosaicStackTileComponent<Node.Node> = (props) => {
           <Avatar.Label classNames='cursor-pointer'>{name}</Avatar.Label>
           <Icon icon='ph--caret-right--regular' />
         </Avatar.Root>
-      </Card.Toolbar>
+      </Card.Header>
     </Card.Root>
   );
 };

package/src/components/Loading/Loading.tsx

@@ -6,5 +6,5 @@ import React from 'react';
 
 // TODO(burdon): Show skeleton: https://github.com/dxos/dxos/issues/8259
 export const Loading = () => {
-  return <div role='none' className='grid place-items-center dx-attention-surface' />;
+  return <div className='grid place-items-center dx-attention-surface' />;
 };

package/src/components/MobileLayout/MobileLayout.tsx

@@ -56,7 +56,6 @@ const MobileLayoutRoot = forwardRef<HTMLDivElement, MobileLayoutRootProps>(
       <MobileLayoutProvider keyboardOpen={keyboardOpen}>
         <div
           {...props}
-          role='none'
           style={{
             height: 'calc(100vh - var(--kb-height, 0px))',
             transition: `height ${keyboardOpen ? 0 : transition}ms ease-out`,
@@ -95,7 +94,6 @@ const MobileLayoutPanel = forwardRef<HTMLDivElement, MobileLayoutPanelProps>(
     return (
       <div
         {...props}
-        role='none'
         style={{
           paddingTop: safe?.top ? 'env(safe-area-inset-top)' : undefined,
           paddingBottom: safe?.bottom ? `calc((1 - var(--kb-open, 0)) * env(safe-area-inset-bottom))` : undefined,

package/src/components/NavBranch/NavBranch.tsx

@@ -102,10 +102,10 @@ const NavBranchTile: MosaicStackTileComponent<Node.Node> = (props) => {
       fullWidth
       tabIndex={-1} // TODO(burdon): Use Mosaic.Focus.
       data-selected={isSelected}
-      classNames={mx('dx-focus-ring cursor-pointer', isSelected && 'bg-hover-overlay')}
+      classNames={mx('dx-focus-ring cursor-pointer', isSelected && 'bg-selected-surface')}
       onClick={handleSelect}
     >
-      <Card.Toolbar>
+      <Card.Header>
         <Avatar.Root>
           <Avatar.Content
             hue={data.properties.hue}
@@ -118,7 +118,7 @@ const NavBranchTile: MosaicStackTileComponent<Node.Node> = (props) => {
           <Avatar.Label>{name}</Avatar.Label>
           <Icon icon='ph--caret-right--regular' />
         </Avatar.Root>
-      </Card.Toolbar>
+      </Card.Header>
     </Card.Root>
   );
 };

package/src/components/Popover/Popover.tsx

@@ -84,6 +84,7 @@ export const PopoverContent = () => {
     [handleClose],
   );
 
+  /* TODO(thure): Make this a constant and document it. */
   const collisionBoundaries: HTMLElement[] = useMemo(() => {
     const closest = state.popoverAnchor?.closest('[data-popover-collision-boundary]') as HTMLElement | null | undefined;
     return closest ? [closest] : [];
@@ -96,6 +97,7 @@ export const PopoverContent = () => {
         sticky='always'
         hideWhenDetached
         collisionBoundary={collisionBoundaries}
+        onOpenAutoFocus={(event) => event.preventDefault()}
         onInteractOutside={handleInteractOutside}
         onEscapeKeyDown={handleInteractOutside}
       >
@@ -105,12 +107,12 @@ export const PopoverContent = () => {
           )}
           {state.popoverKind === 'card' && (
             <Card.Root border={false} classNames='dx-card-popover'>
-              <Card.Toolbar>
-                {/* TODO(wittjosiah): Cleaner way to handle no drag handle in toolbar? */}
-                <span />
+              <Card.Header>
+                {/* Disabled drag handle keeps the toolbar slot layout consistent with regular cards. */}
+                <Card.DragHandle />
                 {state.popoverTitle ? <Card.Title>{toLocalizedString(state.popoverTitle, t)}</Card.Title> : <span />}
-                <Card.CloseIconButton onClick={handleClose} />
-              </Card.Toolbar>
+                <Card.ActionIconButton action='close' onClick={handleClose} />
+              </Card.Header>
               {state.popoverContent && 'subject' in state.popoverContent && (
                 <Surface.Surface type={AppSurface.Card} data={state.popoverContent} limit={1} />
               )}

package/src/components/SimpleLayout/AppBar.tsx

@@ -5,9 +5,10 @@
 import { type Atom, useAtomValue } from '@effect-atom/atom-react';
 import React, { Fragment } from 'react';
 
-import { IconButton, Popover, Toolbar, useTranslation } from '@dxos/react-ui';
+import { DensityProvider, IconButton, Popover, Toolbar, useTranslation } from '@dxos/react-ui';
+import { composable, composableProps } 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 { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
 
@@ -48,45 +49,47 @@ export const AppBar = composable<HTMLDivElement, AppBarProps>(
     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>
+      <DensityProvider density='md'>
+        <Toolbar.Root
+          {...composableProps(props, {
+            role: 'banner',
+            classNames: 'grid grid-cols-[var(--dx-rail-size)_1fr_var(--dx-rail-size)] items-center dx-density-md',
+          })}
+          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>
+      </DensityProvider>
     );
   },
 );

package/src/components/SimpleLayout/NavBar.tsx

@@ -5,8 +5,8 @@
 import { type Atom } from '@effect-atom/atom-react';
 import React from 'react';
 
+import { composable, composableProps } from '@dxos/react-ui';
 import { type ActionExecutor, type ActionGraphProps, Menu, useMenuActions } from '@dxos/react-ui-menu';
-import { composable, composableProps } from '@dxos/ui-theme';
 
 const NAVBAR_NAME = 'SimpleLayout.NavBar';
 

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

@@ -9,9 +9,9 @@ import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { AppActivationEvents } from '@dxos/app-toolkit';
 import { Collection } from '@dxos/echo';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { SearchPlugin } from '@dxos/plugin-search';
-import { SpacePlugin } from '@dxos/plugin-space';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
+import { SearchPlugin } from '@dxos/plugin-search/testing';
+import { SpacePlugin } from '@dxos/plugin-space/testing';
 import { corePlugins } from '@dxos/plugin-testing';
 import { translations as searchTranslation } from '@dxos/react-ui-search/translations';
 import { withLayout } from '@dxos/react-ui/testing';

package/src/hooks/actions.ts

@@ -11,7 +11,7 @@ import { getLinkedVariant } from '@dxos/react-ui-attention';
 import { type ActionGraphProps } from '@dxos/react-ui-menu';
 import { byPosition } from '@dxos/util';
 
-import { type SimpleLayoutState } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 // TODO(wittjosiah): Factor out to shared location with plugin-deck.
 export const PLANK_COMPANION_TYPE = 'org.dxos.plugin.deck.plank-companion';
@@ -22,7 +22,9 @@ export type CompanionActionsConfig = {
   /** Optional: highlight companion with this variant */
   selectedVariant?: string;
   /** State updater for toggling the drawer. */
-  updateState: (fn: (state: SimpleLayoutState) => SimpleLayoutState) => void;
+  updateState: (
+    fn: (state: SimpleLayoutCapabilities.SimpleLayoutState) => SimpleLayoutCapabilities.SimpleLayoutState,
+  ) => void;
 };
 
 /**
@@ -32,7 +34,7 @@ export type CompanionActionsConfig = {
 // TODO(burdon): Use builder pattern.
 export const createCompanionActions = (
   graph: AppCapabilities.AppGraph['graph'],
-  stateAtom: Atom.Atom<SimpleLayoutState>,
+  stateAtom: Atom.Atom<SimpleLayoutCapabilities.SimpleLayoutState>,
   get: (atom: Atom.Atom<any>) => any,
   config: CompanionActionsConfig,
 ): Pick<ActionGraphProps, 'nodes' | 'edges'> => {
@@ -57,7 +59,7 @@ export const createCompanionActions = (
       id: `${idPrefix}-companion-${companion.id}`,
       type: Node.ActionType,
       properties: {
-        icon: companion.properties.icon ?? 'ph--placeholder--regular',
+        icon: companion.properties.icon ?? 'ph--circle-dashed--regular',
         label: companion.properties.label,
         iconOnly: true,
         ...(selectedVariant !== undefined && {

package/src/hooks/useAppBarProps.ts

@@ -15,7 +15,7 @@ import { type ActionGraphProps } from '@dxos/react-ui-menu';
 
 import { type AppBarProps } from '#components';
 import { meta } from '#meta';
-import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 /**
  * Hook that computes all AppBar props from the app graph.
@@ -23,7 +23,7 @@ import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
  */
 export const useAppBarProps = (): Omit<AppBarProps, 'classNames'> => {
   const { t } = useTranslation(meta.id);
-  const stateAtom = useCapability(SimpleLayoutStateCapability);
+  const stateAtom = useCapability(SimpleLayoutCapabilities.State);
   const state = useAtomValue(stateAtom);
   const { graph } = useAppGraph();
   const { invokePromise } = useOperationInvoker();

package/src/hooks/useDrawerActions.ts

@@ -14,7 +14,7 @@ import { type ActionExecutor, type ActionGraphProps, createGapSeparator } from '
 
 import { useMobileLayout } from '#components';
 import { meta } from '#meta';
-import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 import { createCompanionActions } from './actions';
 import { useSimpleLayoutState } from './useSimpleLayoutState';
@@ -31,7 +31,7 @@ export type DrawerActions = {
  */
 export const useDrawerActions = (consumerName: string): DrawerActions => {
   const { t } = useTranslation(meta.id);
-  const stateAtom = useCapability(SimpleLayoutStateCapability);
+  const stateAtom = useCapability(SimpleLayoutCapabilities.State);
   const { graph } = useAppGraph();
   const runAction = useActionRunner();
   const { updateState } = useSimpleLayoutState();

package/src/hooks/useNavbarActions.ts

@@ -17,7 +17,7 @@ import {
 } from '@dxos/react-ui-menu';
 
 import { meta } from '#meta';
-import { SimpleLayoutState } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 import { createCompanionActions } from './actions';
 import { useSimpleLayoutState } from './useSimpleLayoutState';
@@ -39,7 +39,7 @@ export const useNavbarActions = (): NavbarActions => {
   const { t } = useTranslation(meta.id);
   const { graph } = useAppGraph();
   const runAction = useActionRunner();
-  const stateAtom = useCapability(SimpleLayoutState);
+  const stateAtom = useCapability(SimpleLayoutCapabilities.State);
   const { updateState } = useSimpleLayoutState();
 
   // Create a computed atom that derives everything from graph connections and state.