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

package/src/components/Sidebar/ComplementarySidebar.tsx

@@ -12,51 +12,20 @@ import React, {
   useState,
 } from 'react';
 
-import {
-  LayoutAction,
-  Surface,
-  createIntent,
-  useAppGraph,
-  useCapability,
-  useIntentDispatcher,
-} from '@dxos/app-framework';
-import { type Node } from '@dxos/plugin-graph';
+import { LayoutAction, Surface, createIntent, useCapability, useIntentDispatcher } from '@dxos/app-framework';
 import { Main, useTranslation, toLocalizedString, IconButton, type Label } from '@dxos/react-ui';
 import { Tabs } from '@dxos/react-ui-tabs';
-import { byPosition, type Position } from '@dxos/util';
 
 import { ToggleComplementarySidebarButton } from './SidebarButton';
 import { DeckCapabilities } from '../../capabilities';
+import { type DeckCompanion, getCompanionId, useDeckCompanions, useBreakpoints, useHoistStatusbar } from '../../hooks';
 import { DECK_PLUGIN } from '../../meta';
-import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '../../types';
-import { layoutAppliesTopbar, useBreakpoints, useHoistStatusbar } from '../../util';
+import { getMode } from '../../types';
+import { layoutAppliesTopbar } from '../../util';
 import { PlankContentError, PlankLoading } from '../Plank';
 
 const label = ['complementary sidebar title', { ns: DECK_PLUGIN }] satisfies Label;
 
-const getCompanionId = (id: string) => {
-  const [_, companionId] = id.split(ATTENDABLE_PATH_SEPARATOR);
-  return companionId ?? 'never';
-};
-
-type DeckCompanion = Node<
-  any,
-  {
-    label: Label;
-    icon: string;
-    // TODO(burdon): Scroll area should be controlled by surface.
-    /** If true, the panel will not be wrapped in a scroll area. */
-    fixed?: boolean;
-    position?: Position;
-  }
->;
-
-const useDeckCompanions = (): DeckCompanion[] => {
-  const { graph } = useAppGraph();
-  const companions = graph.nodes(graph.root, { type: DECK_COMPANION_TYPE }) as DeckCompanion[];
-  return companions.toSorted((a, b) => byPosition(a.properties, b.properties));
-};
-
 export type ComplementarySidebarProps = {
   current?: string;
 };
@@ -65,13 +34,14 @@ export const ComplementarySidebar = ({ current }: ComplementarySidebarProps) =>
   const { t } = useTranslation(DECK_PLUGIN);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const layout = useCapability(DeckCapabilities.MutableDeckState);
+  const layoutMode = getMode(layout.deck);
   const breakpoint = useBreakpoints();
-  const topbar = layoutAppliesTopbar(breakpoint);
-  const hoistStatusbar = useHoistStatusbar(breakpoint);
+  const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
+  const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
 
   const companions = useDeckCompanions();
-  const activeCompanion = companions.find((companion) => getCompanionId(companion.id) === current) ?? companions.at(0);
-  const activeId = getCompanionId(activeCompanion?.id ?? 'never');
+  const activeCompanion = companions.find((companion) => getCompanionId(companion.id) === current);
+  const activeId = activeCompanion && getCompanionId(activeCompanion.id);
   const [internalValue, setInternalValue] = useState(activeId);
 
   useEffect(() => {
@@ -101,6 +71,14 @@ export const ComplementarySidebar = ({ current }: ComplementarySidebarProps) =>
     [activeCompanion?.id, activeCompanion?.data],
   );
 
+  useEffect(() => {
+    if (!activeId) {
+      void dispatch(
+        createIntent(LayoutAction.UpdateComplementary, { part: 'complementary', options: { state: 'collapsed' } }),
+      );
+    }
+  }, [activeId, dispatch]);
+
   return (
     <Main.ComplementarySidebar
       label={label}
@@ -112,7 +90,7 @@ export const ComplementarySidebar = ({ current }: ComplementarySidebarProps) =>
       <Tabs.Root orientation='vertical' verticalVariant='stateless' value={internalValue} classNames='contents'>
         <div
           role='none'
-          className='absolute z-[1] inset-block-0 inline-end-0 !is-[--r0-size] pbs-[env(safe-area-inset-top)] pbe-[env(safe-area-inset-bottom)] border-is border-separator grid grid-cols-1 grid-rows-[1fr_min-content] bg-baseSurface contain-layout app-drag'
+          className='absolute z-[1] inset-block-0 inline-end-0 !is-[--r0-size] pbs-[env(safe-area-inset-top)] pbe-[env(safe-area-inset-bottom)] border-is border-subduedSeparator grid grid-cols-1 grid-rows-[1fr_min-content] bg-baseSurface contain-layout app-drag'
         >
           <Tabs.Tablist classNames='grid grid-cols-1 auto-rows-[--rail-action] p-1 gap-1 !overflow-y-auto'>
             {companions.map((companion) => (
@@ -145,21 +123,22 @@ export const ComplementarySidebar = ({ current }: ComplementarySidebarProps) =>
             <ToggleComplementarySidebarButton />
           </div>
         </div>
-        {companions.map((companion) => (
-          <Tabs.Tabpanel
-            key={getCompanionId(companion.id)}
-            value={getCompanionId(companion.id)}
-            classNames='absolute data-[state="inactive"]:-z-[1] inset-block-0 inline-start-0 is-[calc(100%-var(--r0-size))] lg:is-[--r1-size] grid grid-cols-1 grid-rows-[var(--rail-size)_1fr_min-content] pbs-[env(safe-area-inset-top)]'
-            {...(layout.complementarySidebarState !== 'expanded' && { inert: 'true' })}
-          >
-            <ComplementarySidebarPanel
-              companion={companion}
-              activeId={activeId}
-              data={data}
-              hoistStatusbar={hoistStatusbar}
-            />
-          </Tabs.Tabpanel>
-        ))}
+        {activeId &&
+          companions.map((companion) => (
+            <Tabs.Tabpanel
+              key={getCompanionId(companion.id)}
+              value={getCompanionId(companion.id)}
+              classNames='absolute data-[state="inactive"]:-z-[1] inset-block-0 inline-start-0 is-[calc(100%-var(--r0-size))] lg:is-[--r1-size] grid grid-cols-1 grid-rows-[var(--rail-size)_1fr_min-content] pbs-[env(safe-area-inset-top)]'
+              {...(layout.complementarySidebarState !== 'expanded' && { inert: 'true' })}
+            >
+              <ComplementarySidebarPanel
+                companion={companion}
+                activeId={activeId}
+                data={data}
+                hoistStatusbar={hoistStatusbar}
+              />
+            </Tabs.Tabpanel>
+          ))}
       </Tabs.Root>
     </Main.ComplementarySidebar>
   );
@@ -190,7 +169,7 @@ const ComplementarySidebarPanel = ({ companion, activeId, data, hoistStatusbar }
 
   return (
     <>
-      <h2 className='flex items-center pli-2 border-separator border-be font-medium'>
+      <h2 className='flex items-center pli-2 border-subduedSeparator border-be font-medium'>
         {toLocalizedString(companion.properties.label, t)}
       </h2>
       <Wrapper>
@@ -204,7 +183,7 @@ const ComplementarySidebarPanel = ({ companion, activeId, data, hoistStatusbar }
       {!hoistStatusbar && (
         <div
           role='contentinfo'
-          className='flex flex-wrap justify-center items-center border-bs border-separator pbs-1 pbe-[max(env(safe-area-inset-bottom),0.25rem)]'
+          className='flex flex-wrap justify-center items-center border-bs border-subduedSeparator pbs-1 pbe-[max(env(safe-area-inset-bottom),0.25rem)]'
         >
           <Surface role='status-bar--r1-footer' limit={1} />
         </div>

package/src/components/Sidebar/Sidebar.tsx

@@ -8,16 +8,19 @@ import { Surface, useCapability } from '@dxos/app-framework';
 import { type Label, Main } from '@dxos/react-ui';
 
 import { DeckCapabilities } from '../../capabilities';
+import { useBreakpoints, useHoistStatusbar } from '../../hooks';
 import { DECK_PLUGIN } from '../../meta';
-import { layoutAppliesTopbar, useBreakpoints, useHoistStatusbar } from '../../util';
+import { getMode } from '../../types';
+import { layoutAppliesTopbar } from '../../util';
 
 const label = ['sidebar title', { ns: DECK_PLUGIN }] satisfies Label;
 
 export const Sidebar = () => {
-  const { popoverAnchorId, activeDeck: current } = useCapability(DeckCapabilities.DeckState);
+  const { popoverAnchorId, activeDeck: current, deck } = useCapability(DeckCapabilities.DeckState);
   const breakpoint = useBreakpoints();
-  const topbar = layoutAppliesTopbar(breakpoint);
-  const hoistStatusbar = useHoistStatusbar(breakpoint);
+  const layoutMode = getMode(deck);
+  const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
+  const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
 
   const navigationData = useMemo(
     () => ({ popoverAnchorId, topbar, hoistStatusbar, current }),

package/src/components/Sidebar/SidebarButton.tsx

@@ -2,12 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import React, { useCallback } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
+import { createIntent, LayoutAction, useCapability, useIntentDispatcher } from '@dxos/app-framework';
 import { IconButton, type IconButtonProps, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 
 import { DeckCapabilities } from '../../capabilities';
+import { useDeckCompanions, getCompanionId } from '../../hooks';
 import { DECK_PLUGIN } from '../../meta';
 
 export const ToggleSidebarButton = ({
@@ -47,16 +48,34 @@ export const CloseSidebarButton = () => {
   );
 };
 
-export const ToggleComplementarySidebarButton = ({ inR0, classNames }: ThemedClassName<{ inR0?: boolean }>) => {
+export const ToggleComplementarySidebarButton = ({
+  inR0,
+  classNames,
+  current,
+}: ThemedClassName<{ inR0?: boolean; current?: string }>) => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
   const layoutContext = useCapability(DeckCapabilities.MutableDeckState);
   const { t } = useTranslation(DECK_PLUGIN);
+
+  const companions = useDeckCompanions();
+  const handleClick = useCallback(async () => {
+    layoutContext.complementarySidebarState =
+      layoutContext.complementarySidebarState === 'expanded' ? 'collapsed' : 'expanded';
+    const firstCompanion = companions[0];
+    if (layoutContext.complementarySidebarState === 'expanded' && !current && firstCompanion) {
+      await dispatch(
+        createIntent(LayoutAction.UpdateComplementary, {
+          part: 'complementary',
+          subject: getCompanionId(firstCompanion.id),
+        }),
+      );
+    }
+  }, [layoutContext, current, companions, dispatch]);
+
   return (
     <IconButton
       iconOnly
-      onClick={() =>
-        (layoutContext.complementarySidebarState =
-          layoutContext.complementarySidebarState === 'expanded' ? 'collapsed' : 'expanded')
-      }
+      onClick={handleClick}
       variant='ghost'
       label={t('open complementary sidebar label')}
       classNames={['[&>svg]:-scale-x-100', classNames]}

package/src/components/fragments.ts

@@ -7,7 +7,7 @@ import { mx } from '@dxos/react-ui-theme';
 export const soloInlinePadding =
   'pis-[calc(env(safe-area-inset-left)+.25rem)] pie-[calc(env(safe-area-inset-left)+.25rem)]';
 
-const sidebarToggleStyles = 'bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deck lg:hidden';
+const sidebarToggleStyles = 'bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deckSurface lg:hidden';
 
 export const fixedSidebarToggleStyles = mx(sidebarToggleStyles, 'inline-start-2');
 

package/src/hooks/index.ts

@@ -2,5 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './useNodeActionExpander';
+export * from './useBreakpoints';
+export * from './useCompanions';
+export * from './useDeckCompanions';
+export * from './useHoistStatusbar';
 export * from './useMainSize';
+export * from './useNodeActionExpander';

package/src/{util → hooks}/useCompanions.ts

@@ -5,14 +5,14 @@
 import { useMemo } from 'react';
 
 import { useAppGraph } from '@dxos/app-framework';
-import { useNode } from '@dxos/plugin-graph';
+import { useConnections } from '@dxos/plugin-graph';
 import { byPosition } from '@dxos/util';
 
 import { PLANK_COMPANION_TYPE } from '../types';
 
 export const useCompanions = (id?: string) => {
   const { graph } = useAppGraph();
-  const node = useNode(graph, id);
-  const companions = node ? graph.nodes(node, { type: PLANK_COMPANION_TYPE }) : [];
+  const nodes = useConnections(graph, id);
+  const companions = nodes.filter((node) => node.type === PLANK_COMPANION_TYPE);
   return useMemo(() => companions.toSorted((a, b) => byPosition(a.properties, b.properties)), [companions]);
 };

package/src/hooks/useDeckCompanions.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Label, useAppGraph } from '@dxos/app-framework';
+import { ROOT_ID, useConnections, type Node } from '@dxos/plugin-graph';
+import { byPosition, type Position } from '@dxos/util';
+
+import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '../types';
+
+export const getCompanionId = (id: string) => {
+  const [_, companionId] = id.split(ATTENDABLE_PATH_SEPARATOR);
+  return companionId ?? 'never';
+};
+
+export type DeckCompanion = Node<
+  any,
+  {
+    label: Label;
+    icon: string;
+    // TODO(burdon): Scroll area should be controlled by surface.
+    /** If true, the panel will not be wrapped in a scroll area. */
+    fixed?: boolean;
+    position?: Position;
+  }
+>;
+
+export const useDeckCompanions = (): DeckCompanion[] => {
+  const { graph } = useAppGraph();
+  const connections = useConnections(graph, ROOT_ID);
+  const companions = connections.filter((node) => node.type === DECK_COMPANION_TYPE) as DeckCompanion[];
+  return companions.toSorted((a, b) => byPosition(a.properties, b.properties));
+};

package/src/{util → hooks}/useHoistStatusbar.ts

@@ -8,13 +8,18 @@ import { Capabilities, useCapability } from '@dxos/app-framework';
 import { useThemeContext } from '@dxos/react-ui';
 
 import { DECK_PLUGIN } from '../meta';
-import type { DeckSettingsProps } from '../types';
+import type { DeckSettingsProps, LayoutMode } from '../types';
 
-export const useHoistStatusbar = (breakpoint: string): boolean => {
+export const useHoistStatusbar = (breakpoint: string, layoutMode?: LayoutMode): boolean => {
   const enableStatusbar = useCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(DECK_PLUGIN)!.value
     .enableStatusbar;
   const { safeAreaPadding } = useThemeContext();
   return useMemo(() => {
-    return breakpoint === 'desktop' && !!enableStatusbar && safeAreaPadding?.bottom === 0;
-  }, [enableStatusbar, breakpoint, safeAreaPadding?.bottom]);
+    return (
+      breakpoint === 'desktop' &&
+      layoutMode !== 'solo--fullscreen' &&
+      !!enableStatusbar &&
+      safeAreaPadding?.bottom === 0
+    );
+  }, [enableStatusbar, breakpoint, safeAreaPadding?.bottom, layoutMode]);
 };

package/src/hooks/useNodeActionExpander.ts

@@ -4,19 +4,14 @@
 
 import { useEffect } from 'react';
 
-import { ACTION_GROUP_TYPE, ACTION_TYPE, getGraph, type Node } from '@dxos/plugin-graph';
-
-const expandNodeActions = async (node: Node) => {
-  const graph = getGraph(node);
-  await graph.expand(node, 'outbound', ACTION_GROUP_TYPE);
-  await graph.expand(node, 'outbound', ACTION_TYPE);
-};
+import { getGraph, type Node } from '@dxos/plugin-graph';
 
 export const useNodeActionExpander = (node?: Node) => {
   useEffect(() => {
     if (node) {
       const frame = requestAnimationFrame(() => {
-        void expandNodeActions(node);
+        const graph = getGraph(node);
+        void graph.expand(node.id);
       });
       return () => cancelAnimationFrame(frame);
     }

package/src/index.ts

@@ -6,4 +6,4 @@ export { DeckCapabilities } from './capabilities';
 export { DeckEvents } from './events';
 export * from './DeckPlugin';
 export * from './meta';
-export { useCompanions } from './util';
+export { useCompanions } from './hooks';

package/src/translations.ts

@@ -35,7 +35,6 @@ export default [
         'plank heading fallback label': 'Untitled',
         'actions menu label': 'Options',
         'settings deck label': 'Disable deck',
-        'reload required message': 'Reload required.',
         'pending heading': 'Loading…',
         'insert plank label': 'Open',
         'resize label': 'Drag to resize',
@@ -45,6 +44,8 @@ export default [
         'increment end label': 'Move to the right',
         'show deck plank label': 'Return to deck',
         'show solo plank label': 'Maximize',
+        'exit fullscreen label': 'Exit fullscreen',
+        'show fullscreen plank label': 'Fullscreen',
         'close label': 'Close',
         'minify label': 'Minify',
         'open companion label': 'Open companion',

package/src/types.ts

@@ -2,8 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Schema } from 'effect';
+
 import { LayoutAction } from '@dxos/app-framework';
-import { S } from '@dxos/echo-schema';
+import { type DeepReadonly } from '@dxos/util';
 
 import { DECK_PLUGIN } from './meta';
 
@@ -22,33 +24,33 @@ export type Overscroll = (typeof OverscrollOptions)[number];
 export type Part = 'solo' | 'deck' | 'complementary';
 export type ResolvedPart = Part | 'solo-primary' | 'solo-companion';
 
-export const DeckSettingsSchema = S.Struct({
-  showHints: S.optional(S.Boolean),
-  enableDeck: S.optional(S.Boolean),
-  enableNativeRedirect: S.optional(S.Boolean),
-  enableStatusbar: S.optional(S.Boolean),
-  newPlankPositioning: S.optional(S.Literal(...NewPlankPositions)),
-  overscroll: S.optional(S.Literal(...OverscrollOptions)),
-}).pipe(S.mutable);
-export type DeckSettingsProps = S.Schema.Type<typeof DeckSettingsSchema>;
+export const DeckSettingsSchema = Schema.Struct({
+  showHints: Schema.optional(Schema.Boolean),
+  enableDeck: Schema.optional(Schema.Boolean),
+  enableStatusbar: Schema.optional(Schema.Boolean),
+  enableNativeRedirect: Schema.optional(Schema.Boolean),
+  newPlankPositioning: Schema.optional(Schema.Literal(...NewPlankPositions)),
+  overscroll: Schema.optional(Schema.Literal(...OverscrollOptions)),
+}).pipe(Schema.mutable);
+export type DeckSettingsProps = Schema.Schema.Type<typeof DeckSettingsSchema>;
 
-export const PlankSizing = S.Record({ key: S.String, value: S.Number });
-export type PlankSizing = S.Schema.Type<typeof PlankSizing>;
+export const PlankSizing = Schema.Record({ key: Schema.String, value: Schema.Number });
+export type PlankSizing = Schema.Schema.Type<typeof PlankSizing>;
 
 // State of an individual deck.
-export const DeckState = S.Struct({
+export const DeckState = Schema.Struct({
   /** If false, the deck has not yet left solo mode and new planks should be soloed. */
-  initialized: S.Boolean,
-  active: S.mutable(S.Array(S.String)),
+  initialized: Schema.Boolean,
+  active: Schema.mutable(Schema.Array(Schema.String)),
   // TODO(wittjosiah): Piping into both mutable and optional caused invalid typescript output.
-  activeCompanions: S.optional(S.mutable(S.Record({ key: S.String, value: S.String }))),
-  inactive: S.mutable(S.Array(S.String)),
-  solo: S.optional(S.String),
-  fullscreen: S.Boolean,
-  plankSizing: S.mutable(PlankSizing),
-  companionFrameSizing: S.mutable(PlankSizing),
+  activeCompanions: Schema.optional(Schema.mutable(Schema.Record({ key: Schema.String, value: Schema.String }))),
+  inactive: Schema.mutable(Schema.Array(Schema.String)),
+  solo: Schema.optional(Schema.String),
+  fullscreen: Schema.Boolean,
+  plankSizing: Schema.mutable(PlankSizing),
+  companionFrameSizing: Schema.mutable(PlankSizing),
 });
-export type DeckState = S.Schema.Type<typeof DeckState>;
+export type DeckState = Schema.Schema.Type<typeof DeckState>;
 
 export const defaultDeck: DeckState = {
   initialized: false,
@@ -61,84 +63,88 @@ export const defaultDeck: DeckState = {
   companionFrameSizing: {},
 };
 
-const LayoutMode = S.Literal('deck', 'solo', 'fullscreen');
-export type LayoutMode = S.Schema.Type<typeof LayoutMode>;
-export const isLayoutMode = (value: any): value is LayoutMode => S.is(LayoutMode)(value);
+const LayoutMode = Schema.Literal('deck', 'solo', 'solo--fullscreen');
+export type LayoutMode = Schema.Schema.Type<typeof LayoutMode>;
+export const isLayoutMode = (value: any): value is LayoutMode => Schema.is(LayoutMode)(value);
 
-export const getMode = (deck: DeckState): LayoutMode => {
+export const getMode = (deck: DeckState | DeepReadonly<DeckState>): LayoutMode => {
   if (deck.solo) {
-    return deck.fullscreen ? 'fullscreen' : 'solo';
+    return deck.fullscreen ? 'solo--fullscreen' : 'solo';
   }
 
   return 'deck';
 };
 
 // State of the deck plugin.
-export const DeckPluginState = S.Struct({
-  sidebarState: S.Literal('closed', 'collapsed', 'expanded'),
-  complementarySidebarState: S.Literal('closed', 'collapsed', 'expanded'),
-  complementarySidebarPanel: S.optional(S.String),
-
-  dialogOpen: S.Boolean,
+export const DeckPluginState = Schema.Struct({
+  sidebarState: Schema.Literal('closed', 'collapsed', 'expanded'),
+  complementarySidebarState: Schema.Literal('closed', 'collapsed', 'expanded'),
+  complementarySidebarPanel: Schema.optional(Schema.String),
+
+  dialogOpen: Schema.Boolean,
+  dialogType: Schema.optional(Schema.Literal('default', 'alert')),
+  dialogBlockAlign: Schema.optional(Schema.Literal('start', 'center', 'end')),
+  dialogOverlayClasses: Schema.optional(Schema.String),
+  dialogOverlayStyle: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
   /** Data to be passed to the dialog Surface. */
-  dialogContent: S.optional(S.Any),
-  dialogBlockAlign: S.optional(S.Literal('start', 'center', 'end')),
-  dialogType: S.optional(S.Literal('default', 'alert')),
+  dialogContent: Schema.optional(Schema.Any),
 
-  popoverOpen: S.Boolean,
-  popoverSide: S.optional(S.Literal('top', 'right', 'bottom', 'left')),
+  popoverOpen: Schema.Boolean,
+  popoverSide: Schema.optional(Schema.Literal('top', 'right', 'bottom', 'left')),
+  popoverAnchor: Schema.optional(Schema.Any),
+  popoverAnchorId: Schema.optional(Schema.String),
   /** Data to be passed to the popover Surface. */
-  popoverContent: S.optional(S.Any),
-  popoverAnchorId: S.optional(S.String),
+  popoverContent: Schema.optional(Schema.Any),
 
-  toasts: S.mutable(S.Array(LayoutAction.Toast)),
-  currentUndoId: S.optional(S.String),
+  toasts: Schema.mutable(Schema.Array(LayoutAction.Toast)),
+  currentUndoId: Schema.optional(Schema.String),
 
-  activeDeck: S.String,
-  previousDeck: S.String,
-  decks: S.mutable(S.Record({ key: S.String, value: S.mutable(DeckState) })),
-  previousMode: S.mutable(S.Record({ key: S.String, value: LayoutMode })),
-  deck: S.mutable(DeckState),
+  activeDeck: Schema.String,
+  previousDeck: Schema.String,
+  decks: Schema.mutable(Schema.Record({ key: Schema.String, value: Schema.mutable(DeckState) })),
+  previousMode: Schema.mutable(Schema.Record({ key: Schema.String, value: LayoutMode })),
+  deck: Schema.mutable(DeckState),
 
   /** The identifier of a component to scroll into view when it is mounted. */
-  scrollIntoView: S.optional(S.String),
-}).pipe(S.mutable);
+  scrollIntoView: Schema.optional(Schema.String),
+}).pipe(Schema.mutable);
 
-export type DeckPluginState = S.Schema.Type<typeof DeckPluginState>;
+export type DeckPluginState = Schema.Schema.Type<typeof DeckPluginState>;
 
 export const DECK_ACTION = `${DECK_PLUGIN}/action`;
 
 export namespace DeckAction {
-  const PartAdjustmentSchema = S.Union(
-    S.Literal('close').annotations({ description: 'Close the plank.' }),
-    S.Literal('companion').annotations({ description: 'Open the companion plank.' }),
-    S.Literal('solo').annotations({ description: 'Solo the plank.' }),
-    S.Literal('increment-start').annotations({ description: 'Move the plank towards the start of the deck.' }),
-    S.Literal('increment-end').annotations({ description: 'Move the plank towards the end of the deck.' }),
+  const PartAdjustmentSchema = Schema.Union(
+    Schema.Literal('close').annotations({ description: 'Close the plank.' }),
+    Schema.Literal('companion').annotations({ description: 'Open the companion plank.' }),
+    Schema.Literal('solo').annotations({ description: 'Solo the plank.' }),
+    Schema.Literal('solo--fullscreen').annotations({ description: 'Fullscreen the plank.' }),
+    Schema.Literal('increment-start').annotations({ description: 'Move the plank towards the start of the deck.' }),
+    Schema.Literal('increment-end').annotations({ description: 'Move the plank towards the end of the deck.' }),
   );
-  export type PartAdjustment = S.Schema.Type<typeof PartAdjustmentSchema>;
-  export const Adjustment = S.mutable(S.Struct({ id: S.String, type: PartAdjustmentSchema }));
-  export type Adjustment = S.Schema.Type<typeof Adjustment>;
+  export type PartAdjustment = Schema.Schema.Type<typeof PartAdjustmentSchema>;
+  export const Adjustment = Schema.mutable(Schema.Struct({ id: Schema.String, type: PartAdjustmentSchema }));
+  export type Adjustment = Schema.Schema.Type<typeof Adjustment>;
 
   // An atomic transaction to apply to the deck, describing which element to move to which location.
-  export class Adjust extends S.TaggedClass<Adjust>()(`${DECK_ACTION}/adjust`, {
+  export class Adjust extends Schema.TaggedClass<Adjust>()(`${DECK_ACTION}/adjust`, {
     input: Adjustment,
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 
-  export class UpdatePlankSize extends S.TaggedClass<UpdatePlankSize>()(`${DECK_ACTION}/update-plank-size`, {
-    input: S.Struct({
-      id: S.String,
-      size: S.Number,
+  export class UpdatePlankSize extends Schema.TaggedClass<UpdatePlankSize>()(`${DECK_ACTION}/update-plank-size`, {
+    input: Schema.Struct({
+      id: Schema.String,
+      size: Schema.Number,
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 
-  export class ChangeCompanion extends S.TaggedClass<ChangeCompanion>()(`${DECK_ACTION}/change-companion`, {
-    input: S.Struct({
-      primary: S.String,
-      companion: S.Union(S.String, S.Null),
+  export class ChangeCompanion extends Schema.TaggedClass<ChangeCompanion>()(`${DECK_ACTION}/change-companion`, {
+    input: Schema.Struct({
+      primary: Schema.String,
+      companion: Schema.Union(Schema.String, Schema.Null),
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 }

package/src/util/index.ts

@@ -2,9 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
+export * from './layoutAppliesTopbar';
 export * from './overscroll';
 export * from './set-active';
-export * from './useBreakpoints';
-export * from './layoutAppliesTopbar';
-export * from './useHoistStatusbar';
-export * from './useCompanions';

package/src/util/layoutAppliesTopbar.ts

@@ -2,6 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-export const layoutAppliesTopbar = (breakpoint: string) => {
-  return document.body.getAttribute('data-platform') === 'win' && breakpoint === 'desktop';
+import { type LayoutMode } from '../types';
+
+export const layoutAppliesTopbar = (breakpoint: string, layoutMode?: LayoutMode) => {
+  return (
+    document.body.getAttribute('data-platform') === 'win' &&
+    breakpoint === 'desktop' &&
+    layoutMode !== 'solo--fullscreen'
+  );
 };

package/dist/lib/browser/app-graph-builder-VYZ4IWI3.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/app-graph-builder.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Capabilities, contributes, createIntent, LayoutAction, type PluginsContext } from '@dxos/app-framework';\nimport { AttentionCapabilities } from '@dxos/plugin-attention';\nimport { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';\n\nimport { DeckCapabilities } from './capabilities';\nimport { DECK_PLUGIN } from '../meta';\n\nexport default (context: PluginsContext) =>\n  contributes(\n    Capabilities.AppGraphBuilder,\n    createExtension({\n      id: DECK_PLUGIN,\n      filter: (node): node is Node<null> => node.id === ROOT_ID,\n      actions: () => {\n        const state = context.requestCapability(DeckCapabilities.MutableDeckState);\n\n        // NOTE(Zan): This is currently disabled.\n        // TODO(Zan): Fullscreen needs to know the active node and provide that to the layout part.\n        const _fullscreen = {\n          id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,\n          data: async () => {\n            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);\n            await dispatch(createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }));\n          },\n          properties: {\n            label: ['toggle fullscreen label', { ns: DECK_PLUGIN }],\n            icon: 'ph--arrows-out--regular',\n            keyBinding: {\n              macos: 'ctrl+meta+f',\n              windows: 'shift+ctrl+f',\n            },\n          },\n        };\n\n        const closeCurrent = {\n          id: `${LayoutAction.Close._tag}/current`,\n          data: async () => {\n            const attention = context.requestCapability(AttentionCapabilities.Attention);\n            const attended = attention.current.at(-1);\n            if (attended) {\n              const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);\n              await dispatch(\n                createIntent(LayoutAction.Close, { part: 'main', subject: [attended], options: { state: false } }),\n              );\n            }\n          },\n          properties: {\n            label: ['close current label', { ns: DECK_PLUGIN }],\n            icon: 'ph--x--regular',\n          },\n        };\n\n        const closeOthers = {\n          id: `${LayoutAction.Close._tag}/others`,\n          data: async () => {\n            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);\n            const attention = context.requestCapability(AttentionCapabilities.Attention);\n            const attended = attention.current.at(-1);\n            const ids = state.deck.active.filter((id) => id !== attended) ?? [];\n            await dispatch(createIntent(LayoutAction.Close, { part: 'main', subject: ids, options: { state: false } }));\n          },\n          properties: {\n            label: ['close others label', { ns: DECK_PLUGIN }],\n            icon: 'ph--x-square--regular',\n          },\n        };\n\n        const closeAll = {\n          id: `${LayoutAction.Close._tag}/all`,\n          data: async () => {\n            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);\n            await dispatch(\n              createIntent(LayoutAction.Close, {\n                part: 'main',\n                subject: state.deck.active,\n                options: { state: false },\n              }),\n            );\n          },\n          properties: {\n            label: ['close all label', { ns: DECK_PLUGIN }],\n            icon: 'ph--x-circle--regular',\n          },\n        };\n\n        const toggleSidebar = {\n          id: `${LayoutAction.UpdateSidebar._tag}/nav`,\n          data: async () => {\n            state.sidebarState = state.sidebarState === 'expanded' ? 'collapsed' : 'expanded';\n          },\n          properties: {\n            label: [\n              state.sidebarState === 'expanded' ? 'collapse navigation sidebar label' : 'open navigation sidebar label',\n              { ns: DECK_PLUGIN },\n            ],\n            icon: 'ph--sidebar--regular',\n            keyBinding: {\n              macos: 'meta+b',\n            },\n            disposition: 'pin-end',\n            position: 'hoist',\n            l0Breakpoint: 'lg',\n          },\n        };\n\n        return !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar];\n      },\n    }),\n  );\n"],
-  "mappings": "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",
-  "names": ["Capabilities", "contributes", "createIntent", "LayoutAction", "AttentionCapabilities", "createExtension", "ROOT_ID", "context", "contributes", "Capabilities", "AppGraphBuilder", "createExtension", "id", "DECK_PLUGIN", "filter", "node", "ROOT_ID", "actions", "state", "requestCapability", "DeckCapabilities", "MutableDeckState", "_fullscreen", "LayoutAction", "UpdateLayout", "_tag", "data", "dispatchPromise", "dispatch", "IntentDispatcher", "createIntent", "SetLayoutMode", "part", "options", "mode", "properties", "label", "ns", "icon", "keyBinding", "macos", "windows", "closeCurrent", "Close", "attention", "AttentionCapabilities", "Attention", "attended", "current", "at", "subject", "closeOthers", "ids", "deck", "active", "closeAll", "toggleSidebar", "UpdateSidebar", "sidebarState", "disposition", "position", "l0Breakpoint", "solo"]
-}