@dxos/plugin-deck 0.7.5-labs.e27f9b9 → 0.7.5-labs.ea4b4c2

package/src/capabilities/intent-resolver.ts

@@ -149,16 +149,16 @@ export default (context: PluginsContext) =>
           const current = deck.solo ? [deck.solo] : deck.active;
           // When un-soloing, the solo entry is added to the deck.
           const next = (
-            mode === 'solo' ? [subject ?? deck.solo ?? deck.active[0]] : [...deck.active, deck.solo]
+            mode !== 'deck' ? [subject ?? deck.solo ?? deck.active[0]] : [...deck.active, deck.solo]
           ).filter(nonNullable);
 
           const removed = current.filter((id) => !next.includes(id));
           const closed = Array.from(new Set([...deck.inactive.filter((id) => !next.includes(id)), ...removed]));
           deck.inactive = closed;
 
-          if (mode === 'solo' && next[0]) {
+          if (mode !== 'deck' && next[0]) {
             deck.solo = next[0];
-          } else if (mode !== 'solo' && deck.solo) {
+          } else if (mode === 'deck' && deck.solo) {
             deck.solo = undefined;
             deck.initialized = true;
           }

package/src/capabilities/set-active.ts

@@ -28,6 +28,10 @@ export const setActive = ({ next, state, attention }: SetActiveOptions) => {
       state.deck.active = next;
     }
 
+    if (state.deck.fullscreen && !state.deck.solo) {
+      state.deck.fullscreen = false;
+    }
+
     if (attention) {
       const attended = attention.current;
       const [attendedId] = Array.from(attended);

package/src/components/DeckLayout/DeckLayout.tsx

@@ -290,10 +290,20 @@ export const DeckLayout = ({ overscroll, showHints, panels, onDismissToast }: De
       </Popover.Portal>
 
       {/* Global dialog. */}
-      <Dialog.Root open={dialogOpen} onOpenChange={(nextOpen) => (context.dialogOpen = nextOpen)}>
-        <Dialog.Overlay blockAlign={dialogBlockAlign}>
+      {/* TODO(thure): End block alignment affecting `modal` and whether the surface renders in an overlay is tailored
+            to the needs of the ambient chat dialog. As the feature matures, consider separating concerns. */}
+      <Dialog.Root
+        modal={dialogBlockAlign !== 'end'}
+        open={dialogOpen}
+        onOpenChange={(nextOpen) => (context.dialogOpen = nextOpen)}
+      >
+        {dialogBlockAlign === 'end' ? (
           <Surface role='dialog' data={dialogContent} limit={1} />
-        </Dialog.Overlay>
+        ) : (
+          <Dialog.Overlay blockAlign={dialogBlockAlign}>
+            <Surface role='dialog' data={dialogContent} limit={1} />
+          </Dialog.Overlay>
+        )}
       </Dialog.Root>
 
       {/* Global toasts. */}

package/src/hooks/useNode.ts

@@ -34,7 +34,9 @@ export const useNode = <T = any>(graph: Graph, id?: string, timeout?: number): N
         if (node) {
           setNodeState(node);
         }
-      } catch {}
+      } catch {
+        // TODO(ZaymonFC): This leaves the resolved node in an invalid state in the case of a timeout.
+      }
     });
 
     return () => cancelAnimationFrame(frame);

package/src/types.ts

@@ -60,7 +60,7 @@ export const DeckState = S.mutable(
      * Data to be passed to the dialog Surface.
      */
     dialogContent: S.optional(S.Any),
-    dialogBlockAlign: S.optional(S.Literal('start', 'center')),
+    dialogBlockAlign: S.optional(S.Literal('start', 'center', 'end')),
     dialogType: S.optional(S.Literal('default', 'alert')),
 
     popoverOpen: S.Boolean,