@dxos/plugin-deck 0.8.2-staging.7ac8446 → 0.8.2

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

@@ -2,112 +2,140 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, LayoutAction, type PluginsContext } from '@dxos/app-framework';
+import { Rx } from '@effect-rx/rx-react';
+import { Option, pipe } from 'effect';
+
+import { Capabilities, contributes, createIntent, LayoutAction, type PluginContext } from '@dxos/app-framework';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
-import { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';
+import { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
 
 import { DeckCapabilities } from './capabilities';
 import { DECK_PLUGIN } from '../meta';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(
     Capabilities.AppGraphBuilder,
     createExtension({
       id: DECK_PLUGIN,
-      filter: (node): node is Node<null> => node.id === ROOT_ID,
-      actions: () => {
-        const state = context.requestCapability(DeckCapabilities.MutableDeckState);
+      actions: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
+            Option.map(() => {
+              const state = context.getCapability(DeckCapabilities.MutableDeckState);
 
-        // NOTE(Zan): This is currently disabled.
-        // TODO(Zan): Fullscreen needs to know the active node and provide that to the layout part.
-        const _fullscreen = {
-          id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            await dispatch(createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }));
-          },
-          properties: {
-            label: ['toggle fullscreen label', { ns: DECK_PLUGIN }],
-            icon: 'ph--arrows-out--regular',
-            keyBinding: {
-              macos: 'ctrl+meta+f',
-              windows: 'shift+ctrl+f',
-            },
-          },
-        };
+              // NOTE(Zan): This is currently disabled.
+              // TODO(Zan): Fullscreen needs to know the active node and provide that to the layout part.
+              const _fullscreen = {
+                id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,
+                data: async () => {
+                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                  await dispatch(
+                    createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }),
+                  );
+                },
+                properties: {
+                  label: ['toggle fullscreen label', { ns: DECK_PLUGIN }],
+                  icon: 'ph--arrows-out--regular',
+                  keyBinding: {
+                    macos: 'ctrl+meta+f',
+                    windows: 'shift+ctrl+f',
+                  },
+                },
+              };
 
-        const closeCurrent = {
-          id: `${LayoutAction.Close._tag}/current`,
-          data: async () => {
-            const attention = context.requestCapability(AttentionCapabilities.Attention);
-            const attended = attention.current.at(-1);
-            if (attended) {
-              const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-              await dispatch(
-                createIntent(LayoutAction.Close, { part: 'main', subject: [attended], options: { state: false } }),
-              );
-            }
-          },
-          properties: {
-            label: ['close current label', { ns: DECK_PLUGIN }],
-            icon: 'ph--x--regular',
-          },
-        };
+              const closeCurrent = {
+                id: `${LayoutAction.Close._tag}/current`,
+                data: async () => {
+                  const attention = context.getCapability(AttentionCapabilities.Attention);
+                  const attended = attention.current.at(-1);
+                  if (attended) {
+                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                    await dispatch(
+                      createIntent(LayoutAction.Close, {
+                        part: 'main',
+                        subject: [attended],
+                        options: { state: false },
+                      }),
+                    );
+                  }
+                },
+                properties: {
+                  label: ['close current label', { ns: DECK_PLUGIN }],
+                  icon: 'ph--x--regular',
+                },
+              };
 
-        const closeOthers = {
-          id: `${LayoutAction.Close._tag}/others`,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            const attention = context.requestCapability(AttentionCapabilities.Attention);
-            const attended = attention.current.at(-1);
-            const ids = state.deck.active.filter((id) => id !== attended) ?? [];
-            await dispatch(createIntent(LayoutAction.Close, { part: 'main', subject: ids, options: { state: false } }));
-          },
-          properties: {
-            label: ['close others label', { ns: DECK_PLUGIN }],
-            icon: 'ph--x-square--regular',
-          },
-        };
+              const closeOthers = {
+                id: `${LayoutAction.Close._tag}/others`,
+                data: async () => {
+                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                  const attention = context.getCapability(AttentionCapabilities.Attention);
+                  const attended = attention.current.at(-1);
+                  const ids = state.deck.active.filter((id) => id !== attended) ?? [];
+                  await dispatch(
+                    createIntent(LayoutAction.Close, { part: 'main', subject: ids, options: { state: false } }),
+                  );
+                },
+                properties: {
+                  label: ['close others label', { ns: DECK_PLUGIN }],
+                  icon: 'ph--x-square--regular',
+                },
+              };
 
-        const closeAll = {
-          id: `${LayoutAction.Close._tag}/all`,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            await dispatch(
-              createIntent(LayoutAction.Close, {
-                part: 'main',
-                subject: state.deck.active,
-                options: { state: false },
-              }),
-            );
-          },
-          properties: {
-            label: ['close all label', { ns: DECK_PLUGIN }],
-            icon: 'ph--x-circle--regular',
-          },
-        };
+              const closeAll = {
+                id: `${LayoutAction.Close._tag}/all`,
+                data: async () => {
+                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                  await dispatch(
+                    createIntent(LayoutAction.Close, {
+                      part: 'main',
+                      subject: state.deck.active,
+                      options: { state: false },
+                    }),
+                  );
+                },
+                properties: {
+                  label: ['close all label', { ns: DECK_PLUGIN }],
+                  icon: 'ph--x-circle--regular',
+                },
+              };
 
-        const toggleSidebar = {
-          id: `${LayoutAction.UpdateSidebar._tag}/nav`,
-          data: async () => {
-            state.sidebarState = state.sidebarState === 'expanded' ? 'collapsed' : 'expanded';
-          },
-          properties: {
-            label: [
-              state.sidebarState === 'expanded' ? 'collapse navigation sidebar label' : 'open navigation sidebar label',
-              { ns: DECK_PLUGIN },
-            ],
-            icon: 'ph--sidebar--regular',
-            keyBinding: {
-              macos: 'meta+b',
-            },
-            disposition: 'pin-end',
-            position: 'hoist',
-            l0Breakpoint: 'lg',
-          },
-        };
+              const toggleSidebar = {
+                id: `${LayoutAction.UpdateSidebar._tag}/nav`,
+                data: async () => {
+                  state.sidebarState = state.sidebarState === 'expanded' ? 'collapsed' : 'expanded';
+                },
+                properties: {
+                  label: [
+                    get(
+                      rxFromSignal(() =>
+                        state.sidebarState === 'expanded'
+                          ? 'collapse navigation sidebar label'
+                          : 'open navigation sidebar label',
+                      ),
+                    ),
+                    { ns: DECK_PLUGIN },
+                  ],
+                  icon: 'ph--sidebar--regular',
+                  keyBinding: {
+                    macos: 'meta+b',
+                  },
+                  disposition: 'pin-end',
+                  position: 'hoist',
+                  l0Breakpoint: 'lg',
+                },
+              };
 
-        return !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar];
-      },
+              return get(
+                rxFromSignal(() =>
+                  !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar],
+                ),
+              );
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
     }),
   );

package/src/capabilities/check-app-scheme.ts

@@ -1,11 +1,8 @@
 //
 // Copyright 2025 DXOS.org
 //
-//
-// Copyright 2025 DXOS.org
-//
 
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 
 import { DECK_PLUGIN } from '../meta';
 import { type DeckSettingsProps } from '../types';
@@ -33,9 +30,8 @@ const checkAppScheme = (url: string) => {
   });
 };
 
-export default async (context: PluginsContext) => {
-  const settingsStore = context.requestCapability(Capabilities.SettingsStore);
-  const settings = settingsStore.getStore<DeckSettingsProps>(DECK_PLUGIN)?.value;
+export default async (context: PluginContext) => {
+  const settings = context.getCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(DECK_PLUGIN)?.value;
   if (!isSocket && settings?.enableNativeRedirect) {
     checkAppScheme(appScheme);
   }

package/src/capabilities/index.ts

@@ -6,12 +6,13 @@ import { lazy } from '@dxos/app-framework';
 
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
 export const CheckAppScheme = lazy(() => import('./check-app-scheme'));
+export const DeckSettings = lazy(() => import('./settings'));
+export const DeckState = lazy(() => import('./state'));
 export const LayoutIntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactRoot = lazy(() => import('./react-root'));
 export const ReactSurface = lazy(() => import('./react-surface'));
-export const DeckSettings = lazy(() => import('./settings'));
-export const DeckState = lazy(() => import('./state'));
 export const Tools = lazy(() => import('./tools'));
 export const UrlHandler = lazy(() => import('./url-handler'));
 
 export * from './capabilities';
+export * from './state';