@dxos/plugin-testing 0.8.4-main.6fa680abb7 → 0.8.4-main.7996785055

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-testing",
-  "version": "0.8.4-main.6fa680abb7",
+  "version": "0.8.4-main.7996785055",
   "description": "Plugin testing utils",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,33 +27,32 @@
   "dependencies": {
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
-    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
-    "@dxos/app-toolkit": "0.8.4-main.6fa680abb7",
-    "@dxos/operation": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-client": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-graph": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-attention": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-settings": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui-mosaic": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-theme": "0.8.4-main.6fa680abb7",
-    "@dxos/util": "0.8.4-main.6fa680abb7"
+    "@dxos/app-framework": "0.8.4-main.7996785055",
+    "@dxos/operation": "0.8.4-main.7996785055",
+    "@dxos/plugin-attention": "0.8.4-main.7996785055",
+    "@dxos/plugin-graph": "0.8.4-main.7996785055",
+    "@dxos/plugin-settings": "0.8.4-main.7996785055",
+    "@dxos/app-toolkit": "0.8.4-main.7996785055",
+    "@dxos/plugin-theme": "0.8.4-main.7996785055",
+    "@dxos/react-ui-mosaic": "0.8.4-main.7996785055",
+    "@dxos/util": "0.8.4-main.7996785055"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "^7.1.11",
-    "@dxos/ui-theme": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui": "0.8.4-main.6fa680abb7"
+    "@dxos/ui-theme": "0.8.4-main.7996785055",
+    "@dxos/react-ui": "0.8.4-main.7996785055"
   },
   "peerDependencies": {
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui": "0.8.4-main.6fa680abb7"
+    "@dxos/react-ui": "0.8.4-main.7996785055",
+    "@dxos/ui-theme": "0.8.4-main.7996785055"
   },
   "publishConfig": {
     "access": "public"

package/src/StorybookPlugin.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import { ActivationEvents, Capabilities, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 
-import { OperationResolver, State } from './capabilities';
+import { OperationHandler, State } from './capabilities';
 import { Layout } from './components';
 import { meta } from './meta';
 import { type LayoutStateProps } from './types';
@@ -17,8 +17,8 @@ export type StorybookPluginOptions = {
 };
 
 export const StorybookPlugin = Plugin.define<StorybookPluginOptions>(meta).pipe(
-  AppPlugin.addOperationResolverModule({
-    activate: OperationResolver,
+  AppPlugin.addOperationHandlerModule({
+    activate: OperationHandler,
   }),
   AppPlugin.addReactContextModule({
     activate: () =>

package/src/capabilities/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './operation-resolver';
+export * from './operation-handler';
 export * from './state';

package/src/capabilities/operation-handler/index.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);

package/src/capabilities/operation-handler/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/operation';
+
+import { TestingOperationHandlerSet } from '../../operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, TestingOperationHandlerSet);
+  }),
+);

package/src/capabilities/state/state.tsx

@@ -14,6 +14,7 @@ const defaultState: LayoutStateProps = {
   sidebarState: 'closed',
   complementarySidebarState: 'closed',
   dialogOpen: false,
+  toasts: [],
   workspace: 'default',
 };
 

package/src/components/Layout/Layout.tsx

@@ -6,12 +6,16 @@ import { RegistryContext, useAtomValue } from '@effect-atom/atom-react';
 import React, { type PropsWithChildren, useCallback, useContext, useEffect, useRef, useState } from 'react';
 
 import { Surface, useCapability } from '@dxos/app-framework/ui';
+import { type LayoutOperation } from '@dxos/app-toolkit';
 import {
   AlertDialog,
+  Button,
   Dialog,
+  Icon,
   Main,
   Popover,
   type PopoverContentInteractOutsideEvent,
+  Toast,
   toLocalizedString,
   useTranslation,
 } from '@dxos/react-ui';
@@ -24,7 +28,44 @@ import { LayoutState, type LayoutStateProps } from '../../types';
 
 const debounce_delay = 100;
 
-// TODO(wittjosiah): Support dialogs, tooltips, maybe toast.
+const StoryToast = ({ toast, onDismiss }: { toast: LayoutOperation.Toast; onDismiss: (id: string) => void }) => {
+  const { t } = useTranslation(meta.id);
+  return (
+    <Toast.Root
+      data-testid={toast.id}
+      defaultOpen
+      duration={toast.duration}
+      onOpenChange={(open) => {
+        if (!open) {
+          onDismiss(toast.id);
+        }
+      }}
+    >
+      <Toast.Body>
+        <Toast.Title classNames='items-center'>
+          {toast.icon && <Icon icon={toast.icon} classNames='inline mr-1' />}
+          {toast.title && <span>{toLocalizedString(toast.title, t)}</span>}
+        </Toast.Title>
+        {toast.description && <Toast.Description>{toLocalizedString(toast.description, t)}</Toast.Description>}
+      </Toast.Body>
+      <Toast.Actions>
+        {toast.onAction && toast.actionAlt && toast.actionLabel && (
+          <Toast.Action altText={toLocalizedString(toast.actionAlt, t)} asChild>
+            <Button variant='primary' onClick={() => toast.onAction?.()}>
+              {toLocalizedString(toast.actionLabel, t)}
+            </Button>
+          </Toast.Action>
+        )}
+        {toast.closeLabel && (
+          <Toast.Close asChild>
+            <Button>{toLocalizedString(toast.closeLabel, t)}</Button>
+          </Toast.Close>
+        )}
+      </Toast.Actions>
+    </Toast.Root>
+  );
+};
+
 export const Layout = ({ children }: PropsWithChildren<{}>) => {
   const { t } = useTranslation(meta.id);
   const trigger = useRef<HTMLButtonElement | null>(null);
@@ -81,81 +122,94 @@ export const Layout = ({ children }: PropsWithChildren<{}>) => {
     [handleClose],
   );
 
+  const handleDismissToast = useCallback(
+    (id: string) => {
+      updateState({ toasts: layout.toasts.filter((toast) => toast.id !== id) });
+    },
+    [updateState, layout.toasts],
+  );
+
   const DialogRoot = layout.dialogType === 'alert' ? AlertDialog.Root : Dialog.Root;
   const DialogOverlay = layout.dialogType === 'alert' ? AlertDialog.Overlay : Dialog.Overlay;
 
   return (
-    <div role='none' className='fixed inset-0 flex overflow-hidden'>
-      <Mosaic.Root>
-        <Popover.Root open={open}>
-          <Main.Root
-            navigationSidebarState={layout.sidebarState}
-            complementarySidebarState={layout.complementarySidebarState}
-            onNavigationSidebarStateChange={(next) => updateState({ sidebarState: next })}
-            onComplementarySidebarStateChange={(next) => updateState({ complementarySidebarState: next })}
-          >
-            {children}
-          </Main.Root>
-
-          <DialogRoot
-            modal={layout.dialogBlockAlign !== 'end'}
-            open={layout.dialogOpen}
-            onOpenChange={(nextOpen) => updateState({ dialogOpen: nextOpen })}
-          >
-            {layout.dialogBlockAlign === 'end' ? (
-              <Surface.Surface
-                role='dialog'
-                data={layout.dialogContent}
-                limit={1}
-                fallback={ErrorFallback}
-                placeholder={<div />}
-              />
-            ) : (
-              <DialogOverlay
-                blockAlign={layout.dialogBlockAlign}
-                classNames={layout.dialogOverlayClasses}
-                style={layout.dialogOverlayStyle}
-              >
-                <Surface.Surface role='dialog' data={layout.dialogContent} limit={1} fallback={ErrorFallback} />
-              </DialogOverlay>
-            )}
-          </DialogRoot>
-
-          <Popover.VirtualTrigger key={iter} virtualRef={trigger} />
-          <Popover.Portal>
-            <Popover.Content
-              side={layout.popoverSide}
-              onInteractOutside={handleInteractOutside}
-              onEscapeKeyDown={handleInteractOutside}
-              sticky='always'
-              hideWhenDetached
+    <Toast.Provider>
+      <div role='none' className='fixed inset-0 flex overflow-hidden'>
+        <Mosaic.Root>
+          <Popover.Root open={open}>
+            <Main.Root
+              navigationSidebarState={layout.sidebarState}
+              complementarySidebarState={layout.complementarySidebarState}
+              onNavigationSidebarStateChange={(next) => updateState({ sidebarState: next })}
+              onComplementarySidebarStateChange={(next) => updateState({ complementarySidebarState: next })}
+            >
+              {children}
+            </Main.Root>
+
+            <DialogRoot
+              modal={layout.dialogBlockAlign !== 'end'}
+              open={layout.dialogOpen}
+              onOpenChange={(nextOpen) => updateState({ dialogOpen: nextOpen })}
             >
-              <Popover.Viewport>
-                {layout.popoverKind === 'card' && (
-                  <Card.Root>
-                    <Card.Toolbar>
-                      {/* TODO(wittjosiah): Cleaner way to handle no drag handle in toolbar? */}
-                      <span />
-                      {layout.popoverTitle ? (
-                        <Card.Title>{toLocalizedString(layout.popoverTitle, t)}</Card.Title>
-                      ) : (
+              {layout.dialogBlockAlign === 'end' ? (
+                <Surface.Surface
+                  role='dialog'
+                  data={layout.dialogContent}
+                  limit={1}
+                  fallback={ErrorFallback}
+                  placeholder={<div />}
+                />
+              ) : (
+                <DialogOverlay
+                  blockAlign={layout.dialogBlockAlign}
+                  classNames={layout.dialogOverlayClasses}
+                  style={layout.dialogOverlayStyle}
+                >
+                  <Surface.Surface role='dialog' data={layout.dialogContent} limit={1} fallback={ErrorFallback} />
+                </DialogOverlay>
+              )}
+            </DialogRoot>
+
+            <Popover.VirtualTrigger key={iter} virtualRef={trigger} />
+            <Popover.Portal>
+              <Popover.Content
+                side={layout.popoverSide}
+                onInteractOutside={handleInteractOutside}
+                onEscapeKeyDown={handleInteractOutside}
+                sticky='always'
+                hideWhenDetached
+              >
+                <Popover.Viewport>
+                  {layout.popoverKind === 'card' && (
+                    <Card.Root>
+                      <Card.Toolbar>
+                        {/* TODO(wittjosiah): Cleaner way to handle no drag handle in toolbar? */}
                         <span />
-                      )}
-                      <Card.CloseIconButton onClick={handleClose} />
-                    </Card.Toolbar>
-                    <Surface.Surface role='card--content' data={layout.popoverContent} limit={1} />
-                  </Card.Root>
-                )}
-                {layout.popoverKind === 'base' && (
-                  <Surface.Surface role='popover' data={layout.popoverContent} limit={1} />
-                )}
-              </Popover.Viewport>
-              <Popover.Arrow />
-            </Popover.Content>
-          </Popover.Portal>
-        </Popover.Root>
-      </Mosaic.Root>
-    </div>
+                        {layout.popoverTitle ? (
+                          <Card.Title>{toLocalizedString(layout.popoverTitle, t)}</Card.Title>
+                        ) : (
+                          <span />
+                        )}
+                        <Card.CloseIconButton onClick={handleClose} />
+                      </Card.Toolbar>
+                      <Surface.Surface role='card--content' data={layout.popoverContent} limit={1} />
+                    </Card.Root>
+                  )}
+                  {layout.popoverKind === 'base' && (
+                    <Surface.Surface role='popover' data={layout.popoverContent} limit={1} />
+                  )}
+                </Popover.Viewport>
+                <Popover.Arrow />
+              </Popover.Content>
+            </Popover.Portal>
+          </Popover.Root>
+        </Mosaic.Root>
+        {layout.toasts.map((toast) => (
+          <StoryToast key={toast.id} toast={toast} onDismiss={handleDismissToast} />
+        ))}
+        <Toast.Viewport />
+      </div>
+    </Toast.Provider>
   );
 };
 

package/src/core.ts

@@ -4,16 +4,11 @@
 
 import { OperationPlugin, type Plugin, RuntimePlugin } from '@dxos/app-framework';
 import { AttentionPlugin } from '@dxos/plugin-attention';
-import { ClientPlugin } from '@dxos/plugin-client';
 import { GraphPlugin } from '@dxos/plugin-graph';
 import { SettingsPlugin } from '@dxos/plugin-settings';
 import { ThemePlugin } from '@dxos/plugin-theme';
 import { defaultTx } from '@dxos/ui-theme';
 
-// TODO(burdon): Remove this.
-// Re-export common framework plugins.
-export { AttentionPlugin, ClientPlugin, GraphPlugin, OperationPlugin, RuntimePlugin, SettingsPlugin, ThemePlugin };
-
 /**
  * Core plugins for testing/storybook environments.
  * NOTE: Does not include SpacePlugin to avoid circular dependencies.

package/src/operations/add-toast.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/operation';
+
+import { updateState } from './update-state';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.AddToast> = LayoutOperation.AddToast.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      yield* updateState((state) => ({
+        toasts: [...state.toasts, input as LayoutOperation.Toast],
+      }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/close.ts

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

package/src/operations/index.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const TestingOperationHandlerSet = OperationHandlerSet.lazy(
+  () => import('./add-toast'),
+  () => import('./close'),
+  () => import('./open'),
+  () => import('./scroll-into-view'),
+  () => 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,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.Open> = LayoutOperation.Open.pipe(
+  Operation.withHandler(() => Effect.void),
+);
+
+export default handler;

package/src/operations/scroll-into-view.ts

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

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

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

package/src/operations/switch-workspace.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+
+import { updateState } from './update-state';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.SwitchWorkspace> = LayoutOperation.SwitchWorkspace.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ subject }) {
+      yield* updateState(() => ({ workspace: subject }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/update-complementary.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+
+import { updateState } from './update-state';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.UpdateComplementary> =
+  LayoutOperation.UpdateComplementary.pipe(
+    Operation.withHandler(
+      Effect.fnUntraced(function* ({ state }) {
+        yield* updateState((layout) => {
+          const next = state ?? layout.complementarySidebarState;
+          if (next !== layout.complementarySidebarState) {
+            return { complementarySidebarState: next };
+          }
+          return {};
+        });
+      }),
+    ),
+  );
+
+export default handler;

package/src/operations/update-dialog.ts

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

package/src/operations/update-popover.ts

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

package/src/operations/update-sidebar.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+
+import { updateState } from './update-state';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.UpdateSidebar> = LayoutOperation.UpdateSidebar.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ state }) {
+      yield* updateState((layout) => {
+        const next = state ?? layout.sidebarState;
+        if (next !== layout.sidebarState) {
+          return { sidebarState: next };
+        }
+        return {};
+      });
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/update-state.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+
+import { LayoutState, type LayoutStateProps } from '../types';
+
+export const updateState = (fn: (state: LayoutStateProps) => Partial<LayoutStateProps>) =>
+  Effect.gen(function* () {
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const stateAtom = yield* Capability.get(LayoutState);
+    const current = registry.get(stateAtom);
+    registry.set(stateAtom, { ...current, ...fn(current) });
+  });

package/src/types/capabilities.ts

@@ -5,6 +5,7 @@
 import { type Atom } from '@effect-atom/atom-react';
 
 import { Capability } from '@dxos/app-framework';
+import { type LayoutOperation } from '@dxos/app-toolkit';
 import { type Label } from '@dxos/react-ui';
 
 import { meta } from '../meta';
@@ -30,6 +31,8 @@ export type LayoutStateProps = {
   popoverTitle?: Label;
   popoverContent?: any;
 
+  toasts: LayoutOperation.Toast[];
+
   workspace: string;
 };