@dxos/plugin-deck 0.8.4-main.fd6878d → 0.8.4-main.fffef41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (137) hide show
  1. package/dist/lib/browser/{app-graph-builder-DVEKLXB4.mjs → app-graph-builder-D74NTOMK.mjs} +18 -42
  2. package/dist/lib/browser/app-graph-builder-D74NTOMK.mjs.map +7 -0
  3. package/dist/lib/browser/{check-app-scheme-3BQJXWEY.mjs → check-app-scheme-HIEVFAAX.mjs} +6 -6
  4. package/dist/lib/browser/check-app-scheme-HIEVFAAX.mjs.map +7 -0
  5. package/dist/lib/browser/chunk-5KMJPIQC.mjs +16 -0
  6. package/dist/lib/browser/chunk-5KMJPIQC.mjs.map +7 -0
  7. package/dist/lib/browser/{chunk-F5BQOOEG.mjs → chunk-F3VCCHVL.mjs} +8 -6
  8. package/dist/lib/browser/chunk-F3VCCHVL.mjs.map +7 -0
  9. package/dist/lib/browser/{chunk-MX7WRVX3.mjs → chunk-QKCGZ45E.mjs} +18 -17
  10. package/dist/lib/browser/chunk-QKCGZ45E.mjs.map +7 -0
  11. package/dist/lib/browser/chunk-UXLU6CMW.mjs +16 -0
  12. package/dist/lib/browser/chunk-UXLU6CMW.mjs.map +7 -0
  13. package/dist/lib/browser/{chunk-NRCPV6AV.mjs → chunk-VBYJ664A.mjs} +12 -9
  14. package/dist/lib/browser/chunk-VBYJ664A.mjs.map +7 -0
  15. package/dist/lib/browser/{chunk-6MQIYIPY.mjs → chunk-VUJ6UNIJ.mjs} +420 -361
  16. package/dist/lib/browser/chunk-VUJ6UNIJ.mjs.map +7 -0
  17. package/dist/lib/browser/index.mjs +9 -9
  18. package/dist/lib/browser/index.mjs.map +3 -3
  19. package/dist/lib/browser/{intent-resolver-2SUIIV6N.mjs → intent-resolver-UA4YQGAC.mjs} +20 -17
  20. package/dist/lib/browser/intent-resolver-UA4YQGAC.mjs.map +7 -0
  21. package/dist/lib/browser/meta.json +1 -1
  22. package/dist/lib/browser/{react-root-GVZANZX7.mjs → react-root-JAMHKYWN.mjs} +13 -12
  23. package/dist/lib/browser/react-root-JAMHKYWN.mjs.map +7 -0
  24. package/dist/lib/browser/{react-surface-NXSSD2GW.mjs → react-surface-6LW337ZT.mjs} +13 -13
  25. package/dist/lib/browser/react-surface-6LW337ZT.mjs.map +7 -0
  26. package/dist/lib/browser/{settings-LUPQPZ27.mjs → settings-SDPTOCCM.mjs} +7 -6
  27. package/dist/lib/browser/{settings-LUPQPZ27.mjs.map → settings-SDPTOCCM.mjs.map} +3 -3
  28. package/dist/lib/browser/state-7IFAGZQO.mjs +12 -0
  29. package/dist/lib/browser/toolkit-L5CFXJCF.mjs +52 -0
  30. package/dist/lib/browser/toolkit-L5CFXJCF.mjs.map +7 -0
  31. package/dist/lib/browser/types/index.mjs +2 -2
  32. package/dist/lib/browser/{url-handler-LROZYQ26.mjs → url-handler-QEYGYE2H.mjs} +6 -6
  33. package/dist/lib/browser/{url-handler-LROZYQ26.mjs.map → url-handler-QEYGYE2H.mjs.map} +1 -1
  34. package/dist/types/src/DeckPlugin.d.ts +1 -1
  35. package/dist/types/src/DeckPlugin.d.ts.map +1 -1
  36. package/dist/types/src/capabilities/app-graph-builder.d.ts +1 -1
  37. package/dist/types/src/capabilities/app-graph-builder.d.ts.map +1 -1
  38. package/dist/types/src/capabilities/capabilities.d.ts.map +1 -1
  39. package/dist/types/src/capabilities/check-app-scheme.d.ts +1 -1
  40. package/dist/types/src/capabilities/index.d.ts +8 -8
  41. package/dist/types/src/capabilities/index.d.ts.map +1 -1
  42. package/dist/types/src/capabilities/intent-resolver.d.ts +1 -1
  43. package/dist/types/src/capabilities/intent-resolver.d.ts.map +1 -1
  44. package/dist/types/src/capabilities/react-root.d.ts +2 -2
  45. package/dist/types/src/capabilities/react-root.d.ts.map +1 -1
  46. package/dist/types/src/capabilities/react-surface.d.ts +1 -1
  47. package/dist/types/src/capabilities/settings.d.ts +1 -1
  48. package/dist/types/src/capabilities/settings.d.ts.map +1 -1
  49. package/dist/types/src/capabilities/state.d.ts +5 -2
  50. package/dist/types/src/capabilities/state.d.ts.map +1 -1
  51. package/dist/types/src/capabilities/toolkit.d.ts +23 -3
  52. package/dist/types/src/capabilities/toolkit.d.ts.map +1 -1
  53. package/dist/types/src/capabilities/tools.d.ts +1 -1
  54. package/dist/types/src/capabilities/url-handler.d.ts +1 -1
  55. package/dist/types/src/components/DeckLayout/DeckLayout.d.ts +2 -3
  56. package/dist/types/src/components/DeckLayout/DeckLayout.d.ts.map +1 -1
  57. package/dist/types/src/components/DeckLayout/DeckLayout.stories.d.ts +74 -0
  58. package/dist/types/src/components/DeckLayout/DeckLayout.stories.d.ts.map +1 -0
  59. package/dist/types/src/components/DeckLayout/DeckMain.d.ts +3 -0
  60. package/dist/types/src/components/DeckLayout/DeckMain.d.ts.map +1 -0
  61. package/dist/types/src/components/DeckLayout/Popover.d.ts.map +1 -1
  62. package/dist/types/src/components/DeckLayout/Toast.d.ts +5 -0
  63. package/dist/types/src/components/DeckLayout/Toast.d.ts.map +1 -1
  64. package/dist/types/src/components/DeckSettings/DeckSettings.d.ts.map +1 -1
  65. package/dist/types/src/components/Plank/Plank.d.ts.map +1 -1
  66. package/dist/types/src/components/Plank/Plank.stories.d.ts +86 -5
  67. package/dist/types/src/components/Plank/Plank.stories.d.ts.map +1 -1
  68. package/dist/types/src/components/Plank/PlankControls.d.ts.map +1 -1
  69. package/dist/types/src/components/Plank/PlankHeading.d.ts.map +1 -1
  70. package/dist/types/src/components/Sidebar/ComplementarySidebar.d.ts.map +1 -1
  71. package/dist/types/src/components/Sidebar/SidebarButton.d.ts.map +1 -1
  72. package/dist/types/src/events.d.ts.map +1 -1
  73. package/dist/types/src/hooks/useDeckCompanions.d.ts.map +1 -1
  74. package/dist/types/src/hooks/useHoistStatusbar.d.ts.map +1 -1
  75. package/dist/types/src/meta.d.ts +0 -1
  76. package/dist/types/src/meta.d.ts.map +1 -1
  77. package/dist/types/src/translations.d.ts +2 -0
  78. package/dist/types/src/translations.d.ts.map +1 -1
  79. package/dist/types/src/types/schema.d.ts +4 -3
  80. package/dist/types/src/types/schema.d.ts.map +1 -1
  81. package/dist/types/tsconfig.tsbuildinfo +1 -1
  82. package/package.json +44 -44
  83. package/src/DeckPlugin.ts +62 -63
  84. package/src/capabilities/app-graph-builder.ts +31 -30
  85. package/src/capabilities/capabilities.ts +3 -3
  86. package/src/capabilities/check-app-scheme.ts +2 -2
  87. package/src/capabilities/intent-resolver.ts +12 -10
  88. package/src/capabilities/react-root.tsx +4 -3
  89. package/src/capabilities/react-surface.tsx +4 -4
  90. package/src/capabilities/settings.ts +1 -0
  91. package/src/capabilities/state.ts +12 -4
  92. package/src/capabilities/toolkit.ts +28 -17
  93. package/src/capabilities/tools.ts +1 -1
  94. package/src/components/DeckLayout/ActiveNode.tsx +1 -1
  95. package/src/components/DeckLayout/Banner.tsx +3 -3
  96. package/src/components/DeckLayout/ContentEmpty.tsx +1 -1
  97. package/src/components/DeckLayout/DeckLayout.stories.tsx +63 -0
  98. package/src/components/DeckLayout/DeckLayout.tsx +8 -278
  99. package/src/components/DeckLayout/DeckMain.tsx +281 -0
  100. package/src/components/DeckLayout/Dialog.tsx +1 -1
  101. package/src/components/DeckLayout/Fallback.tsx +3 -3
  102. package/src/components/DeckLayout/Popover.tsx +4 -13
  103. package/src/components/DeckLayout/StatusBar.tsx +1 -1
  104. package/src/components/DeckLayout/Toast.tsx +28 -3
  105. package/src/components/DeckSettings/DeckSettings.tsx +80 -65
  106. package/src/components/Plank/Plank.stories.tsx +7 -9
  107. package/src/components/Plank/Plank.tsx +69 -37
  108. package/src/components/Plank/PlankControls.tsx +6 -5
  109. package/src/components/Plank/PlankError.tsx +2 -2
  110. package/src/components/Plank/PlankHeading.tsx +10 -9
  111. package/src/components/Sidebar/ComplementarySidebar.tsx +36 -16
  112. package/src/components/Sidebar/Sidebar.tsx +3 -3
  113. package/src/components/Sidebar/SidebarButton.tsx +14 -13
  114. package/src/events.ts +2 -2
  115. package/src/hooks/useCompanions.ts +1 -1
  116. package/src/hooks/useDeckCompanions.ts +2 -1
  117. package/src/hooks/useHoistStatusbar.ts +6 -4
  118. package/src/meta.ts +6 -3
  119. package/src/translations.ts +2 -0
  120. package/src/types/schema.ts +5 -3
  121. package/dist/lib/browser/app-graph-builder-DVEKLXB4.mjs.map +0 -7
  122. package/dist/lib/browser/check-app-scheme-3BQJXWEY.mjs.map +0 -7
  123. package/dist/lib/browser/chunk-6MQIYIPY.mjs.map +0 -7
  124. package/dist/lib/browser/chunk-F5BQOOEG.mjs.map +0 -7
  125. package/dist/lib/browser/chunk-M57WD3V6.mjs +0 -16
  126. package/dist/lib/browser/chunk-M57WD3V6.mjs.map +0 -7
  127. package/dist/lib/browser/chunk-MX7WRVX3.mjs.map +0 -7
  128. package/dist/lib/browser/chunk-NRCPV6AV.mjs.map +0 -7
  129. package/dist/lib/browser/chunk-Z5KITAZW.mjs +0 -13
  130. package/dist/lib/browser/chunk-Z5KITAZW.mjs.map +0 -7
  131. package/dist/lib/browser/intent-resolver-2SUIIV6N.mjs.map +0 -7
  132. package/dist/lib/browser/react-root-GVZANZX7.mjs.map +0 -7
  133. package/dist/lib/browser/react-surface-NXSSD2GW.mjs.map +0 -7
  134. package/dist/lib/browser/state-CRXR7X63.mjs +0 -12
  135. package/dist/lib/browser/toolkit-OBKFXX23.mjs +0 -47
  136. package/dist/lib/browser/toolkit-OBKFXX23.mjs.map +0 -7
  137. /package/dist/lib/browser/{state-CRXR7X63.mjs.map → state-7IFAGZQO.mjs.map} +0 -0
@@ -0,0 +1,281 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ import { untracked } from '@preact/signals-core';
6
+ import React, { Fragment, type UIEvent, useCallback, useEffect, useMemo, useRef } from 'react';
7
+
8
+ import { Capabilities, LayoutAction, createIntent } from '@dxos/app-framework';
9
+ import { useCapability, useIntentDispatcher, usePluginManager } from '@dxos/app-framework/react';
10
+ import { AttentionCapabilities } from '@dxos/plugin-attention';
11
+ import { Main, type MainProps, useMediaQuery, useOnTransition } from '@dxos/react-ui';
12
+ import { DEFAULT_HORIZONTAL_SIZE, Stack, StackContext } from '@dxos/react-ui-stack';
13
+ import { mainPaddingTransitions, mx } from '@dxos/react-ui-theme';
14
+
15
+ import { DeckCapabilities } from '../../capabilities';
16
+ import { useBreakpoints, useHoistStatusbar } from '../../hooks';
17
+ import { meta } from '../../meta';
18
+ import { type DeckSettingsProps, getMode } from '../../types';
19
+ import { calculateOverscroll, layoutAppliesTopbar } from '../../util';
20
+ import { fixedComplementarySidebarToggleStyles, fixedSidebarToggleStyles } from '../fragments';
21
+ import { Plank } from '../Plank';
22
+ import { ComplementarySidebar, Sidebar, ToggleComplementarySidebarButton, ToggleSidebarButton } from '../Sidebar';
23
+
24
+ import { ContentEmpty } from './ContentEmpty';
25
+ import { StatusBar } from './StatusBar';
26
+ import { Topbar } from './Topbar';
27
+
28
+ export const DeckMain = () => {
29
+ const { dispatchPromise: dispatch } = useIntentDispatcher();
30
+ const settings = useCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(meta.id)?.value;
31
+ const context = useCapability(DeckCapabilities.MutableDeckState);
32
+ const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck } = context;
33
+ const { active, activeCompanions, fullscreen, solo, plankSizing } = deck;
34
+ const layoutMode = getMode(deck);
35
+ const breakpoint = useBreakpoints();
36
+ const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
37
+ const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
38
+ const pluginManager = usePluginManager();
39
+
40
+ const scrollLeftRef = useRef<number>(null);
41
+ const deckRef = useRef<HTMLDivElement>(null);
42
+
43
+ // Ensure the first plank is attended when the deck is first rendered.
44
+ useEffect(() => {
45
+ // NOTE: Not `useAttended` so that the layout component is not re-rendered when the attended list changes.
46
+ const attended = untracked(() => {
47
+ const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
48
+ return attention.current;
49
+ });
50
+ const firstId = solo ?? active[0];
51
+ if (attended.length === 0 && firstId) {
52
+ // TODO(wittjosiah): Focusing the type button is a workaround.
53
+ // If the plank is directly focused on first load the focus ring appears.
54
+ document.querySelector<HTMLElement>(`article[data-attendable-id="${firstId}"] button`)?.focus();
55
+ }
56
+ }, []);
57
+
58
+ // Not using `breakpoint` to avoid firing when breakpoint changes between tablet and desktop.
59
+ // `ssr: false` to avoid using fallback values and flashing into solo mode on startup.
60
+ const [isNotMobile] = useMediaQuery('md');
61
+ const shouldRevert = useRef(false);
62
+ useEffect(() => {
63
+ if (!isNotMobile && getMode(deck) === 'deck') {
64
+ // NOTE: Not `useAttended` so that the layout component is not re-rendered when the attended list changes.
65
+ const attended = untracked(() => {
66
+ const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
67
+ return attention.current;
68
+ });
69
+
70
+ shouldRevert.current = true;
71
+ void dispatch(
72
+ createIntent(LayoutAction.SetLayoutMode, { part: 'mode', subject: attended[0], options: { mode: 'solo' } }),
73
+ );
74
+ } else if (isNotMobile && getMode(deck) === 'solo' && shouldRevert.current) {
75
+ void dispatch(createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { revert: true } }));
76
+ }
77
+ }, [isNotMobile, deck, dispatch]);
78
+
79
+ // When deck is disabled in settings, set to solo mode if the current layout mode is deck.
80
+ // TODO(thure): Applying this as an effect should be avoided over emitting the intent only when the setting changes.
81
+ useEffect(() => {
82
+ if (!settings?.enableDeck && layoutMode === 'deck') {
83
+ void dispatch(
84
+ createIntent(LayoutAction.SetLayoutMode, { part: 'mode', subject: active[0], options: { mode: 'solo' } }),
85
+ );
86
+ }
87
+ }, [settings?.enableDeck, dispatch, active, layoutMode]);
88
+
89
+ /**
90
+ * Clear scroll restoration state if the window is resized.
91
+ */
92
+ const handleResize = useCallback(() => {
93
+ scrollLeftRef.current = null;
94
+ }, []);
95
+
96
+ useEffect(() => {
97
+ window.addEventListener('resize', handleResize);
98
+ return () => window.removeEventListener('resize', handleResize);
99
+ }, [handleResize]);
100
+
101
+ const restoreScroll = useCallback(() => {
102
+ if (deckRef.current && scrollLeftRef.current != null) {
103
+ deckRef.current.scrollLeft = scrollLeftRef.current;
104
+ }
105
+ }, []);
106
+ useOnTransition(layoutMode, (mode) => mode !== 'deck', 'deck', restoreScroll);
107
+
108
+ /**
109
+ * Save scroll position as the user scrolls.
110
+ */
111
+ const handleScroll = useCallback(
112
+ (event: UIEvent) => {
113
+ if (!solo && event.currentTarget === event.target) {
114
+ scrollLeftRef.current = (event.target as HTMLDivElement).scrollLeft;
115
+ }
116
+ },
117
+ [solo],
118
+ );
119
+
120
+ const isEmpty = !solo && active.length === 0;
121
+
122
+ const padding = useMemo(() => {
123
+ if (!solo && settings?.overscroll === 'centering') {
124
+ return calculateOverscroll(active.length);
125
+ }
126
+ return {};
127
+ }, [solo, settings?.overscroll, deck]);
128
+
129
+ const mainPosition = useMemo(
130
+ () => [
131
+ 'grid !block-start-[env(safe-area-inset-top)]',
132
+ topbar && '!block-start-[calc(env(safe-area-inset-top)+var(--rail-size))]',
133
+ hoistStatusbar && 'lg:block-end-[--statusbar-size]',
134
+ ],
135
+ [topbar, hoistStatusbar],
136
+ );
137
+
138
+ const { order, itemsCount }: { order: Record<string, number>; itemsCount: number } = useMemo(() => {
139
+ return active.reduce(
140
+ (acc: { order: Record<string, number>; itemsCount: number }, entryId) => {
141
+ acc.order[entryId] = acc.itemsCount + 1;
142
+ acc.itemsCount += activeCompanions?.[entryId] ? 3 : 2;
143
+ return acc;
144
+ },
145
+ { order: {}, itemsCount: 0 },
146
+ );
147
+ }, [active, activeCompanions]);
148
+
149
+ return (
150
+ <Main.Root
151
+ navigationSidebarState={fullscreen ? 'closed' : context.sidebarState}
152
+ complementarySidebarState={fullscreen ? 'closed' : context.complementarySidebarState}
153
+ onNavigationSidebarStateChange={(next) => (context.sidebarState = next)}
154
+ onComplementarySidebarStateChange={(next) => (context.complementarySidebarState = next)}
155
+ >
156
+ {/* Left sidebar. */}
157
+ <Sidebar />
158
+
159
+ {/* Right sidebar. */}
160
+ <ComplementarySidebar current={complementarySidebarPanel} />
161
+
162
+ {/* Dialog overlay to dismiss dialogs. */}
163
+ <Main.Overlay />
164
+
165
+ {/* No content. */}
166
+ {isEmpty && (
167
+ <Main.Content bounce handlesFocus classNames={mainPosition}>
168
+ <ContentEmpty />
169
+ </Main.Content>
170
+ )}
171
+
172
+ {/* Solo/deck mode. */}
173
+ {!isEmpty && (
174
+ <Main.Content
175
+ bounce
176
+ handlesFocus
177
+ classNames={mainPosition}
178
+ style={
179
+ {
180
+ '--main-spacing': settings?.encapsulatedPlanks ? '0.75rem' : '0',
181
+ '--dx-main-sidebarWidth':
182
+ sidebarState === 'expanded'
183
+ ? 'var(--nav-sidebar-size)'
184
+ : sidebarState === 'collapsed'
185
+ ? 'var(--l0-size)'
186
+ : '0',
187
+ '--dx-main-complementaryWidth':
188
+ complementarySidebarState === 'expanded'
189
+ ? 'var(--complementary-sidebar-size)'
190
+ : complementarySidebarState === 'collapsed'
191
+ ? 'var(--rail-size)'
192
+ : '0',
193
+ '--dx-main-contentFirstWidth': `${plankSizing[active[0] ?? 'never'] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
194
+ '--dx-main-contentLastWidth': `${plankSizing[active[(active.length ?? 1) - 1] ?? 'never'] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
195
+ } as MainProps['style']
196
+ }
197
+ >
198
+ {/* Deck mode. */}
199
+ <div
200
+ role='none'
201
+ className={!solo ? 'relative bg-deckSurface overflow-hidden' : 'sr-only'}
202
+ {...(solo && { inert: true })}
203
+ >
204
+ {!topbar && !fullscreen && <ToggleSidebarButton classNames={fixedSidebarToggleStyles} />}
205
+ {!topbar && !fullscreen && (
206
+ <ToggleComplementarySidebarButton classNames={fixedComplementarySidebarToggleStyles} />
207
+ )}
208
+ <Stack
209
+ ref={deckRef}
210
+ orientation='horizontal'
211
+ size='contain'
212
+ itemsCount={itemsCount - 1}
213
+ classNames={[
214
+ 'absolute inset-block-[--main-spacing] -inset-inline-px bs-[calc(100%-2*var(--main-spacing))]',
215
+ mainPaddingTransitions,
216
+ ]}
217
+ style={padding}
218
+ onScroll={handleScroll}
219
+ >
220
+ {active.map((entryId) => (
221
+ <Fragment key={entryId}>
222
+ <PlankSeparator order={order[entryId] - 1} encapsulate={!!settings?.enableDeck} />
223
+ <Plank
224
+ id={entryId}
225
+ companionId={activeCompanions?.[entryId]}
226
+ part='deck'
227
+ order={order[entryId]}
228
+ active={active}
229
+ layoutMode={layoutMode}
230
+ settings={settings}
231
+ />
232
+ </Fragment>
233
+ ))}
234
+ </Stack>
235
+ </div>
236
+ {/* Solo mode. */}
237
+ <div
238
+ role='none'
239
+ className={solo ? 'relative overflow-hidden bg-deckSurface' : 'sr-only'}
240
+ {...(!solo && { inert: true })}
241
+ >
242
+ {!topbar && !fullscreen && <ToggleSidebarButton classNames={fixedSidebarToggleStyles} />}
243
+ {!topbar && !fullscreen && (
244
+ <ToggleComplementarySidebarButton classNames={fixedComplementarySidebarToggleStyles} />
245
+ )}
246
+ <StackContext.Provider
247
+ value={{
248
+ orientation: 'horizontal',
249
+ size: 'contain',
250
+ rail: true,
251
+ }}
252
+ >
253
+ <Plank
254
+ id={solo}
255
+ companionId={solo ? activeCompanions?.[solo] : undefined}
256
+ part='solo'
257
+ layoutMode={layoutMode}
258
+ settings={settings}
259
+ />
260
+ </StackContext.Provider>
261
+ </div>
262
+ </Main.Content>
263
+ )}
264
+
265
+ {/* Topbar. */}
266
+ {topbar && <Topbar />}
267
+
268
+ {/* Status bar. */}
269
+ {hoistStatusbar && <StatusBar showHints={settings?.showHints} />}
270
+ </Main.Root>
271
+ );
272
+ };
273
+
274
+ const PlankSeparator = ({ order, encapsulate }: { order: number; encapsulate?: boolean }) =>
275
+ order > 0 ? (
276
+ <span
277
+ role='separator'
278
+ className={mx('row-span-2 bg-deckSurface', encapsulate ? 'is-0' : 'is-4')}
279
+ style={{ gridColumn: order }}
280
+ />
281
+ ) : null;
@@ -4,7 +4,7 @@
4
4
 
5
5
  import React from 'react';
6
6
 
7
- import { Surface, useCapability } from '@dxos/app-framework';
7
+ import { Surface, useCapability } from '@dxos/app-framework/react';
8
8
  import { AlertDialog, Dialog as NaturalDialog } from '@dxos/react-ui';
9
9
 
10
10
  import { DeckCapabilities } from '../../capabilities';
@@ -7,10 +7,10 @@ import React from 'react';
7
7
  import { useTranslation } from '@dxos/react-ui';
8
8
  import { errorText, mx } from '@dxos/react-ui-theme';
9
9
 
10
- import { DECK_PLUGIN } from '../../meta';
10
+ import { meta } from '../../meta';
11
11
 
12
12
  export const Fallback = () => {
13
- const { t } = useTranslation(DECK_PLUGIN);
13
+ const { t } = useTranslation(meta.id);
14
14
 
15
15
  return (
16
16
  <div role='none' className='min-bs-screen is-full flex items-center justify-center p-8'>
@@ -18,7 +18,7 @@ export const Fallback = () => {
18
18
  role='alert'
19
19
  className={mx(
20
20
  errorText,
21
- 'border border-error-400/50 rounded-md flex items-center justify-center p-8 font-normal text-lg',
21
+ 'border border-roseFill rounded-md flex items-center justify-center p-8 font-normal text-lg',
22
22
  )}
23
23
  >
24
24
  {t('plugin error message')}
@@ -3,9 +3,9 @@
3
3
  //
4
4
 
5
5
  import { createContext } from '@radix-ui/react-context';
6
- import React, { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useState } from 'react';
6
+ import React, { type PropsWithChildren, useCallback, useEffect, useRef, useState } from 'react';
7
7
 
8
- import { Surface, useCapability } from '@dxos/app-framework';
8
+ import { Surface, useCapability } from '@dxos/app-framework/react';
9
9
  import { Popover, type PopoverContentInteractOutsideEvent } from '@dxos/react-ui';
10
10
 
11
11
  import { DeckCapabilities } from '../../capabilities';
@@ -76,23 +76,14 @@ export const PopoverContent = () => {
76
76
  [setOpen],
77
77
  );
78
78
 
79
- const collisionBoundaries: HTMLElement[] = useMemo(() => {
80
- const closest = layout.popoverAnchor?.closest('[data-popover-collision-boundary]') as
81
- | HTMLElement
82
- | null
83
- | undefined;
84
- return closest ? [closest] : [];
85
- }, [layout.popoverAnchor]);
86
-
87
79
  return (
88
80
  <Popover.Portal>
89
81
  <Popover.Content
90
82
  side={layout.popoverSide}
91
- onInteractOutside={handleClose}
92
- onEscapeKeyDown={handleClose}
93
- collisionBoundary={collisionBoundaries}
94
83
  sticky='always'
95
84
  hideWhenDetached
85
+ onInteractOutside={handleClose}
86
+ onEscapeKeyDown={handleClose}
96
87
  >
97
88
  <Popover.Viewport>
98
89
  <Surface role='card--popover' data={layout.popoverContent} limit={1} />
@@ -4,7 +4,7 @@
4
4
 
5
5
  import React from 'react';
6
6
 
7
- import { Surface } from '@dxos/app-framework';
7
+ import { Surface } from '@dxos/app-framework/react';
8
8
  import { useLandmarkMover } from '@dxos/react-ui';
9
9
 
10
10
  export const StatusBar = ({ showHints }: { showHints?: boolean }) => {
@@ -14,7 +14,7 @@ import {
14
14
  useTranslation,
15
15
  } from '@dxos/react-ui';
16
16
 
17
- import { DECK_PLUGIN } from '../../meta';
17
+ import { meta } from '../../meta';
18
18
 
19
19
  // TODO(wittjosiah): Render remaining duration as a progress bar within the toast.
20
20
  export const Toast = ({
@@ -29,13 +29,13 @@ export const Toast = ({
29
29
  onAction,
30
30
  onOpenChange,
31
31
  }: LayoutAction.Toast & Pick<ToastRootProps, 'onOpenChange'>) => {
32
- const { t } = useTranslation(DECK_PLUGIN);
32
+ const { t } = useTranslation(meta.id);
33
33
 
34
34
  return (
35
35
  <NaturalToast.Root data-testid={id} defaultOpen duration={duration} onOpenChange={onOpenChange}>
36
36
  <NaturalToast.Body>
37
37
  <NaturalToast.Title classNames='items-center'>
38
- {icon && <Icon icon={icon} size={5} classNames='inline mr-1' />}
38
+ {icon && <Icon icon={icon} classNames='inline mr-1' />}
39
39
  {title && <span>{toLocalizedString(title, t)}</span>}
40
40
  </NaturalToast.Title>
41
41
  {description && (
@@ -59,3 +59,28 @@ export const Toast = ({
59
59
  </NaturalToast.Root>
60
60
  );
61
61
  };
62
+
63
+ export type ToasterProps = {
64
+ toasts?: LayoutAction.Toast[];
65
+ onDismissToast?: (id: string) => void;
66
+ };
67
+
68
+ export const Toaster = ({ toasts, onDismissToast }: ToasterProps) => {
69
+ return (
70
+ <>
71
+ {toasts?.map((toast) => (
72
+ <Toast
73
+ {...toast}
74
+ key={toast.id}
75
+ onOpenChange={(open) => {
76
+ if (!open) {
77
+ onDismissToast?.(toast.id);
78
+ }
79
+
80
+ return open;
81
+ }}
82
+ />
83
+ ))}
84
+ </>
85
+ );
86
+ };
@@ -5,9 +5,9 @@
5
5
  import React from 'react';
6
6
 
7
7
  import { Input, Select, useTranslation } from '@dxos/react-ui';
8
- import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
8
+ import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
9
9
 
10
- import { DECK_PLUGIN } from '../../meta';
10
+ import { meta } from '../../meta';
11
11
  import {
12
12
  type DeckSettingsProps,
13
13
  type NewPlankPositioning,
@@ -19,70 +19,85 @@ import {
19
19
  const isSocket = !!(globalThis as any).__args;
20
20
 
21
21
  export const DeckSettings = ({ settings }: { settings: DeckSettingsProps }) => {
22
- const { t } = useTranslation(DECK_PLUGIN);
22
+ const { t } = useTranslation(meta.id);
23
23
 
24
24
  return (
25
- <DeprecatedFormContainer>
26
- <DeprecatedFormInput label={t('settings enable deck label')}>
27
- <Input.Switch checked={settings.enableDeck} onCheckedChange={(checked) => (settings.enableDeck = checked)} />
28
- </DeprecatedFormInput>
29
- <DeprecatedFormInput label={t('select new plank positioning label')}>
30
- <Select.Root
31
- disabled={!settings.enableDeck}
32
- value={settings.newPlankPositioning ?? 'start'}
33
- onValueChange={(value) => (settings.newPlankPositioning = value as NewPlankPositioning)}
34
- >
35
- <Select.TriggerButton placeholder={t('select new plank positioning placeholder')} />
36
- <Select.Portal>
37
- <Select.Content>
38
- <Select.Viewport>
39
- {NewPlankPositions.map((position) => (
40
- <Select.Option key={position} value={position}>
41
- {t(`settings new plank position ${position} label`)}
42
- </Select.Option>
43
- ))}
44
- </Select.Viewport>
45
- </Select.Content>
46
- </Select.Portal>
47
- </Select.Root>
48
- </DeprecatedFormInput>
49
- <DeprecatedFormInput label={t('settings overscroll label')}>
50
- <Select.Root
51
- disabled={!settings.enableDeck}
52
- value={settings.overscroll ?? 'none'}
53
- onValueChange={(value) => (settings.overscroll = value as Overscroll)}
54
- >
55
- <Select.TriggerButton placeholder={t('select overscroll placeholder')} />
56
- <Select.Portal>
57
- <Select.Content>
58
- <Select.Viewport>
59
- {OverscrollOptions.map((option) => (
60
- <Select.Option key={option} value={option}>
61
- {t(`settings overscroll ${option} label`)}
62
- </Select.Option>
63
- ))}
64
- </Select.Viewport>
65
- </Select.Content>
66
- </Select.Portal>
67
- </Select.Root>
68
- </DeprecatedFormInput>
69
- <DeprecatedFormInput label={t('settings enable statusbar label')}>
70
- <Input.Switch
71
- checked={settings.enableStatusbar}
72
- onCheckedChange={(checked) => (settings.enableStatusbar = checked)}
73
- />
74
- </DeprecatedFormInput>
75
- <DeprecatedFormInput label={t('settings show hints label')}>
76
- <Input.Switch checked={settings.showHints} onCheckedChange={(checked) => (settings.showHints = checked)} />
77
- </DeprecatedFormInput>
78
- {!isSocket && (
79
- <DeprecatedFormInput label={t('settings native redirect label')}>
80
- <Input.Switch
81
- checked={settings.enableNativeRedirect}
82
- onCheckedChange={(checked) => (settings.enableNativeRedirect = checked)}
83
- />
84
- </DeprecatedFormInput>
85
- )}
86
- </DeprecatedFormContainer>
25
+ <ControlPage>
26
+ <ControlSection title={t('settings title', { ns: meta.id })}>
27
+ <ControlGroup>
28
+ <ControlItemInput title={t('settings enable deck label')}>
29
+ <Input.Switch
30
+ checked={settings.enableDeck}
31
+ onCheckedChange={(checked) => (settings.enableDeck = checked)}
32
+ />
33
+ </ControlItemInput>
34
+ <ControlItemInput title={t('settings encapsulated planks label')}>
35
+ <Input.Switch
36
+ checked={settings.encapsulatedPlanks ?? false}
37
+ onCheckedChange={(checked) => (settings.encapsulatedPlanks = checked)}
38
+ />
39
+ </ControlItemInput>
40
+ <ControlItemInput title={t('select new plank positioning label')}>
41
+ <Select.Root
42
+ disabled={!settings.enableDeck}
43
+ value={settings.newPlankPositioning ?? 'start'}
44
+ onValueChange={(value) => (settings.newPlankPositioning = value as NewPlankPositioning)}
45
+ >
46
+ <Select.TriggerButton placeholder={t('select new plank positioning placeholder')} />
47
+ <Select.Portal>
48
+ <Select.Content>
49
+ <Select.Viewport>
50
+ {NewPlankPositions.map((position) => (
51
+ <Select.Option key={position} value={position}>
52
+ {t(`settings new plank position ${position} label`)}
53
+ </Select.Option>
54
+ ))}
55
+ </Select.Viewport>
56
+ <Select.Arrow />
57
+ </Select.Content>
58
+ </Select.Portal>
59
+ </Select.Root>
60
+ </ControlItemInput>
61
+ <ControlItemInput title={t('settings overscroll label')}>
62
+ <Select.Root
63
+ disabled={!settings.enableDeck}
64
+ value={settings.overscroll ?? 'none'}
65
+ onValueChange={(value) => (settings.overscroll = value as Overscroll)}
66
+ >
67
+ <Select.TriggerButton placeholder={t('select overscroll placeholder')} />
68
+ <Select.Portal>
69
+ <Select.Content>
70
+ <Select.Viewport>
71
+ {OverscrollOptions.map((option) => (
72
+ <Select.Option key={option} value={option}>
73
+ {t(`settings overscroll ${option} label`)}
74
+ </Select.Option>
75
+ ))}
76
+ </Select.Viewport>
77
+ <Select.Arrow />
78
+ </Select.Content>
79
+ </Select.Portal>
80
+ </Select.Root>
81
+ </ControlItemInput>
82
+ <ControlItemInput title={t('settings enable statusbar label')}>
83
+ <Input.Switch
84
+ checked={settings.enableStatusbar}
85
+ onCheckedChange={(checked) => (settings.enableStatusbar = checked)}
86
+ />
87
+ </ControlItemInput>
88
+ <ControlItemInput title={t('settings show hints label')}>
89
+ <Input.Switch checked={settings.showHints} onCheckedChange={(checked) => (settings.showHints = checked)} />
90
+ </ControlItemInput>
91
+ {!isSocket && (
92
+ <ControlItemInput title={t('settings native redirect label')}>
93
+ <Input.Switch
94
+ checked={settings.enableNativeRedirect}
95
+ onCheckedChange={(checked) => (settings.enableNativeRedirect = checked)}
96
+ />
97
+ </ControlItemInput>
98
+ )}
99
+ </ControlGroup>
100
+ </ControlSection>
101
+ </ControlPage>
87
102
  );
88
103
  };
@@ -2,8 +2,6 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import '@dxos-theme';
6
-
7
5
  import { type Meta, type StoryObj } from '@storybook/react-vite';
8
6
  import React from 'react';
9
7
 
@@ -11,15 +9,15 @@ import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
11
9
  import { withPluginManager } from '@dxos/app-framework/testing';
12
10
  import { AttentionPlugin } from '@dxos/plugin-attention';
13
11
  import { GraphPlugin } from '@dxos/plugin-graph';
12
+ import { withTheme } from '@dxos/react-ui/testing';
14
13
  import { Stack } from '@dxos/react-ui-stack';
15
- import { withLayout, withTheme } from '@dxos/storybook-utils';
16
14
 
17
15
  import { DeckStateFactory } from '../../capabilities';
18
16
  import { translations } from '../../translations';
19
17
 
20
- import { Plank, type PlankProps } from './Plank';
18
+ import { Plank } from './Plank';
21
19
 
22
- const meta: Meta<PlankProps> = {
20
+ const meta = {
23
21
  title: 'plugins/plugin-deck/Plank',
24
22
  component: Plank,
25
23
  render: (args) => {
@@ -30,21 +28,21 @@ const meta: Meta<PlankProps> = {
30
28
  );
31
29
  },
32
30
  decorators: [
31
+ withTheme,
33
32
  withPluginManager({
34
33
  plugins: [AttentionPlugin(), SettingsPlugin(), IntentPlugin(), GraphPlugin()],
35
34
  capabilities: () => DeckStateFactory(),
36
35
  }),
37
- withTheme,
38
- withLayout({ fullscreen: true }),
39
36
  ],
40
37
  parameters: {
38
+ layout: 'fullscreen',
41
39
  translations,
42
40
  },
43
- };
41
+ } satisfies Meta<typeof Plank>;
44
42
 
45
43
  export default meta;
46
44
 
47
- type Story = StoryObj<PlankProps>;
45
+ type Story = StoryObj<typeof meta>;
48
46
 
49
47
  // TODO(burdon): Need to define surface provider?
50
48
  export const Default: Story = {