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

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

@@ -1,217 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Effect from 'effect/Effect';
-
-import { Capabilities, Capability } from '@dxos/app-framework';
-import { LayoutOperation } from '@dxos/app-toolkit';
-import { Operation, OperationResolver } from '@dxos/operation';
-import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
-
-import { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapability } from '../../types';
-
-/** Maximum number of items to keep in navigation history. */
-const MAX_HISTORY_LENGTH = 50;
-
-/** Parse entry ID to extract primary ID and variant. */
-const parseEntryId = (entryId: string) => {
-  const [id, variant] = entryId.split(ATTENDABLE_PATH_SEPARATOR);
-  return { id, variant };
-};
-
-export default Capability.makeModule(
-  Effect.fnUntraced(function* () {
-    const registry = yield* Capability.get(Capabilities.AtomRegistry);
-    const stateAtom = yield* Capability.get(SimpleLayoutStateCapability);
-
-    const getState = () => registry.get(stateAtom);
-    const updateState = (fn: (current: SimpleLayoutState) => SimpleLayoutState) => {
-      registry.set(stateAtom, fn(getState()));
-    };
-
-    return Capability.contributes(Capabilities.OperationResolver, [
-      //
-      // SetLayoutMode
-      //
-      // TODO(burdon): No-op for to fix startup bug?
-      OperationResolver.make({
-        operation: LayoutOperation.SetLayoutMode,
-        handler: Effect.fnUntraced(function* () {}),
-      }),
-
-      //
-      // UpdateSidebar - No-op for simple layout.
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.UpdateSidebar,
-        handler: () => Effect.void,
-      }),
-
-      //
-      // UpdateComplementary - Controls companion drawer.
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.UpdateComplementary,
-        handler: Effect.fnUntraced(function* (input) {
-          if (input.state === 'closed') {
-            updateState((state) => ({
-              ...state,
-              drawerState: 'closed',
-            }));
-          }
-        }),
-      }),
-
-      //
-      // UpdateDialog
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.UpdateDialog,
-        handler: Effect.fnUntraced(function* (input) {
-          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,
-          }));
-        }),
-      }),
-
-      //
-      // UpdatePopover
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.UpdatePopover,
-        handler: Effect.fnUntraced(function* (input) {
-          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,
-          }));
-        }),
-      }),
-
-      //
-      // SwitchWorkspace
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.SwitchWorkspace,
-        handler: Effect.fnUntraced(function* (input) {
-          updateState((state) => ({
-            ...state,
-            // TODO(wittjosiah): This is a hack to prevent the previous deck from being set for pinned items.
-            //  Ideally this should be worked into the data model in a generic way.
-            previousWorkspace: !state.workspace.startsWith('!') ? state.workspace : state.previousWorkspace,
-            workspace: input.subject,
-            active: undefined,
-            // Clear history when switching workspaces.
-            history: [],
-          }));
-        }),
-      }),
-
-      //
-      // RevertWorkspace
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.RevertWorkspace,
-        handler: Effect.fnUntraced(function* () {
-          const state = getState();
-          yield* Operation.invoke(LayoutOperation.SwitchWorkspace, {
-            subject: state.previousWorkspace,
-          });
-        }),
-      }),
-
-      //
-      // Open
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.Open,
-        handler: Effect.fnUntraced(function* (input) {
-          const id = input.subject[0];
-          const { id: primaryId, variant } = parseEntryId(id);
-          const state = getState();
-
-          // Only treat as companion when opening a variant of the current workspace/active (e.g. object~comments).
-          // IDs like settings~spaceId are alternate-tree nodes and should navigate main content, not open the drawer.
-          // TODO(wittjosiah): Factor out the change-companion operation from deck to a common layout operation.
-          const isCompanionOfCurrent = variant && (primaryId === state.workspace || primaryId === state.active);
-          if (isCompanionOfCurrent) {
-            updateState((state) => ({
-              ...state,
-              companionVariant: variant,
-              drawerState: state.drawerState === 'closed' || !state.drawerState ? 'open' : state.drawerState,
-            }));
-          } else {
-            // Regular navigation - update active and history (use full id for alternate-tree nodes).
-            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: id,
-                history: trimmedHistory,
-              };
-            });
-          }
-        }),
-      }),
-
-      //
-      // Close
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.Close,
-        handler: Effect.fnUntraced(function* () {
-          updateState((state) => {
-            // Pop from history if available.
-            if (state.history.length > 0) {
-              const newHistory = [...state.history];
-              const previousActive = newHistory.pop();
-              return {
-                ...state,
-                active: previousActive,
-                history: newHistory,
-              };
-            }
-            // No history, just clear active.
-            return {
-              ...state,
-              active: undefined,
-            };
-          });
-        }),
-      }),
-
-      //
-      // Set
-      //
-      OperationResolver.make({
-        operation: LayoutOperation.Set,
-        handler: Effect.fnUntraced(function* (input) {
-          updateState((state) => ({
-            ...state,
-            active: input.subject[0],
-          }));
-        }),
-      }),
-    ]);
-  }),
-);

package/src/capabilities/react-root/index.ts

@@ -1,7 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Capability } from '@dxos/app-framework';
-
-export const ReactRoot = Capability.lazy('ReactRoot', () => import('./react-root'));

package/src/capabilities/react-surface/index.ts

@@ -1,7 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Capability } from '@dxos/app-framework';
-
-export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/spotlight-dismiss/index.ts

@@ -1,7 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Capability } from '@dxos/app-framework';
-
-export const SpotlightDismiss = Capability.lazy('SpotlightDismiss', () => import('./spotlight-dismiss'));

package/src/capabilities/state/index.ts

@@ -1,9 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Capability } from '@dxos/app-framework';
-
-export const State = Capability.lazy('State', () => import('./state'));
-
-export type { SimpleLayoutStateOptions } from './state';

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

@@ -1,7 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Capability } from '@dxos/app-framework';
-
-export const UrlHandler = Capability.lazy('UrlHandler', () => import('./url-handler'));

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

@@ -1,157 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Effect from 'effect/Effect';
-
-import { Capabilities, Capability } from '@dxos/app-framework';
-import { LayoutOperation } from '@dxos/app-toolkit';
-import { log } from '@dxos/log';
-import { Node } from '@dxos/plugin-graph';
-import { isTauri } from '@dxos/util';
-
-import { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapability } from '../../types';
-
-/**
- * URL handler for simple layout that syncs browser URL with layout state.
- * URL format: /{workspace} or /{workspace}/{active}
- * Root is represented as / or /root.
- *
- * On mobile Tauri, also listens for deep links via the deep-link plugin.
- */
-export default Capability.makeModule(
-  Effect.fnUntraced(function* () {
-    const { invokeSync } = yield* Capability.get(Capabilities.OperationInvoker);
-
-    /**
-     * Handle navigation from a pathname.
-     * Parses path and updates state accordingly.
-     */
-    const handlePathNavigation = (pathname: string) => {
-      log.info('[UrlHandler] Navigating to path', { pathname });
-
-      // Parse URL segments: /{workspace}/{active}
-      const [_, nextWorkspace, nextActive] = pathname.split('/');
-
-      // Determine target workspace (empty or 'root' means Node.RootId).
-      const targetWorkspace = !nextWorkspace || nextWorkspace === 'root' ? Node.RootId : nextWorkspace;
-
-      // Navigate via operations (they will update state accordingly).
-      invokeSync(LayoutOperation.SwitchWorkspace, { subject: targetWorkspace });
-      if (nextActive) {
-        invokeSync(LayoutOperation.Open, { subject: [nextActive] });
-      }
-    };
-
-    const onNavigation = handleNavigation(handlePathNavigation);
-
-    // Handle initial URL and listen for browser navigation.
-    yield* Effect.sync(() => onNavigation());
-    window.addEventListener('popstate', onNavigation);
-
-    // Set up deep link listener for mobile Tauri.
-    let unlistenDeepLink: (() => void) | undefined;
-    if (isTauri()) {
-      yield* Effect.tryPromise({
-        try: async () => {
-          const { getCurrent, onOpenUrl } = await import('@tauri-apps/plugin-deep-link');
-
-          // Check if app was launched via deep link (cold start).
-          const launchUrls = await getCurrent();
-          if (launchUrls && launchUrls.length > 0) {
-            log.info('[UrlHandler] App launched with deep links', { urls: launchUrls });
-            for (const url of launchUrls) {
-              handleDeepLink(url, handlePathNavigation);
-            }
-          }
-
-          // Listen for deep links while app is running.
-          unlistenDeepLink = await onOpenUrl((urls) => {
-            log.info('[UrlHandler] Deep links received', { urls });
-            for (const url of urls) {
-              handleDeepLink(url, handlePathNavigation);
-            }
-          });
-
-          log.info('[UrlHandler] Deep link listener initialized');
-        },
-        catch: (error) => {
-          log.warn('[UrlHandler] Failed to initialize deep link listener', { error });
-          return error;
-        },
-      }).pipe(Effect.catchAll(() => Effect.void));
-    }
-
-    // Subscribe to state changes to update the URL.
-    let lastWorkspace: string | undefined;
-    let lastActive: string | undefined;
-    const unsubscribe = yield* Capabilities.subscribeAtom(SimpleLayoutStateCapability, (state: SimpleLayoutState) => {
-      const { workspace, active } = state;
-
-      // Only update URL if relevant state changed.
-      if (workspace !== lastWorkspace || active !== lastActive) {
-        lastWorkspace = workspace;
-        lastActive = active;
-
-        const path = pathFromState(workspace, active);
-        if (window.location.pathname !== path) {
-          history.pushState(null, '', `${path}${window.location.search}`);
-        }
-      }
-    });
-
-    return Capability.contributes(Capabilities.Null, null, () =>
-      Effect.sync(() => {
-        window.removeEventListener('popstate', onNavigation);
-        unsubscribe();
-        unlistenDeepLink?.();
-      }),
-    );
-  }),
-);
-
-// TODO(wittjosiah): Instead of hardcoding redirect paths, we should either:
-//   1. Validate that the workspace exists in the graph before navigating.
-//   2. Implement more structured routing with explicit route definitions.
-/**
- * Check if a path is a special redirect path that shouldn't be navigated to.
- * These paths are handled by other systems (e.g., OAuth).
- */
-const isRedirectPath = (pathname: string): boolean => pathname.startsWith('/redirect/');
-
-/**
- * Build pathname from layout state. Root workspace is / or /root/{active}.
- */
-const pathFromState = (workspace: string, active: string | undefined): string =>
-  workspace === Node.RootId
-    ? active
-      ? `/${Node.RootId}/${active}`
-      : '/'
-    : active
-      ? `/${workspace}/${active}`
-      : `/${workspace}`;
-
-/**
- * Returns a handler for navigation events (initial load and popstate) that navigates to current pathname.
- */
-const handleNavigation =
-  (navigate: (pathname: string) => void): (() => void) =>
-  () =>
-    navigate(window.location.pathname);
-
-/**
- * Handle deep link URL from Tauri. Parses the URL and calls navigate unless it's a redirect path.
- */
-const handleDeepLink = (urlString: string, navigate: (pathname: string) => void): void => {
-  log.info('[UrlHandler] Deep link received', { url: urlString });
-  try {
-    const url = new URL(urlString);
-    if (isRedirectPath(url.pathname)) {
-      log.info('[UrlHandler] Skipping redirect path (handled elsewhere)', { pathname: url.pathname });
-      return;
-    }
-    navigate(url.pathname);
-  } catch (error) {
-    log.warn('[UrlHandler] Failed to parse deep link URL', { urlString, error });
-  }
-};