@dxos/plugin-simple-layout 0.8.4-main.dfabb4ec29 → 0.8.4-main.effb148878

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-simple-layout",
-  "version": "0.8.4-main.dfabb4ec29",
+  "version": "0.8.4-main.effb148878",
   "description": "Simple layout plugin for minimal UI contexts like popover windows.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
@@ -80,26 +80,26 @@
     "@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-deep-link": "^2.4.9",
     "@tauri-apps/plugin-haptics": "^2.3.2",
-    "@dxos/app-framework": "0.8.4-main.dfabb4ec29",
-    "@dxos/compute": "0.8.4-main.dfabb4ec29",
-    "@dxos/async": "0.8.4-main.dfabb4ec29",
-    "@dxos/context": "0.8.4-main.dfabb4ec29",
-    "@dxos/effect": "0.8.4-main.dfabb4ec29",
-    "@dxos/app-toolkit": "0.8.4-main.dfabb4ec29",
-    "@dxos/log": "0.8.4-main.dfabb4ec29",
-    "@dxos/echo": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-client": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-graph": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-attention": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-menu": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-list": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-mosaic": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-stack": "0.8.4-main.dfabb4ec29",
-    "@dxos/schema": "0.8.4-main.dfabb4ec29",
-    "@dxos/util": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui-search": "0.8.4-main.dfabb4ec29"
+    "@dxos/app-framework": "0.8.4-main.effb148878",
+    "@dxos/app-toolkit": "0.8.4-main.effb148878",
+    "@dxos/async": "0.8.4-main.effb148878",
+    "@dxos/context": "0.8.4-main.effb148878",
+    "@dxos/echo": "0.8.4-main.effb148878",
+    "@dxos/compute": "0.8.4-main.effb148878",
+    "@dxos/log": "0.8.4-main.effb148878",
+    "@dxos/effect": "0.8.4-main.effb148878",
+    "@dxos/plugin-client": "0.8.4-main.effb148878",
+    "@dxos/plugin-graph": "0.8.4-main.effb148878",
+    "@dxos/react-ui-attention": "0.8.4-main.effb148878",
+    "@dxos/react-ui-list": "0.8.4-main.effb148878",
+    "@dxos/react-ui-mosaic": "0.8.4-main.effb148878",
+    "@dxos/react-ui-menu": "0.8.4-main.effb148878",
+    "@dxos/react-ui-search": "0.8.4-main.effb148878",
+    "@dxos/react-ui-stack": "0.8.4-main.effb148878",
+    "@dxos/schema": "0.8.4-main.effb148878",
+    "@dxos/util": "0.8.4-main.effb148878"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
@@ -107,23 +107,23 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/app-graph": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-preview": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-search": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-space": "0.8.4-main.dfabb4ec29",
-    "@dxos/plugin-testing": "0.8.4-main.dfabb4ec29",
-    "@dxos/schema": "0.8.4-main.dfabb4ec29",
-    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
-    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29",
-    "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29"
+    "vite": "^8.0.14",
+    "@dxos/app-graph": "0.8.4-main.effb148878",
+    "@dxos/plugin-preview": "0.8.4-main.effb148878",
+    "@dxos/plugin-space": "0.8.4-main.effb148878",
+    "@dxos/plugin-search": "0.8.4-main.effb148878",
+    "@dxos/plugin-testing": "0.8.4-main.effb148878",
+    "@dxos/schema": "0.8.4-main.effb148878",
+    "@dxos/react-ui": "0.8.4-main.effb148878",
+    "@dxos/storybook-utils": "0.8.4-main.effb148878",
+    "@dxos/ui-theme": "0.8.4-main.effb148878"
   },
   "peerDependencies": {
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
-    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29"
+    "@dxos/react-ui": "0.8.4-main.effb148878",
+    "@dxos/ui-theme": "0.8.4-main.effb148878"
   },
   "publishConfig": {
     "access": "public"

package/src/SimpleLayoutPlugin.ts

@@ -50,7 +50,7 @@ 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,

package/src/capabilities/react-surface.tsx

@@ -38,7 +38,7 @@ export default Capability.makeModule(() =>
       Surface.create({
         id: 'nav-branch',
         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/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/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] : [];
@@ -105,12 +106,12 @@ export const PopoverContent = () => {
           )}
           {state.popoverKind === 'card' && (
             <Card.Root border={false} classNames='dx-card-popover'>
-              <Card.Toolbar>
+              <Card.Header>
                 {/* TODO(wittjosiah): Cleaner way to handle no drag handle in toolbar? */}
                 <span />
                 {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/plugin';
-import { SearchPlugin } from '@dxos/plugin-search/plugin';
-import { SpacePlugin } from '@dxos/plugin-space/plugin';
+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

@@ -59,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/meta.ts

@@ -8,6 +8,7 @@ import { trim } from '@dxos/util';
 export const meta: Plugin.Meta = {
   id: 'org.dxos.plugin.simpleLayout',
   name: 'Simple Layout',
+  author: 'DXOS',
   description: trim`
     Minimal layout plugin for simplified UI contexts like popover windows.
     Provides basic content rendering without sidebars or complex navigation.

package/src/operations/open.ts

@@ -11,6 +11,7 @@ import {
 } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
+import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { layoutStateAccess } from './state-access';
@@ -18,6 +19,7 @@ import { layoutStateAccess } from './state-access';
 const handler: Operation.WithHandler<typeof LayoutOperation.Open> = LayoutOperation.Open.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* (input) {
+      log('LayoutOperation.Open handler start');
       const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
       const { updateState } = yield* layoutStateAccess;
       const id = input.subject[0];

package/dist/lib/neutral/chunk-AMTEDJHG.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Plugin } from '@dxos/app-framework';\nimport { trim } from '@dxos/util';\n\nexport const meta: Plugin.Meta = {\n  id: 'org.dxos.plugin.simpleLayout',\n  name: 'Simple Layout',\n  description: trim`\n    Minimal layout plugin for simplified UI contexts like popover windows.\n    Provides basic content rendering without sidebars or complex navigation.\n  `,\n  icon: 'ph--layout--regular',\n  tags: ['system'],\n};\n"],
-  "mappings": ";AAKA,SAASA,YAAY;AAEd,IAAMC,OAAoB;EAC/BC,IAAI;EACJC,MAAM;EACNC,aAAaJ;;;;EAIbK,MAAM;EACNC,MAAM;IAAC;;AACT;",
-  "names": ["trim", "meta", "id", "name", "description", "icon", "tags"]
-}

package/dist/lib/neutral/open-XI2T7D5O.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/operations/open.ts"],
-  "sourcesContent": ["// Copyright 2025 DXOS.org\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capability } from '@dxos/app-framework';\nimport {\n  AppCapabilities,\n  LayoutOperation,\n  createEdgeExistenceChecker,\n  validateNavigationTarget,\n} from '@dxos/app-toolkit';\nimport { Operation } from '@dxos/compute';\nimport { Context } from '@dxos/context';\nimport { ClientCapabilities } from '@dxos/plugin-client';\n\nimport { layoutStateAccess } from './state-access';\n\nconst handler: Operation.WithHandler<typeof LayoutOperation.Open> = LayoutOperation.Open.pipe(\n  Operation.withHandler(\n    Effect.fnUntraced(function* (input) {\n      const { graph } = yield* Capability.get(AppCapabilities.AppGraph);\n      const { updateState } = yield* layoutStateAccess;\n      const id = input.subject[0];\n\n      // Validate navigation target, redirecting to 404 if not found.\n      const capabilities = yield* Capability.Service;\n      const pathResolvers = capabilities.getAll(AppCapabilities.NavigationPathResolver);\n      const checkRemoteExistence = yield* Capability.get(ClientCapabilities.Client).pipe(\n        Effect.map((client) =>\n          createEdgeExistenceChecker((spaceId, body) => client.edge.http.execQuery(new Context(), spaceId, body)),\n        ),\n        Effect.catchAll(() => Effect.succeed(undefined)),\n      );\n\n      const validatedId =\n        input.navigation === 'immediate'\n          ? id\n          : yield* validateNavigationTarget({\n              graph,\n              subjectId: id,\n              pathResolvers,\n              checkRemoteExistence,\n            });\n\n      updateState((state) => {\n        const newHistory = state.active ? [...state.history, state.active] : state.history;\n        const trimmedHistory =\n          newHistory.length > MAX_HISTORY_LENGTH ? newHistory.slice(-MAX_HISTORY_LENGTH) : newHistory;\n        return {\n          ...state,\n          active: validatedId,\n          history: trimmedHistory,\n        };\n      });\n\n      return [validatedId];\n    }),\n  ),\n);\n\nexport default handler;\n\nconst MAX_HISTORY_LENGTH = 50;\n"],
-  "mappings": ";;;;;;;AAEA,YAAYA,YAAY;AAExB,SAASC,kBAAkB;AAC3B,SACEC,iBACAC,iBACAC,4BACAC,gCACK;AACP,SAASC,iBAAiB;AAC1B,SAASC,eAAe;AACxB,SAASC,0BAA0B;AAInC,IAAA,eAAoEC;IAI9D,UAAQC,gBAAgB,KAAOC,KAAAA,UAAAA,YAAAA,kBAAAA,WAAAA,OAAAA;AAC/B,QAAMC,EAAAA,MAAKC,IAAMC,OAAQ,WAAE,IAAA,gBAAA,QAAA;AAE3B,QAAA,EAAA,YAAA,IAAA,OAAA;AACA,QAAMC,KAAAA,MAAAA,QAAe,CAAA;AAErB,QAAMC,eAAAA,OAAAA,WAA8BC;AAOpC,QAAMC,gBACJL,aAAMM,OAAe,gBACjBP,sBACOQ;QACLC,uBAAAA,OAAAA,WAAAA,IAAAA,mBAAAA,MAAAA,EAAAA,KAAAA,WAAAA,CAAAA,WAAAA,2BAAAA,CAAAA,SAAAA,SAAAA,OAAAA,KAAAA,KAAAA,UAAAA,IAAAA,QAAAA,QAAAA,EAAAA,YAAAA,YAAAA,GAAAA,cAAAA,GAAAA,GAAAA,CAAAA,GAAAA,SAAAA,IAAAA,CAAAA,CAAAA,GAAAA,gBAAAA,MAAAA,eAAAA,MAAAA,CAAAA,CAAAA;QACAC,cAAWV,MAAAA,eAAAA,cAAAA,KAAAA,OAAAA,yBAAAA;IACXW;IACAP,WAAAA;IACF;IAENN;;cACwCc,CAAAA,UAAMC;UAASD,aAAY,MAAA,SAAA;MAAIA,GAAAA,MAAMC;MAC3E,MAAMC;IAEN,IAAA,MAAO;UACL,iBAAQ,WAAA,SAAA,qBAAA,WAAA,MAAA,CAAA,kBAAA,IAAA;WACRC;MACAF,GAAAA;MACF,QAAA;MACF,SAAA;IAEA;;SAAoB;IACtB;EAIJ;AAEA,CAAA,CAAA,CAAA;;;",
-  "names": ["Effect", "Capability", "AppCapabilities", "LayoutOperation", "createEdgeExistenceChecker", "validateNavigationTarget", "Operation", "Context", "ClientCapabilities", "LayoutOperation", "updateState", "layoutStateAccess", "id", "input", "subject", "capabilities", "checkRemoteExistence", "Capability", "validatedId", "navigation", "validateNavigationTarget", "graph", "subjectId", "pathResolvers", "state", "history", "trimmedHistory", "active"]
-}