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

package/src/components/Sidebar/ComplementarySidebar.tsx

@@ -12,20 +12,51 @@ import React, {
   useState,
 } from 'react';
 
-import { LayoutAction, Surface, createIntent, useCapability, useIntentDispatcher } from '@dxos/app-framework';
+import {
+  LayoutAction,
+  Surface,
+  createIntent,
+  useAppGraph,
+  useCapability,
+  useIntentDispatcher,
+} from '@dxos/app-framework';
+import { type Node } from '@dxos/plugin-graph';
 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 { getMode } from '../../types';
-import { layoutAppliesTopbar } from '../../util';
+import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '../../types';
+import { layoutAppliesTopbar, useBreakpoints, useHoistStatusbar } 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;
 };
@@ -34,14 +65,13 @@ 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, layoutMode);
-  const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
+  const topbar = layoutAppliesTopbar(breakpoint);
+  const hoistStatusbar = useHoistStatusbar(breakpoint);
 
   const companions = useDeckCompanions();
-  const activeCompanion = companions.find((companion) => getCompanionId(companion.id) === current);
-  const activeId = activeCompanion && getCompanionId(activeCompanion.id);
+  const activeCompanion = companions.find((companion) => getCompanionId(companion.id) === current) ?? companions.at(0);
+  const activeId = getCompanionId(activeCompanion?.id ?? 'never');
   const [internalValue, setInternalValue] = useState(activeId);
 
   useEffect(() => {
@@ -71,14 +101,6 @@ 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}
@@ -123,22 +145,21 @@ export const ComplementarySidebar = ({ current }: ComplementarySidebarProps) =>
             <ToggleComplementarySidebarButton />
           </div>
         </div>
-        {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>
-          ))}
+        {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>
   );

package/src/components/Sidebar/Sidebar.tsx

@@ -8,19 +8,16 @@ 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 { getMode } from '../../types';
-import { layoutAppliesTopbar } from '../../util';
+import { layoutAppliesTopbar, useBreakpoints, useHoistStatusbar } from '../../util';
 
 const label = ['sidebar title', { ns: DECK_PLUGIN }] satisfies Label;
 
 export const Sidebar = () => {
-  const { popoverAnchorId, activeDeck: current, deck } = useCapability(DeckCapabilities.DeckState);
+  const { popoverAnchorId, activeDeck: current } = useCapability(DeckCapabilities.DeckState);
   const breakpoint = useBreakpoints();
-  const layoutMode = getMode(deck);
-  const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
-  const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
+  const topbar = layoutAppliesTopbar(breakpoint);
+  const hoistStatusbar = useHoistStatusbar(breakpoint);
 
   const navigationData = useMemo(
     () => ({ popoverAnchorId, topbar, hoistStatusbar, current }),

package/src/components/Sidebar/SidebarButton.tsx

@@ -2,14 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import React from 'react';
 
-import { createIntent, LayoutAction, useCapability, useIntentDispatcher } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework';
 import { IconButton, type IconButtonProps, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 
 import { DeckCapabilities } from '../../capabilities';
-import { useDeckCompanions } from '../../hooks';
-import { getCompanionId } from '../../hooks/useDeckCompanions';
 import { DECK_PLUGIN } from '../../meta';
 
 export const ToggleSidebarButton = ({
@@ -49,37 +47,16 @@ export const CloseSidebarButton = () => {
   );
 };
 
-export const ToggleComplementarySidebarButton = ({
-  inR0,
-  classNames,
-  current,
-}: ThemedClassName<{ inR0?: boolean; current?: string }>) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+export const ToggleComplementarySidebarButton = ({ inR0, classNames }: ThemedClassName<{ inR0?: boolean }>) => {
   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]);
-
-  // TODO(thure): This should have a tooltip but is suppressed because focus is getting set on this twice when the app
-  //  first mounts, causing even `suppressNextTooltip` not to have the intended effect.
   return (
     <IconButton
-      noTooltip
       iconOnly
-      onClick={handleClick}
+      onClick={() =>
+        (layoutContext.complementarySidebarState =
+          layoutContext.complementarySidebarState === 'expanded' ? 'collapsed' : 'expanded')
+      }
       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-deckSurface lg:hidden';
+const sidebarToggleStyles = 'bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deck lg:hidden';
 
 export const fixedSidebarToggleStyles = mx(sidebarToggleStyles, 'inline-start-2');
 

package/src/hooks/index.ts

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

package/src/hooks/useNodeActionExpander.ts

@@ -4,14 +4,19 @@
 
 import { useEffect } from 'react';
 
-import { getGraph, type Node } from '@dxos/plugin-graph';
+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);
+};
 
 export const useNodeActionExpander = (node?: Node) => {
   useEffect(() => {
     if (node) {
       const frame = requestAnimationFrame(() => {
-        const graph = getGraph(node);
-        graph.expand(node.id);
+        void expandNodeActions(node);
       });
       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 './hooks';
+export { useCompanions } from './util';

package/src/translations.ts

@@ -45,8 +45,6 @@ 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,10 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
-
 import { LayoutAction } from '@dxos/app-framework';
-import { type DeepReadonly } from '@dxos/util';
+import { S } from '@dxos/echo-schema';
 
 import { DECK_PLUGIN } from './meta';
 
@@ -24,33 +22,33 @@ export type Overscroll = (typeof OverscrollOptions)[number];
 export type Part = 'solo' | 'deck' | 'complementary';
 export type ResolvedPart = Part | 'solo-primary' | 'solo-companion';
 
-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 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 PlankSizing = Schema.Record({ key: Schema.String, value: Schema.Number });
-export type PlankSizing = Schema.Schema.Type<typeof PlankSizing>;
+export const PlankSizing = S.Record({ key: S.String, value: S.Number });
+export type PlankSizing = S.Schema.Type<typeof PlankSizing>;
 
 // State of an individual deck.
-export const DeckState = Schema.Struct({
+export const DeckState = S.Struct({
   /** If false, the deck has not yet left solo mode and new planks should be soloed. */
-  initialized: Schema.Boolean,
-  active: Schema.mutable(Schema.Array(Schema.String)),
+  initialized: S.Boolean,
+  active: S.mutable(S.Array(S.String)),
   // TODO(wittjosiah): Piping into both mutable and optional caused invalid typescript output.
-  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),
+  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),
 });
-export type DeckState = Schema.Schema.Type<typeof DeckState>;
+export type DeckState = S.Schema.Type<typeof DeckState>;
 
 export const defaultDeck: DeckState = {
   initialized: false,
@@ -63,86 +61,84 @@ export const defaultDeck: DeckState = {
   companionFrameSizing: {},
 };
 
-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);
+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);
 
-export const getMode = (deck: DeckState | DeepReadonly<DeckState>): LayoutMode => {
+export const getMode = (deck: DeckState): LayoutMode => {
   if (deck.solo) {
-    return deck.fullscreen ? 'solo--fullscreen' : 'solo';
+    return deck.fullscreen ? 'fullscreen' : 'solo';
   }
 
   return 'deck';
 };
 
 // State of the deck plugin.
-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,
-  dialogBlockAlign: Schema.optional(Schema.Literal('start', 'center', 'end')),
-  dialogType: Schema.optional(Schema.Literal('default', 'alert')),
+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,
   /** Data to be passed to the dialog Surface. */
-  dialogContent: Schema.optional(Schema.Any),
+  dialogContent: S.optional(S.Any),
+  dialogBlockAlign: S.optional(S.Literal('start', 'center', 'end')),
+  dialogType: S.optional(S.Literal('default', 'alert')),
 
-  popoverOpen: Schema.Boolean,
-  popoverSide: Schema.optional(Schema.Literal('top', 'right', 'bottom', 'left')),
-  popoverAnchor: Schema.optional(Schema.Any),
-  popoverAnchorId: Schema.optional(Schema.String),
+  popoverOpen: S.Boolean,
+  popoverSide: S.optional(S.Literal('top', 'right', 'bottom', 'left')),
   /** Data to be passed to the popover Surface. */
-  popoverContent: Schema.optional(Schema.Any),
+  popoverContent: S.optional(S.Any),
+  popoverAnchorId: S.optional(S.String),
 
-  toasts: Schema.mutable(Schema.Array(LayoutAction.Toast)),
-  currentUndoId: Schema.optional(Schema.String),
+  toasts: S.mutable(S.Array(LayoutAction.Toast)),
+  currentUndoId: S.optional(S.String),
 
-  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),
+  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),
 
   /** The identifier of a component to scroll into view when it is mounted. */
-  scrollIntoView: Schema.optional(Schema.String),
-}).pipe(Schema.mutable);
+  scrollIntoView: S.optional(S.String),
+}).pipe(S.mutable);
 
-export type DeckPluginState = Schema.Schema.Type<typeof DeckPluginState>;
+export type DeckPluginState = S.Schema.Type<typeof DeckPluginState>;
 
 export const DECK_ACTION = `${DECK_PLUGIN}/action`;
 
 export namespace DeckAction {
-  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.' }),
+  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.' }),
   );
-  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>;
+  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>;
 
   // An atomic transaction to apply to the deck, describing which element to move to which location.
-  export class Adjust extends Schema.TaggedClass<Adjust>()(`${DECK_ACTION}/adjust`, {
+  export class Adjust extends S.TaggedClass<Adjust>()(`${DECK_ACTION}/adjust`, {
     input: Adjustment,
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class UpdatePlankSize extends Schema.TaggedClass<UpdatePlankSize>()(`${DECK_ACTION}/update-plank-size`, {
-    input: Schema.Struct({
-      id: Schema.String,
-      size: Schema.Number,
+  export class UpdatePlankSize extends S.TaggedClass<UpdatePlankSize>()(`${DECK_ACTION}/update-plank-size`, {
+    input: S.Struct({
+      id: S.String,
+      size: S.Number,
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class ChangeCompanion extends Schema.TaggedClass<ChangeCompanion>()(`${DECK_ACTION}/change-companion`, {
-    input: Schema.Struct({
-      primary: Schema.String,
-      companion: Schema.Union(Schema.String, Schema.Null),
+  export class ChangeCompanion extends S.TaggedClass<ChangeCompanion>()(`${DECK_ACTION}/change-companion`, {
+    input: S.Struct({
+      primary: S.String,
+      companion: S.Union(S.String, S.Null),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 }

package/src/util/index.ts

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

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

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

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

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

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/app-graph-builder.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Rx } from '@effect-rx/rx-react';\nimport { Option, pipe } from 'effect';\n\nimport { Capabilities, contributes, createIntent, LayoutAction, type PluginContext } from '@dxos/app-framework';\nimport { AttentionCapabilities } from '@dxos/plugin-attention';\nimport { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';\n\nimport { DeckCapabilities } from './capabilities';\nimport { DECK_PLUGIN } from '../meta';\n\nexport default (context: PluginContext) =>\n  contributes(\n    Capabilities.AppGraphBuilder,\n    createExtension({\n      id: DECK_PLUGIN,\n      actions: (node) =>\n        Rx.make((get) =>\n          pipe(\n            get(node),\n            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),\n            Option.map(() => {\n              const state = context.getCapability(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.getCapability(Capabilities.IntentDispatcher);\n                  await dispatch(\n                    createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }),\n                  );\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.getCapability(AttentionCapabilities.Attention);\n                  const attended = attention.current.at(-1);\n                  if (attended) {\n                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);\n                    await dispatch(\n                      createIntent(LayoutAction.Close, {\n                        part: 'main',\n                        subject: [attended],\n                        options: { state: false },\n                      }),\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.getCapability(Capabilities.IntentDispatcher);\n                  const attention = context.getCapability(AttentionCapabilities.Attention);\n                  const attended = attention.current.at(-1);\n                  const ids = state.deck.active.filter((id) => id !== attended) ?? [];\n                  await dispatch(\n                    createIntent(LayoutAction.Close, { part: 'main', subject: ids, options: { state: false } }),\n                  );\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.getCapability(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                    get(\n                      rxFromSignal(() =>\n                        state.sidebarState === 'expanded'\n                          ? 'collapse navigation sidebar label'\n                          : 'open navigation sidebar label',\n                      ),\n                    ),\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 get(\n                rxFromSignal(() =>\n                  !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar],\n                ),\n              );\n            }),\n            Option.getOrElse(() => []),\n          ),\n        ),\n    }),\n  );\n"],
-  "mappings": "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",
-  "names": ["Rx", "Option", "pipe", "Capabilities", "contributes", "createIntent", "LayoutAction", "AttentionCapabilities", "createExtension", "ROOT_ID", "rxFromSignal", "context", "contributes", "Capabilities", "AppGraphBuilder", "createExtension", "id", "DECK_PLUGIN", "actions", "node", "Rx", "make", "get", "pipe", "Option", "flatMap", "ROOT_ID", "some", "none", "map", "state", "getCapability", "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", "filter", "closeAll", "toggleSidebar", "UpdateSidebar", "sidebarState", "rxFromSignal", "disposition", "position", "l0Breakpoint", "solo", "getOrElse"]
-}

package/dist/lib/browser/check-app-scheme-7AXGR6UT.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/check-app-scheme.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';\n\nimport { DECK_PLUGIN } from '../meta';\nimport { type DeckSettingsProps } from '../types';\n\nconst isSocket = !!(globalThis as any).__args;\n\n// TODO(mjamesderocher): Can we get this directly from Socket?\nconst appScheme = 'composer://';\n\n// TODO(mjamesderocher): Factor out as part of NavigationPlugin.\nconst checkAppScheme = (url: string) => {\n  const iframe = document.createElement('iframe');\n  iframe.style.display = 'none';\n  document.body.appendChild(iframe);\n\n  iframe.src = url + window.location.pathname.replace(/^\\/+/, '') + window.location.search;\n\n  const timer = setTimeout(() => {\n    document.body.removeChild(iframe);\n  }, 3000);\n\n  window.addEventListener('pagehide', (event) => {\n    clearTimeout(timer);\n    document.body.removeChild(iframe);\n  });\n};\n\nexport default async (context: PluginContext) => {\n  const settings = context.getCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(DECK_PLUGIN)?.value;\n  if (!isSocket && settings?.enableNativeRedirect) {\n    checkAppScheme(appScheme);\n  }\n\n  return contributes(Capabilities.Null, null);\n};\n"],
-  "mappings": ";;;;;AAIA,SAASA,cAAcC,mBAAuC;AAK9D,IAAMC,WAAW,CAAC,CAAEC,WAAmBC;AAGvC,IAAMC,YAAY;AAGlB,IAAMC,iBAAiB,CAACC,QAAAA;AACtB,QAAMC,SAASC,SAASC,cAAc,QAAA;AACtCF,SAAOG,MAAMC,UAAU;AACvBH,WAASI,KAAKC,YAAYN,MAAAA;AAE1BA,SAAOO,MAAMR,MAAMS,OAAOC,SAASC,SAASC,QAAQ,QAAQ,EAAA,IAAMH,OAAOC,SAASG;AAElF,QAAMC,QAAQC,WAAW,MAAA;AACvBb,aAASI,KAAKU,YAAYf,MAAAA;EAC5B,GAAG,GAAA;AAEHQ,SAAOQ,iBAAiB,YAAY,CAACC,UAAAA;AACnCC,iBAAaL,KAAAA;AACbZ,aAASI,KAAKU,YAAYf,MAAAA;EAC5B,CAAA;AACF;AAEA,IAAA,2BAAe,OAAOmB,YAAAA;AACpB,QAAMC,WAAWD,QAAQE,cAAcC,aAAaC,aAAa,EAAEC,SAA4BC,WAAAA,GAAcC;AAC7G,MAAI,CAAChC,YAAY0B,UAAUO,sBAAsB;AAC/C7B,mBAAeD,SAAAA;EACjB;AAEA,SAAO+B,YAAYN,aAAaO,MAAM,IAAA;AACxC;",
-  "names": ["Capabilities", "contributes", "isSocket", "globalThis", "__args", "appScheme", "checkAppScheme", "url", "iframe", "document", "createElement", "style", "display", "body", "appendChild", "src", "window", "location", "pathname", "replace", "search", "timer", "setTimeout", "removeChild", "addEventListener", "event", "clearTimeout", "context", "settings", "getCapability", "Capabilities", "SettingsStore", "getStore", "DECK_PLUGIN", "value", "enableNativeRedirect", "contributes", "Null"]
-}