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

package/src/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './SimpleLayoutPlugin';
+export * from './meta';
+export * from './types';

package/src/meta.ts

@@ -6,11 +6,12 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/simple-layout',
+  id: 'org.dxos.plugin.simpleLayout',
   name: 'Simple Layout',
   description: trim`
     Minimal layout plugin for simplified UI contexts like popover windows.
     Provides basic content rendering without sidebars or complex navigation.
   `,
   icon: 'ph--layout--regular',
+  tags: ['system'],
 };

package/src/operations/close.ts

@@ -0,0 +1,34 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.Close> = LayoutOperation.Close.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* () {
+      const { updateState } = yield* layoutStateAccess;
+
+      updateState((state) => {
+        if (state.history.length > 0) {
+          const newHistory = [...state.history];
+          const previousActive = newHistory.pop();
+          return {
+            ...state,
+            active: previousActive,
+            history: newHistory,
+          };
+        }
+        return {
+          ...state,
+          active: undefined,
+        };
+      });
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/index.ts

@@ -0,0 +1,16 @@
+// Copyright 2025 DXOS.org
+
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const SimpleLayoutOperationHandlerSet = OperationHandlerSet.lazy(
+  () => import('./close'),
+  () => import('./open'),
+  () => import('./revert-workspace'),
+  () => import('./set'),
+  () => import('./set-layout-mode'),
+  () => import('./switch-workspace'),
+  () => import('./update-complementary'),
+  () => import('./update-dialog'),
+  () => import('./update-popover'),
+  () => import('./update-sidebar'),
+);

package/src/operations/open.ts

@@ -0,0 +1,63 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import {
+  AppCapabilities,
+  LayoutOperation,
+  createEdgeExistenceChecker,
+  validateNavigationTarget,
+} from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Context } from '@dxos/context';
+import { ClientCapabilities } from '@dxos/plugin-client';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.Open> = LayoutOperation.Open.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
+      const { updateState } = yield* layoutStateAccess;
+      const id = input.subject[0];
+
+      // Validate navigation target, redirecting to 404 if not found.
+      const capabilities = yield* Capability.Service;
+      const pathResolvers = capabilities.getAll(AppCapabilities.NavigationPathResolver);
+      const checkRemoteExistence = yield* Capability.get(ClientCapabilities.Client).pipe(
+        Effect.map((client) =>
+          createEdgeExistenceChecker((spaceId, body) => client.edge.http.execQuery(new Context(), spaceId, body)),
+        ),
+        Effect.catchAll(() => Effect.succeed(undefined)),
+      );
+
+      const validatedId =
+        input.navigation === 'immediate'
+          ? id
+          : yield* validateNavigationTarget({
+              graph,
+              subjectId: id,
+              pathResolvers,
+              checkRemoteExistence,
+            });
+
+      updateState((state) => {
+        const newHistory = state.active ? [...state.history, state.active] : state.history;
+        const trimmedHistory =
+          newHistory.length > MAX_HISTORY_LENGTH ? newHistory.slice(-MAX_HISTORY_LENGTH) : newHistory;
+        return {
+          ...state,
+          active: validatedId,
+          history: trimmedHistory,
+        };
+      });
+
+      return [validatedId];
+    }),
+  ),
+);
+
+export default handler;
+
+const MAX_HISTORY_LENGTH = 50;

package/src/operations/revert-workspace.ts

@@ -0,0 +1,22 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.RevertWorkspace> = LayoutOperation.RevertWorkspace.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* () {
+      const { getState } = yield* layoutStateAccess;
+      const state = getState();
+      yield* Operation.invoke(LayoutOperation.SwitchWorkspace, {
+        subject: state.previousWorkspace,
+      });
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/set-layout-mode.ts

@@ -0,0 +1,12 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.SetLayoutMode> = LayoutOperation.SetLayoutMode.pipe(
+  Operation.withHandler(Effect.fnUntraced(function* () {})),
+);
+
+export default handler;

package/src/operations/set.ts

@@ -0,0 +1,23 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.Set> = LayoutOperation.Set.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const { updateState } = yield* layoutStateAccess;
+
+      updateState((state) => ({
+        ...state,
+        active: input.subject[0],
+      }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/state-access.ts

@@ -0,0 +1,21 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+
+import { SimpleLayoutCapabilities } from '../types';
+
+export const layoutStateAccess = Effect.gen(function* () {
+  const registry = yield* Capability.get(Capabilities.AtomRegistry);
+  const stateAtom = yield* Capability.get(SimpleLayoutCapabilities.State);
+
+  return {
+    getState: () => registry.get(stateAtom),
+    updateState: (
+      fn: (current: SimpleLayoutCapabilities.SimpleLayoutState) => SimpleLayoutCapabilities.SimpleLayoutState,
+    ) => {
+      registry.set(stateAtom, fn(registry.get(stateAtom)));
+    },
+  };
+});

package/src/operations/switch-workspace.ts

@@ -0,0 +1,26 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { isPinnedWorkspace, LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.SwitchWorkspace> = LayoutOperation.SwitchWorkspace.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const { updateState } = yield* layoutStateAccess;
+
+      updateState((state) => ({
+        ...state,
+        previousWorkspace: !isPinnedWorkspace(state.workspace) ? state.workspace : state.previousWorkspace,
+        workspace: input.subject,
+        active: undefined,
+        history: [],
+      }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/update-complementary.ts

@@ -0,0 +1,35 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { getLinkedVariant } from '@dxos/react-ui-attention';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.UpdateComplementary> =
+  LayoutOperation.UpdateComplementary.pipe(
+    Operation.withHandler(
+      Effect.fnUntraced(function* (input) {
+        const { updateState } = yield* layoutStateAccess;
+
+        if (input.state === 'closed') {
+          updateState((state) => ({
+            ...state,
+            drawerState: 'closed',
+            companionVariant: undefined,
+          }));
+        } else if (input.subject) {
+          const variant = getLinkedVariant(input.subject);
+          updateState((state) => ({
+            ...state,
+            companionVariant: variant,
+            drawerState: input.state === 'expanded' ? 'expanded' : 'open',
+          }));
+        }
+      }),
+    ),
+  );
+
+export default handler;

package/src/operations/update-dialog.ts

@@ -0,0 +1,28 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.UpdateDialog> = LayoutOperation.UpdateDialog.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const { updateState } = yield* layoutStateAccess;
+
+      updateState((state) => ({
+        ...state,
+        dialogOpen: input.state ?? Boolean(input.subject),
+        dialogType: input.type ?? 'default',
+        dialogBlockAlign: input.blockAlign ?? 'center',
+        dialogOverlayClasses: input.overlayClasses,
+        dialogOverlayStyle: input.overlayStyle,
+        dialogContent: input.subject ? { component: input.subject, props: input.props } : undefined,
+      }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/update-popover.ts

@@ -0,0 +1,35 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { layoutStateAccess } from './state-access';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.UpdatePopover> = LayoutOperation.UpdatePopover.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const { updateState } = yield* layoutStateAccess;
+
+      updateState((state) => ({
+        ...state,
+        popoverOpen: input.state ?? Boolean(input.subject),
+        popoverKind: input.kind ?? 'base',
+        popoverTitle: input.kind === 'card' ? input.title : undefined,
+        popoverContent:
+          typeof input.subject === 'string'
+            ? { component: input.subject, props: input.props }
+            : input.subject
+              ? { subject: input.subject }
+              : undefined,
+        popoverSide: input.side,
+        popoverVariant: input.variant,
+        popoverAnchor: input.variant === 'virtual' ? input.anchor : state.popoverAnchor,
+        popoverAnchorId: input.variant !== 'virtual' ? input.anchorId : state.popoverAnchorId,
+      }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/update-sidebar.ts

@@ -0,0 +1,12 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.UpdateSidebar> = LayoutOperation.UpdateSidebar.pipe(
+  Operation.withHandler(() => Effect.void),
+);
+
+export default handler;

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const SimpleLayoutPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { SimpleLayoutOperationHandlerSet } from './operations';

package/src/translations.ts

@@ -3,31 +3,33 @@
 //
 
 import { type Resource } from '@dxos/react-ui';
+import { translations as searchTranslations } from '@dxos/react-ui-search/translations';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
+  ...searchTranslations,
   {
     'en-US': {
       [meta.id]: {
-        'plugin name': 'Simple layout',
-        'settings title': 'Simple layout settings',
-        'workspaces heading': 'Workspaces',
-        'settings heading': 'Settings',
-        'back label': 'Back',
-        'browse label': 'Browse',
-        'notifications label': 'Notifications',
-        'profile label': 'Profile',
-        'app menu label': 'App menu',
-        'main menu label': 'Main menu',
-        'companions menu label': 'Companions',
-        'error fallback message': 'An error occurred',
-        'search placeholder': 'Search...',
-        'drawer label': 'Drawer',
-        'close drawer label': 'Close drawer',
-        'expand drawer label': 'Expand drawer',
-        'collapse drawer label': 'Collapse drawer',
-        'actions menu label': 'Actions',
+        'plugin.name': 'Simple layout',
+        'settings.title': 'Simple layout settings',
+        'workspaces.heading': 'Workspaces',
+        'settings.heading': 'Settings',
+        'back.label': 'Back',
+        'browse.label': 'Browse',
+        'notifications.label': 'Notifications',
+        'profile.label': 'Profile',
+        'app-menu.label': 'App menu',
+        'main-menu.label': 'Main menu',
+        'companions-menu.label': 'Companions',
+        'error-fallback.message': 'An error occurred',
+        'drawer.label': 'Drawer',
+        'close-drawer.label': 'Close drawer',
+        'expand-drawer.label': 'Expand drawer',
+        'collapse-drawer.label': 'Collapse drawer',
+        'actions-menu.label': 'Actions',
+        'done.label': 'Done',
       },
     },
   },

package/src/types/{capabilities.ts → SimpleLayoutCapabilities.ts}

@@ -2,32 +2,28 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import { type Atom } from '@effect-atom/atom-react';
 
 import { Capability } from '@dxos/app-framework';
 import { type Label } from '@dxos/react-ui';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
 
 export type DrawerState = 'closed' | 'open' | 'expanded';
 
-// TODO(wittjosiah): Handle toasts.
 export type SimpleLayoutState = {
-  /** Data to be passed to the main content Surface. */
   content?: any;
-
   previousWorkspace: string;
   workspace: string;
   active?: string;
-
   dialogOpen: boolean;
   dialogType?: 'default' | 'alert';
   dialogBlockAlign?: 'start' | 'center' | 'end';
   dialogOverlayClasses?: string;
   dialogOverlayStyle?: Record<string, any>;
-  /** Data to be passed to the dialog Surface. */
-  dialogContent?: any;
-
+  dialogContent?: { component: string; props?: any } | null;
   popoverOpen?: boolean;
   popoverSide?: 'top' | 'right' | 'bottom' | 'left';
   popoverVariant?: 'virtual' | 'react';
@@ -35,19 +31,11 @@ export type SimpleLayoutState = {
   popoverAnchorId?: string;
   popoverKind?: 'base' | 'card';
   popoverTitle?: Label;
-  popoverContent?: any;
-
-  /** Bottom drawer state. */
+  popoverContent?: { component: string; props?: any } | { subject: any } | null;
   drawerState: DrawerState;
-
-  /** Stack of previously active item IDs for back navigation. */
   history: string[];
-
-  /** Whether running in popover window context (hides mobile-specific UI). */
   isPopover?: boolean;
-
-  /** Variant of the companion to display in the drawer (e.g., "comments", "assistant-chat"). */
   companionVariant?: string;
 };
 
-export const SimpleLayoutState = Capability.make<Atom.Writable<SimpleLayoutState>>(`${meta.id}/state`);
+export const State = Capability.make<Atom.Writable<SimpleLayoutState>>(`${meta.id}.state`);

package/src/types/SimpleLayoutEvents.ts

@@ -0,0 +1,15 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// @import-as-namespace
+
+import { type ActivationEvent } from '@dxos/app-framework';
+import { AppActivationEvents } from '@dxos/app-toolkit';
+
+import * as SimpleLayoutCapabilities from './SimpleLayoutCapabilities';
+
+/** Fired when State capability is ready. */
+export const StateReady: ActivationEvent.ActivationEvent = AppActivationEvents.createStateEvent(
+  SimpleLayoutCapabilities.State.identifier,
+);

package/src/types/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './capabilities';
-export * from './events';
+export * as SimpleLayoutCapabilities from './SimpleLayoutCapabilities';
+export * as SimpleLayoutEvents from './SimpleLayoutEvents';

package/dist/lib/browser/chunk-7VLT3S46.mjs

@@ -1,29 +0,0 @@
-// src/meta.ts
-import { trim } from "@dxos/util";
-var meta = {
-  id: "dxos.org/plugin/simple-layout",
-  name: "Simple Layout",
-  description: trim`
-    Minimal layout plugin for simplified UI contexts like popover windows.
-    Provides basic content rendering without sidebars or complex navigation.
-  `,
-  icon: "ph--layout--regular"
-};
-
-// src/types/capabilities.ts
-import { Capability } from "@dxos/app-framework";
-var SimpleLayoutState = Capability.make(`${meta.id}/state`);
-
-// src/types/events.ts
-import { AppActivationEvents } from "@dxos/app-toolkit";
-(function(SimpleLayoutEvents2) {
-  SimpleLayoutEvents2.StateReady = AppActivationEvents.createStateEvent(SimpleLayoutState.identifier);
-})(SimpleLayoutEvents || (SimpleLayoutEvents = {}));
-var SimpleLayoutEvents;
-
-export {
-  meta,
-  SimpleLayoutState,
-  SimpleLayoutEvents
-};
-//# sourceMappingURL=chunk-7VLT3S46.mjs.map

package/dist/lib/browser/chunk-7VLT3S46.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts", "../../../src/types/capabilities.ts", "../../../src/types/events.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: 'dxos.org/plugin/simple-layout',\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};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Atom } from '@effect-atom/atom-react';\n\nimport { Capability } from '@dxos/app-framework';\nimport { type Label } from '@dxos/react-ui';\n\nimport { meta } from '../meta';\n\nexport type DrawerState = 'closed' | 'open' | 'expanded';\n\n// TODO(wittjosiah): Handle toasts.\nexport type SimpleLayoutState = {\n  /** Data to be passed to the main content Surface. */\n  content?: any;\n\n  previousWorkspace: string;\n  workspace: string;\n  active?: string;\n\n  dialogOpen: boolean;\n  dialogType?: 'default' | 'alert';\n  dialogBlockAlign?: 'start' | 'center' | 'end';\n  dialogOverlayClasses?: string;\n  dialogOverlayStyle?: Record<string, any>;\n  /** Data to be passed to the dialog Surface. */\n  dialogContent?: any;\n\n  popoverOpen?: boolean;\n  popoverSide?: 'top' | 'right' | 'bottom' | 'left';\n  popoverVariant?: 'virtual' | 'react';\n  popoverAnchor?: HTMLButtonElement;\n  popoverAnchorId?: string;\n  popoverKind?: 'base' | 'card';\n  popoverTitle?: Label;\n  popoverContent?: any;\n\n  /** Bottom drawer state. */\n  drawerState: DrawerState;\n\n  /** Stack of previously active item IDs for back navigation. */\n  history: string[];\n\n  /** Whether running in popover window context (hides mobile-specific UI). */\n  isPopover?: boolean;\n\n  /** Variant of the companion to display in the drawer (e.g., \"comments\", \"assistant-chat\"). */\n  companionVariant?: string;\n};\n\nexport const SimpleLayoutState = Capability.make<Atom.Writable<SimpleLayoutState>>(`${meta.id}/state`);\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type ActivationEvent } from '@dxos/app-framework';\nimport { AppActivationEvents } from '@dxos/app-toolkit';\n\nimport { SimpleLayoutState } from './capabilities';\n\nexport namespace SimpleLayoutEvents {\n  /** Fired when SimpleLayoutState capability is ready. */\n  export const StateReady: ActivationEvent.ActivationEvent = AppActivationEvents.createStateEvent(\n    SimpleLayoutState.identifier,\n  );\n}\n"],
-  "mappings": ";AAKA,SAASA,YAAY;AAEd,IAAMC,OAAoB;EAC/BC,IAAI;EACJC,MAAM;EACNC,aAAaC;;;;EAIbC,MAAM;AACR;;;ACTA,SAASC,kBAAkB;AA8CpB,IAAMC,oBAAoBC,WAAWC,KAAuC,GAAGC,KAAKC,EAAE,QAAQ;;;AC/CrG,SAASC,2BAA2B;UAInBC,qBAAAA;sBAEFC,aAA8CC,oBAAoBC,iBAC7EC,kBAAkBC,UAAU;AAEhC,GALiBL,uBAAAA,qBAAAA,CAAAA,EAAAA;;",
-  "names": ["trim", "meta", "id", "name", "description", "trim", "icon", "Capability", "SimpleLayoutState", "Capability", "make", "meta", "id", "AppActivationEvents", "SimpleLayoutEvents", "StateReady", "AppActivationEvents", "createStateEvent", "SimpleLayoutState", "identifier"]
-}