@dxos/plugin-deck 0.7.5-labs.a279d8c → 0.7.5-labs.a8b535d

package/src/DeckPlugin.ts

@@ -5,23 +5,18 @@
 import { setAutoFreeze } from 'immer';
 
 import { allOf, Capabilities, contributes, defineModule, definePlugin, Events, oneOf } from '@dxos/app-framework';
-import { AttentionEvents } from '@dxos/plugin-attention';
 import { translations as stackTranslations } from '@dxos/react-ui-stack';
 
 import {
   AppGraphBuilder,
   CheckAppScheme,
+  DeckSettings,
   DeckState,
   LayoutIntentResolver,
-  LayoutState,
-  LocationState,
-  NavigationIntentResolver,
-  ReactContext,
   ReactRoot,
-  DeckSettings,
   ReactSurface,
+  Tools,
   UrlHandler,
-  NavigationTools,
 } from './capabilities';
 import { DeckEvents } from './events';
 import { meta } from './meta';
@@ -34,35 +29,23 @@ setAutoFreeze(false);
 
 export const DeckPlugin = () =>
   definePlugin(meta, [
-    //
-    // Settings
-    //
-
+    defineModule({
+      id: `${meta.id}/module/check-app-scheme`,
+      activatesOn: Events.SettingsReady,
+      activate: CheckAppScheme,
+    }),
     defineModule({
       id: `${meta.id}/module/settings`,
       activatesOn: Events.SetupSettings,
       activate: DeckSettings,
     }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.Startup,
-      activate: ReactSurface,
-    }),
-
-    //
-    // Layout
-    //
-
     defineModule({
       id: `${meta.id}/module/layout`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
-      activatesAfter: [Events.LayoutReady],
-      activate: LayoutState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/deck`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
-      activatesAfter: [DeckEvents.StateReady],
+      // TODO(wittjosiah): Does not integrate with settings store.
+      //   Should this be a different event?
+      //   Should settings store be renamed to be more generic?
+      activatesOn: oneOf(Events.SetupSettings, Events.SetupAppGraph),
+      activatesAfter: [Events.LayoutReady, DeckEvents.StateReady],
       activate: DeckState,
     }),
     defineModule({
@@ -70,19 +53,20 @@ export const DeckPlugin = () =>
       activatesOn: Events.SetupTranslations,
       activate: () => contributes(Capabilities.Translations, [...translations, ...stackTranslations]),
     }),
-    defineModule({
-      id: `${meta.id}/module/react-context`,
-      activatesOn: Events.Startup,
-      activate: ReactContext,
-    }),
     defineModule({
       id: `${meta.id}/module/react-root`,
       activatesOn: Events.Startup,
+      activatesBefore: [DeckEvents.SetupComplementaryPanels],
       activate: ReactRoot,
     }),
+    defineModule({
+      id: `${meta.id}/module/react-surface`,
+      activatesOn: Events.SetupReactSurface,
+      activate: ReactSurface,
+    }),
     defineModule({
       id: `${meta.id}/module/layout-intent-resolver`,
-      activatesOn: Events.SetupIntents,
+      activatesOn: Events.SetupIntentResolver,
       activate: LayoutIntentResolver,
     }),
     defineModule({
@@ -90,40 +74,14 @@ export const DeckPlugin = () =>
       activatesOn: Events.SetupAppGraph,
       activate: AppGraphBuilder,
     }),
-
-    //
-    // Navigation
-    //
-
-    defineModule({
-      id: `${meta.id}/module/location`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
-      activatesAfter: [Events.LocationReady],
-      activate: LocationState,
-    }),
     defineModule({
-      id: `${meta.id}/module/check-app-scheme`,
-      activatesOn: Events.SettingsReady,
-      activate: CheckAppScheme,
+      id: `${meta.id}/module/tools`,
+      activatesOn: Events.SetupArtifactDefinition,
+      activate: Tools,
     }),
     defineModule({
       id: `${meta.id}/module/url`,
-      activatesOn: allOf(
-        Events.DispatcherReady,
-        Events.LayoutReady,
-        Events.LocationReady,
-        AttentionEvents.AttentionReady,
-      ),
+      activatesOn: allOf(Events.DispatcherReady, DeckEvents.StateReady),
       activate: UrlHandler,
     }),
-    defineModule({
-      id: `${meta.id}/module/navigation-intent-resolver`,
-      activatesOn: Events.SetupIntents,
-      activate: NavigationIntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/navigation-tools`,
-      activatesOn: Events.Startup,
-      activate: NavigationTools,
-    }),
   ]);

package/src/capabilities/{layout/app-graph-builder.ts → app-graph-builder.ts}

@@ -2,19 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import {
-  Capabilities,
-  contributes,
-  createIntent,
-  LayoutAction,
-  NavigationAction,
-  openIds,
-  type PluginsContext,
-} from '@dxos/app-framework';
+import { Capabilities, contributes, createIntent, LayoutAction, type PluginsContext } from '@dxos/app-framework';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';
 
-import { DECK_PLUGIN } from '../../meta';
+import { DeckCapabilities } from './capabilities';
+import { DECK_PLUGIN } from '../meta';
 
 export default (context: PluginsContext) =>
   contributes(
@@ -23,13 +16,15 @@ export default (context: PluginsContext) =>
       id: DECK_PLUGIN,
       filter: (node): node is Node<null> => node.id === ROOT_ID,
       actions: () => {
+        const state = context.requestCapability(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.SetLayoutMode._tag}/fullscreen`,
+          id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,
           data: async () => {
             const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            await dispatch(createIntent(LayoutAction.SetLayoutMode, { layoutMode: 'fullscreen' }));
+            await dispatch(createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }));
           },
           properties: {
             label: ['toggle fullscreen label', { ns: DECK_PLUGIN }],
@@ -42,13 +37,15 @@ export default (context: PluginsContext) =>
         };
 
         const closeCurrent = {
-          id: `${NavigationAction.Close._tag}/current`,
+          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(NavigationAction.Close, { activeParts: { main: [attended] } }));
+              await dispatch(
+                createIntent(LayoutAction.Close, { part: 'main', subject: [attended], options: { state: false } }),
+              );
             }
           },
           properties: {
@@ -58,18 +55,13 @@ export default (context: PluginsContext) =>
         };
 
         const closeOthers = {
-          id: `${NavigationAction.Close._tag}/others`,
+          id: `${LayoutAction.Close._tag}/others`,
           data: async () => {
             const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            const location = context.requestCapability(Capabilities.Location);
             const attention = context.requestCapability(AttentionCapabilities.Attention);
             const attended = attention.current.at(-1);
-            const ids = openIds(location.active, ['main']).filter((id) => id !== attended);
-            await dispatch(
-              createIntent(NavigationAction.Close, {
-                activeParts: { main: ids },
-              }),
-            );
+            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 }],
@@ -78,13 +70,14 @@ export default (context: PluginsContext) =>
         };
 
         const closeAll = {
-          id: `${NavigationAction.Close._tag}/all`,
+          id: `${LayoutAction.Close._tag}/all`,
           data: async () => {
             const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            const location = context.requestCapability(Capabilities.Location);
             await dispatch(
-              createIntent(NavigationAction.Close, {
-                activeParts: { main: openIds(location.active, ['main']) },
+              createIntent(LayoutAction.Close, {
+                part: 'main',
+                subject: state.deck.active,
+                options: { state: false },
               }),
             );
           },
@@ -94,8 +87,27 @@ export default (context: PluginsContext) =>
           },
         };
 
-        const layoutMode = context.requestCapabilities(Capabilities.Layout)[0]?.layoutMode;
-        return layoutMode === 'deck' ? [closeCurrent, closeOthers, closeAll] : [];
+        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',
+          },
+        };
+
+        return !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar];
       },
     }),
   );

package/src/capabilities/capabilities.ts

@@ -2,16 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { defineCapability, type Label } from '@dxos/app-framework';
+import { defineCapability } from '@dxos/app-framework';
 import { type DeepReadonly } from '@dxos/util';
 
-import { type DeckContextType } from '../components';
 import { DECK_PLUGIN } from '../meta';
+import { type DeckState, type Panel } from '../types';
 
 export namespace DeckCapabilities {
-  export const DeckState = defineCapability<DeepReadonly<DeckContextType>>(`${DECK_PLUGIN}/capability/state`);
-  export const MutableDeckState = defineCapability<DeckContextType>(`${DECK_PLUGIN}/capability/state`);
-  export const ComplementaryPanel = defineCapability<{ id: string; label: Label; icon: string }>(
-    `${DECK_PLUGIN}/capability/complementary-panel`,
-  );
+  export const DeckState = defineCapability<DeepReadonly<DeckState>>(`${DECK_PLUGIN}/capability/state`);
+  export const MutableDeckState = defineCapability<DeckState>(`${DECK_PLUGIN}/capability/state`);
+  export const ComplementaryPanel = defineCapability<Panel>(`${DECK_PLUGIN}/capability/complementary-panel`);
 }

package/src/capabilities/{navigation/check-app-scheme.ts → check-app-scheme.ts}

@@ -7,8 +7,8 @@
 
 import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
 
-import { DECK_PLUGIN } from '../../meta';
-import { type DeckSettingsProps } from '../../types';
+import { DECK_PLUGIN } from '../meta';
+import { type DeckSettingsProps } from '../types';
 
 const isSocket = !!(globalThis as any).__args;
 

package/src/capabilities/index.ts

@@ -2,7 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
+import { lazy } from '@dxos/app-framework';
+
+export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
+export const CheckAppScheme = lazy(() => import('./check-app-scheme'));
+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 './layout';
-export * from './navigation';
-export * from './settings';