@dxos/plugin-deck 0.8.4-main.dedc0f3 → 0.8.4-main.ead640a

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 (111) hide show
  1. package/dist/lib/browser/{app-graph-builder-DVEKLXB4.mjs → app-graph-builder-YYP67JHW.mjs} +15 -14
  2. package/dist/lib/browser/app-graph-builder-YYP67JHW.mjs.map +7 -0
  3. package/dist/lib/browser/{check-app-scheme-3BQJXWEY.mjs → check-app-scheme-GCOL6YDT.mjs} +6 -6
  4. package/dist/lib/browser/check-app-scheme-GCOL6YDT.mjs.map +7 -0
  5. package/dist/lib/browser/{chunk-F5BQOOEG.mjs → chunk-7I6H3N4Q.mjs} +8 -6
  6. package/dist/lib/browser/chunk-7I6H3N4Q.mjs.map +7 -0
  7. package/dist/lib/browser/chunk-HUWUYTOI.mjs +16 -0
  8. package/dist/lib/browser/chunk-HUWUYTOI.mjs.map +7 -0
  9. package/dist/lib/browser/{chunk-NU7H23SK.mjs → chunk-JQKOS2HB.mjs} +341 -308
  10. package/dist/lib/browser/chunk-JQKOS2HB.mjs.map +7 -0
  11. package/dist/lib/browser/chunk-MHP4GPX5.mjs +11 -0
  12. package/dist/lib/browser/chunk-MHP4GPX5.mjs.map +7 -0
  13. package/dist/lib/browser/{chunk-WILMPGDV.mjs → chunk-RJP5R7PY.mjs} +14 -14
  14. package/dist/lib/browser/{chunk-WILMPGDV.mjs.map → chunk-RJP5R7PY.mjs.map} +3 -3
  15. package/dist/lib/browser/{chunk-NRCPV6AV.mjs → chunk-VX7MMQOW.mjs} +9 -9
  16. package/dist/lib/browser/chunk-VX7MMQOW.mjs.map +7 -0
  17. package/dist/lib/browser/index.mjs +8 -9
  18. package/dist/lib/browser/index.mjs.map +3 -3
  19. package/dist/lib/browser/{intent-resolver-2SUIIV6N.mjs → intent-resolver-7XNOEPVN.mjs} +20 -17
  20. package/dist/lib/browser/intent-resolver-7XNOEPVN.mjs.map +7 -0
  21. package/dist/lib/browser/meta.json +1 -1
  22. package/dist/lib/browser/{react-root-7PRVDLF7.mjs → react-root-OJEF7YCH.mjs} +11 -11
  23. package/dist/lib/browser/react-root-OJEF7YCH.mjs.map +7 -0
  24. package/dist/lib/browser/{react-surface-FNY2YC2F.mjs → react-surface-XN2NJYHO.mjs} +13 -13
  25. package/dist/lib/browser/react-surface-XN2NJYHO.mjs.map +7 -0
  26. package/dist/lib/browser/{settings-LUPQPZ27.mjs → settings-M3KSKRAP.mjs} +7 -6
  27. package/dist/lib/browser/{settings-LUPQPZ27.mjs.map → settings-M3KSKRAP.mjs.map} +3 -3
  28. package/dist/lib/browser/state-6ZSDTF6Q.mjs +12 -0
  29. package/dist/lib/browser/{toolkit-XGJSBY67.mjs → toolkit-L7C3UAEU.mjs} +14 -12
  30. package/dist/lib/browser/toolkit-L7C3UAEU.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-EHTLXZRR.mjs} +6 -6
  33. package/dist/lib/browser/{url-handler-LROZYQ26.mjs.map → url-handler-EHTLXZRR.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.map +1 -1
  37. package/dist/types/src/capabilities/capabilities.d.ts.map +1 -1
  38. package/dist/types/src/capabilities/intent-resolver.d.ts.map +1 -1
  39. package/dist/types/src/capabilities/settings.d.ts.map +1 -1
  40. package/dist/types/src/capabilities/state.d.ts +3 -0
  41. package/dist/types/src/capabilities/state.d.ts.map +1 -1
  42. package/dist/types/src/capabilities/toolkit.d.ts +3 -2
  43. package/dist/types/src/capabilities/toolkit.d.ts.map +1 -1
  44. package/dist/types/src/components/DeckLayout/DeckLayout.d.ts +2 -3
  45. package/dist/types/src/components/DeckLayout/DeckLayout.d.ts.map +1 -1
  46. package/dist/types/src/components/DeckLayout/DeckLayout.stories.d.ts +74 -0
  47. package/dist/types/src/components/DeckLayout/DeckLayout.stories.d.ts.map +1 -0
  48. package/dist/types/src/components/DeckLayout/DeckMain.d.ts +3 -0
  49. package/dist/types/src/components/DeckLayout/DeckMain.d.ts.map +1 -0
  50. package/dist/types/src/components/DeckLayout/Toast.d.ts +5 -0
  51. package/dist/types/src/components/DeckLayout/Toast.d.ts.map +1 -1
  52. package/dist/types/src/components/DeckSettings/DeckSettings.d.ts.map +1 -1
  53. package/dist/types/src/components/Plank/Plank.d.ts.map +1 -1
  54. package/dist/types/src/components/Plank/Plank.stories.d.ts +2 -1
  55. package/dist/types/src/components/Plank/Plank.stories.d.ts.map +1 -1
  56. package/dist/types/src/events.d.ts.map +1 -1
  57. package/dist/types/src/hooks/useHoistStatusbar.d.ts.map +1 -1
  58. package/dist/types/src/meta.d.ts +0 -1
  59. package/dist/types/src/meta.d.ts.map +1 -1
  60. package/dist/types/src/translations.d.ts +1 -0
  61. package/dist/types/src/translations.d.ts.map +1 -1
  62. package/dist/types/src/types/schema.d.ts +4 -3
  63. package/dist/types/src/types/schema.d.ts.map +1 -1
  64. package/dist/types/tsconfig.tsbuildinfo +1 -1
  65. package/package.json +43 -43
  66. package/src/DeckPlugin.ts +62 -63
  67. package/src/capabilities/app-graph-builder.ts +10 -9
  68. package/src/capabilities/capabilities.ts +3 -3
  69. package/src/capabilities/check-app-scheme.ts +2 -2
  70. package/src/capabilities/intent-resolver.ts +12 -9
  71. package/src/capabilities/react-root.tsx +2 -2
  72. package/src/capabilities/react-surface.tsx +4 -4
  73. package/src/capabilities/settings.ts +1 -0
  74. package/src/capabilities/state.ts +7 -4
  75. package/src/capabilities/toolkit.ts +9 -7
  76. package/src/capabilities/tools.ts +1 -1
  77. package/src/components/DeckLayout/Banner.tsx +2 -2
  78. package/src/components/DeckLayout/DeckLayout.stories.tsx +64 -0
  79. package/src/components/DeckLayout/DeckLayout.tsx +8 -278
  80. package/src/components/DeckLayout/DeckMain.tsx +285 -0
  81. package/src/components/DeckLayout/Fallback.tsx +2 -2
  82. package/src/components/DeckLayout/Toast.tsx +27 -2
  83. package/src/components/DeckSettings/DeckSettings.tsx +9 -3
  84. package/src/components/Plank/Plank.stories.tsx +3 -5
  85. package/src/components/Plank/Plank.tsx +25 -9
  86. package/src/components/Plank/PlankControls.tsx +3 -3
  87. package/src/components/Plank/PlankError.tsx +2 -2
  88. package/src/components/Plank/PlankHeading.tsx +5 -5
  89. package/src/components/Sidebar/ComplementarySidebar.tsx +5 -5
  90. package/src/components/Sidebar/Sidebar.tsx +2 -2
  91. package/src/components/Sidebar/SidebarButton.tsx +4 -4
  92. package/src/events.ts +2 -2
  93. package/src/hooks/useHoistStatusbar.ts +4 -3
  94. package/src/meta.ts +1 -3
  95. package/src/translations.ts +1 -0
  96. package/src/types/schema.ts +5 -3
  97. package/dist/lib/browser/app-graph-builder-DVEKLXB4.mjs.map +0 -7
  98. package/dist/lib/browser/check-app-scheme-3BQJXWEY.mjs.map +0 -7
  99. package/dist/lib/browser/chunk-F5BQOOEG.mjs.map +0 -7
  100. package/dist/lib/browser/chunk-M57WD3V6.mjs +0 -16
  101. package/dist/lib/browser/chunk-M57WD3V6.mjs.map +0 -7
  102. package/dist/lib/browser/chunk-NRCPV6AV.mjs.map +0 -7
  103. package/dist/lib/browser/chunk-NU7H23SK.mjs.map +0 -7
  104. package/dist/lib/browser/chunk-Z5KITAZW.mjs +0 -13
  105. package/dist/lib/browser/chunk-Z5KITAZW.mjs.map +0 -7
  106. package/dist/lib/browser/intent-resolver-2SUIIV6N.mjs.map +0 -7
  107. package/dist/lib/browser/react-root-7PRVDLF7.mjs.map +0 -7
  108. package/dist/lib/browser/react-surface-FNY2YC2F.mjs.map +0 -7
  109. package/dist/lib/browser/state-CRXR7X63.mjs +0 -12
  110. package/dist/lib/browser/toolkit-XGJSBY67.mjs.map +0 -7
  111. /package/dist/lib/browser/{state-CRXR7X63.mjs.map → state-6ZSDTF6Q.mjs.map} +0 -0
@@ -2,301 +2,31 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { untracked } from '@preact/signals-core';
6
- import React, { Fragment, type UIEvent, useCallback, useEffect, useMemo, useRef } from 'react';
5
+ import React from 'react';
7
6
 
8
- import {
9
- Capabilities,
10
- LayoutAction,
11
- createIntent,
12
- useCapability,
13
- useIntentDispatcher,
14
- usePluginManager,
15
- } from '@dxos/app-framework';
16
- import { AttentionCapabilities } from '@dxos/plugin-attention';
17
- import { Main, type MainProps, useMediaQuery, useOnTransition } from '@dxos/react-ui';
18
- import { DEFAULT_HORIZONTAL_SIZE, Stack, StackContext } from '@dxos/react-ui-stack';
19
- import { mainPaddingTransitions } from '@dxos/react-ui-theme';
7
+ import { useCapability } from '@dxos/app-framework';
20
8
 
21
9
  import { DeckCapabilities } from '../../capabilities';
22
- import { useBreakpoints, useHoistStatusbar } from '../../hooks';
23
- import { DECK_PLUGIN } from '../../meta';
24
- import { type DeckSettingsProps, getMode } from '../../types';
25
- import { calculateOverscroll, layoutAppliesTopbar } from '../../util';
26
- import { fixedComplementarySidebarToggleStyles, fixedSidebarToggleStyles } from '../fragments';
27
- import { Plank } from '../Plank';
28
- import { ComplementarySidebar, Sidebar, ToggleComplementarySidebarButton, ToggleSidebarButton } from '../Sidebar';
29
10
 
30
11
  import { ActiveNode } from './ActiveNode';
31
- import { ContentEmpty } from './ContentEmpty';
12
+ import { DeckMain } from './DeckMain';
32
13
  import { Dialog } from './Dialog';
33
14
  import { PopoverContent, PopoverRoot } from './Popover';
34
- import { StatusBar } from './StatusBar';
35
- import { Toast } from './Toast';
36
- import { Topbar } from './Topbar';
15
+ import { Toaster, type ToasterProps } from './Toast';
37
16
 
38
- export type DeckLayoutProps = {
39
- onDismissToast: (id: string) => void;
40
- };
41
-
42
- const PlankSeparator = ({ order }: { order: number }) =>
43
- order > 0 ? <span role='separator' className='row-span-2 bg-deckSurface is-4' style={{ gridColumn: order }} /> : null;
17
+ export type DeckLayoutProps = Pick<ToasterProps, 'onDismissToast'>;
44
18
 
45
19
  export const DeckLayout = ({ onDismissToast }: DeckLayoutProps) => {
46
- const { dispatchPromise: dispatch } = useIntentDispatcher();
47
- const settings = useCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(DECK_PLUGIN)!.value;
48
20
  const context = useCapability(DeckCapabilities.MutableDeckState);
49
- const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck, toasts } = context;
50
- const { active, activeCompanions, fullscreen, solo, plankSizing } = deck;
51
- const breakpoint = useBreakpoints();
52
- const layoutMode = getMode(deck);
53
- const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
54
- const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
55
- const pluginManager = usePluginManager();
56
-
57
- const scrollLeftRef = useRef<number | null>();
58
- const deckRef = useRef<HTMLDivElement>(null);
59
-
60
- // Ensure the first plank is attended when the deck is first rendered.
61
- useEffect(() => {
62
- // NOTE: Not `useAttended` so that the layout component is not re-rendered when the attended list changes.
63
- const attended = untracked(() => {
64
- const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
65
- return attention.current;
66
- });
67
- const firstId = solo ?? active[0];
68
- if (attended.length === 0 && firstId) {
69
- // TODO(wittjosiah): Focusing the type button is a workaround.
70
- // If the plank is directly focused on first load the focus ring appears.
71
- document.querySelector<HTMLElement>(`article[data-attendable-id="${firstId}"] button`)?.focus();
72
- }
73
- }, []);
74
-
75
- // Not using `breakpoint` to avoid firing when breakpoint changes between tablet and desktop.
76
- // `ssr: false` to avoid using fallback values and flashing into solo mode on startup.
77
- const [isNotMobile] = useMediaQuery('md', { ssr: false });
78
- const shouldRevert = useRef(false);
79
- useEffect(() => {
80
- if (!isNotMobile && getMode(deck) === 'deck') {
81
- // NOTE: Not `useAttended` so that the layout component is not re-rendered when the attended list changes.
82
- const attended = untracked(() => {
83
- const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
84
- return attention.current;
85
- });
86
-
87
- shouldRevert.current = true;
88
- void dispatch(
89
- createIntent(LayoutAction.SetLayoutMode, { part: 'mode', subject: attended[0], options: { mode: 'solo' } }),
90
- );
91
- } else if (isNotMobile && getMode(deck) === 'solo' && shouldRevert.current) {
92
- void dispatch(createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { revert: true } }));
93
- }
94
- }, [isNotMobile, deck, dispatch]);
95
-
96
- // When deck is disabled in settings, set to solo mode if the current layout mode is deck.
97
- // TODO(thure): Applying this as an effect should be avoided over emitting the intent only when the setting changes.
98
- useEffect(() => {
99
- if (!settings.enableDeck && layoutMode === 'deck') {
100
- void dispatch(
101
- createIntent(LayoutAction.SetLayoutMode, { part: 'mode', subject: active[0], options: { mode: 'solo' } }),
102
- );
103
- }
104
- }, [settings.enableDeck, dispatch, active, layoutMode]);
105
-
106
- /**
107
- * Clear scroll restoration state if the window is resized
108
- */
109
- const handleResize = useCallback(() => {
110
- scrollLeftRef.current = null;
111
- }, []);
112
-
113
- useEffect(() => {
114
- window.addEventListener('resize', handleResize);
115
- return () => window.removeEventListener('resize', handleResize);
116
- }, [handleResize]);
117
-
118
- const restoreScroll = useCallback(() => {
119
- if (deckRef.current && scrollLeftRef.current != null) {
120
- deckRef.current.scrollLeft = scrollLeftRef.current;
121
- }
122
- }, []);
123
- useOnTransition(layoutMode, (mode) => mode !== 'deck', 'deck', restoreScroll);
124
-
125
- /**
126
- * Save scroll position as the user scrolls
127
- */
128
- const handleScroll = useCallback(
129
- (event: UIEvent) => {
130
- if (!solo && event.currentTarget === event.target) {
131
- scrollLeftRef.current = (event.target as HTMLDivElement).scrollLeft;
132
- }
133
- },
134
- [solo],
135
- );
136
-
137
- const isEmpty = !solo && active.length === 0;
138
-
139
- const padding = useMemo(() => {
140
- if (!solo && settings.overscroll === 'centering') {
141
- return calculateOverscroll(active.length);
142
- }
143
- return {};
144
- }, [solo, settings.overscroll, deck]);
145
-
146
- const mainPosition = useMemo(
147
- () => [
148
- 'grid !block-start-[env(safe-area-inset-top)]',
149
- topbar && '!block-start-[calc(env(safe-area-inset-top)+var(--rail-size))]',
150
- hoistStatusbar && 'lg:block-end-[--statusbar-size]',
151
- ],
152
- [topbar, hoistStatusbar],
153
- );
154
-
155
- const { order, itemsCount }: { order: Record<string, number>; itemsCount: number } = useMemo(() => {
156
- return active.reduce(
157
- (acc: { order: Record<string, number>; itemsCount: number }, entryId) => {
158
- acc.order[entryId] = acc.itemsCount + 1;
159
- acc.itemsCount += activeCompanions?.[entryId] ? 3 : 2;
160
- return acc;
161
- },
162
- { order: {}, itemsCount: 0 },
163
- );
164
- }, [active, activeCompanions]);
21
+ const { toasts } = context;
165
22
 
166
23
  return (
167
24
  <PopoverRoot>
168
25
  <ActiveNode />
169
-
170
- <Main.Root
171
- navigationSidebarState={fullscreen ? 'closed' : context.sidebarState}
172
- onNavigationSidebarStateChange={(next) => (context.sidebarState = next)}
173
- complementarySidebarState={fullscreen ? 'closed' : context.complementarySidebarState}
174
- onComplementarySidebarStateChange={(next) => (context.complementarySidebarState = next)}
175
- >
176
- {/* Left sidebar. */}
177
- <Sidebar />
178
-
179
- {/* Right sidebar. */}
180
- <ComplementarySidebar current={complementarySidebarPanel} />
181
-
182
- {/* Dialog overlay to dismiss dialogs. */}
183
- <Main.Overlay />
184
-
185
- {/* No content. */}
186
- {isEmpty && (
187
- <Main.Content bounce handlesFocus classNames={mainPosition}>
188
- <ContentEmpty />
189
- </Main.Content>
190
- )}
191
-
192
- {/* Solo/deck mode. */}
193
- {!isEmpty && (
194
- <Main.Content
195
- bounce
196
- handlesFocus
197
- classNames={mainPosition}
198
- style={
199
- {
200
- '--dx-main-sidebarWidth':
201
- sidebarState === 'expanded'
202
- ? 'var(--nav-sidebar-size)'
203
- : sidebarState === 'collapsed'
204
- ? 'var(--l0-size)'
205
- : '0',
206
- '--dx-main-complementaryWidth':
207
- complementarySidebarState === 'expanded'
208
- ? 'var(--complementary-sidebar-size)'
209
- : complementarySidebarState === 'collapsed'
210
- ? 'var(--rail-size)'
211
- : '0',
212
- '--dx-main-contentFirstWidth': `${plankSizing[active[0] ?? 'never'] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
213
- '--dx-main-contentLastWidth': `${plankSizing[active[(active.length ?? 1) - 1] ?? 'never'] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
214
- } as MainProps['style']
215
- }
216
- >
217
- <div
218
- role='none'
219
- className={!solo ? 'relative bg-deckSurface overflow-hidden' : 'sr-only'}
220
- {...(solo && { inert: '' })}
221
- >
222
- {!topbar && !fullscreen && <ToggleSidebarButton classNames={fixedSidebarToggleStyles} />}
223
- {!topbar && !fullscreen && (
224
- <ToggleComplementarySidebarButton classNames={fixedComplementarySidebarToggleStyles} />
225
- )}
226
- <Stack
227
- ref={deckRef}
228
- orientation='horizontal'
229
- size='contain'
230
- classNames={['absolute inset-block-0 -inset-inline-px', mainPaddingTransitions]}
231
- itemsCount={itemsCount - 1}
232
- style={padding}
233
- onScroll={handleScroll}
234
- >
235
- {active.map((entryId) => (
236
- <Fragment key={entryId}>
237
- <PlankSeparator order={order[entryId] - 1} />
238
- <Plank
239
- id={entryId}
240
- companionId={activeCompanions?.[entryId]}
241
- part='deck'
242
- order={order[entryId]}
243
- active={active}
244
- layoutMode={layoutMode}
245
- settings={settings}
246
- />
247
- </Fragment>
248
- ))}
249
- </Stack>
250
- </div>
251
- <div
252
- role='none'
253
- className={solo ? 'relative bg-deckSurface overflow-hidden' : 'sr-only'}
254
- {...(!solo && { inert: '' })}
255
- >
256
- {!topbar && !fullscreen && <ToggleSidebarButton classNames={fixedSidebarToggleStyles} />}
257
- {!topbar && !fullscreen && (
258
- <ToggleComplementarySidebarButton classNames={fixedComplementarySidebarToggleStyles} />
259
- )}
260
- <StackContext.Provider value={{ size: 'contain', orientation: 'horizontal', rail: true }}>
261
- <Plank
262
- id={solo}
263
- companionId={solo ? activeCompanions?.[solo] : undefined}
264
- part='solo'
265
- layoutMode={layoutMode}
266
- settings={settings}
267
- />
268
- </StackContext.Provider>
269
- </div>
270
- </Main.Content>
271
- )}
272
-
273
- {/* Topbar. */}
274
- {topbar && <Topbar />}
275
-
276
- {/* Status bar. */}
277
- {hoistStatusbar && <StatusBar showHints={settings.showHints} />}
278
- </Main.Root>
279
-
280
- {/* Global popovers. */}
26
+ <DeckMain />
281
27
  <PopoverContent />
282
-
283
- {/* Global dialog. */}
284
28
  <Dialog />
285
-
286
- {/* Global toasts. */}
287
- {toasts?.map((toast) => (
288
- <Toast
289
- {...toast}
290
- key={toast.id}
291
- onOpenChange={(open) => {
292
- if (!open) {
293
- onDismissToast(toast.id);
294
- }
295
-
296
- return open;
297
- }}
298
- />
299
- ))}
29
+ <Toaster toasts={toasts} onDismissToast={onDismissToast} />
300
30
  </PopoverRoot>
301
31
  );
302
32
  };
@@ -0,0 +1,285 @@
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 {
9
+ Capabilities,
10
+ LayoutAction,
11
+ createIntent,
12
+ useCapability,
13
+ useIntentDispatcher,
14
+ usePluginManager,
15
+ } from '@dxos/app-framework';
16
+ import { AttentionCapabilities } from '@dxos/plugin-attention';
17
+ import { Main, type MainProps, useMediaQuery, useOnTransition } from '@dxos/react-ui';
18
+ import { DEFAULT_HORIZONTAL_SIZE, Stack, StackContext } from '@dxos/react-ui-stack';
19
+ import { mainPaddingTransitions, mx } from '@dxos/react-ui-theme';
20
+
21
+ import { DeckCapabilities } from '../../capabilities';
22
+ import { useBreakpoints, useHoistStatusbar } from '../../hooks';
23
+ import { meta } from '../../meta';
24
+ import { type DeckSettingsProps, getMode } from '../../types';
25
+ import { calculateOverscroll, layoutAppliesTopbar } from '../../util';
26
+ import { fixedComplementarySidebarToggleStyles, fixedSidebarToggleStyles } from '../fragments';
27
+ import { Plank } from '../Plank';
28
+ import { ComplementarySidebar, Sidebar, ToggleComplementarySidebarButton, ToggleSidebarButton } from '../Sidebar';
29
+
30
+ import { ContentEmpty } from './ContentEmpty';
31
+ import { StatusBar } from './StatusBar';
32
+ import { Topbar } from './Topbar';
33
+
34
+ export const DeckMain = () => {
35
+ const { dispatchPromise: dispatch } = useIntentDispatcher();
36
+ const settings = useCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(meta.id)?.value;
37
+ const context = useCapability(DeckCapabilities.MutableDeckState);
38
+ const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck } = context;
39
+ const { active, activeCompanions, fullscreen, solo, plankSizing } = deck;
40
+ const layoutMode = getMode(deck);
41
+ const breakpoint = useBreakpoints();
42
+ const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
43
+ const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
44
+ const pluginManager = usePluginManager();
45
+
46
+ const scrollLeftRef = useRef<number>(null);
47
+ const deckRef = useRef<HTMLDivElement>(null);
48
+
49
+ // Ensure the first plank is attended when the deck is first rendered.
50
+ useEffect(() => {
51
+ // NOTE: Not `useAttended` so that the layout component is not re-rendered when the attended list changes.
52
+ const attended = untracked(() => {
53
+ const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
54
+ return attention.current;
55
+ });
56
+ const firstId = solo ?? active[0];
57
+ if (attended.length === 0 && firstId) {
58
+ // TODO(wittjosiah): Focusing the type button is a workaround.
59
+ // If the plank is directly focused on first load the focus ring appears.
60
+ document.querySelector<HTMLElement>(`article[data-attendable-id="${firstId}"] button`)?.focus();
61
+ }
62
+ }, []);
63
+
64
+ // Not using `breakpoint` to avoid firing when breakpoint changes between tablet and desktop.
65
+ // `ssr: false` to avoid using fallback values and flashing into solo mode on startup.
66
+ const [isNotMobile] = useMediaQuery('md');
67
+ const shouldRevert = useRef(false);
68
+ useEffect(() => {
69
+ if (!isNotMobile && getMode(deck) === 'deck') {
70
+ // NOTE: Not `useAttended` so that the layout component is not re-rendered when the attended list changes.
71
+ const attended = untracked(() => {
72
+ const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
73
+ return attention.current;
74
+ });
75
+
76
+ shouldRevert.current = true;
77
+ void dispatch(
78
+ createIntent(LayoutAction.SetLayoutMode, { part: 'mode', subject: attended[0], options: { mode: 'solo' } }),
79
+ );
80
+ } else if (isNotMobile && getMode(deck) === 'solo' && shouldRevert.current) {
81
+ void dispatch(createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { revert: true } }));
82
+ }
83
+ }, [isNotMobile, deck, dispatch]);
84
+
85
+ // When deck is disabled in settings, set to solo mode if the current layout mode is deck.
86
+ // TODO(thure): Applying this as an effect should be avoided over emitting the intent only when the setting changes.
87
+ useEffect(() => {
88
+ if (settings?.enableDeck && layoutMode === 'deck') {
89
+ void dispatch(
90
+ createIntent(LayoutAction.SetLayoutMode, { part: 'mode', subject: active[0], options: { mode: 'solo' } }),
91
+ );
92
+ }
93
+ }, [settings?.enableDeck, dispatch, active, layoutMode]);
94
+
95
+ /**
96
+ * Clear scroll restoration state if the window is resized.
97
+ */
98
+ const handleResize = useCallback(() => {
99
+ scrollLeftRef.current = null;
100
+ }, []);
101
+
102
+ useEffect(() => {
103
+ window.addEventListener('resize', handleResize);
104
+ return () => window.removeEventListener('resize', handleResize);
105
+ }, [handleResize]);
106
+
107
+ const restoreScroll = useCallback(() => {
108
+ if (deckRef.current && scrollLeftRef.current != null) {
109
+ deckRef.current.scrollLeft = scrollLeftRef.current;
110
+ }
111
+ }, []);
112
+ useOnTransition(layoutMode, (mode) => mode !== 'deck', 'deck', restoreScroll);
113
+
114
+ /**
115
+ * Save scroll position as the user scrolls.
116
+ */
117
+ const handleScroll = useCallback(
118
+ (event: UIEvent) => {
119
+ if (!solo && event.currentTarget === event.target) {
120
+ scrollLeftRef.current = (event.target as HTMLDivElement).scrollLeft;
121
+ }
122
+ },
123
+ [solo],
124
+ );
125
+
126
+ const isEmpty = !solo && active.length === 0;
127
+
128
+ const padding = useMemo(() => {
129
+ if (!solo && settings?.overscroll === 'centering') {
130
+ return calculateOverscroll(active.length);
131
+ }
132
+ return {};
133
+ }, [solo, settings?.overscroll, deck]);
134
+
135
+ const mainPosition = useMemo(
136
+ () => [
137
+ 'grid !block-start-[env(safe-area-inset-top)]',
138
+ topbar && '!block-start-[calc(env(safe-area-inset-top)+var(--rail-size))]',
139
+ hoistStatusbar && 'lg:block-end-[--statusbar-size]',
140
+ ],
141
+ [topbar, hoistStatusbar],
142
+ );
143
+
144
+ const { order, itemsCount }: { order: Record<string, number>; itemsCount: number } = useMemo(() => {
145
+ return active.reduce(
146
+ (acc: { order: Record<string, number>; itemsCount: number }, entryId) => {
147
+ acc.order[entryId] = acc.itemsCount + 1;
148
+ acc.itemsCount += activeCompanions?.[entryId] ? 3 : 2;
149
+ return acc;
150
+ },
151
+ { order: {}, itemsCount: 0 },
152
+ );
153
+ }, [active, activeCompanions]);
154
+
155
+ return (
156
+ <Main.Root
157
+ navigationSidebarState={fullscreen ? 'closed' : context.sidebarState}
158
+ onNavigationSidebarStateChange={(next) => (context.sidebarState = next)}
159
+ complementarySidebarState={fullscreen ? 'closed' : context.complementarySidebarState}
160
+ onComplementarySidebarStateChange={(next) => (context.complementarySidebarState = next)}
161
+ >
162
+ {/* Left sidebar. */}
163
+ <Sidebar />
164
+
165
+ {/* Right sidebar. */}
166
+ <ComplementarySidebar current={complementarySidebarPanel} />
167
+
168
+ {/* Dialog overlay to dismiss dialogs. */}
169
+ <Main.Overlay />
170
+
171
+ {/* No content. */}
172
+ {isEmpty && (
173
+ <Main.Content bounce handlesFocus classNames={mainPosition}>
174
+ <ContentEmpty />
175
+ </Main.Content>
176
+ )}
177
+
178
+ {/* Solo/deck mode. */}
179
+ {!isEmpty && (
180
+ <Main.Content
181
+ bounce
182
+ handlesFocus
183
+ classNames={mainPosition}
184
+ style={
185
+ {
186
+ '--main-spacing': settings?.encapsulatedPlanks ? '0.75rem' : '0',
187
+ '--dx-main-sidebarWidth':
188
+ sidebarState === 'expanded'
189
+ ? 'var(--nav-sidebar-size)'
190
+ : sidebarState === 'collapsed'
191
+ ? 'var(--l0-size)'
192
+ : '0',
193
+ '--dx-main-complementaryWidth':
194
+ complementarySidebarState === 'expanded'
195
+ ? 'var(--complementary-sidebar-size)'
196
+ : complementarySidebarState === 'collapsed'
197
+ ? 'var(--rail-size)'
198
+ : '0',
199
+ '--dx-main-contentFirstWidth': `${plankSizing[active[0] ?? 'never'] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
200
+ '--dx-main-contentLastWidth': `${plankSizing[active[(active.length ?? 1) - 1] ?? 'never'] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
201
+ } as MainProps['style']
202
+ }
203
+ >
204
+ <div
205
+ role='none'
206
+ className={!solo ? 'relative bg-deckSurface overflow-hidden' : 'sr-only'}
207
+ {...(solo && { inert: true })}
208
+ >
209
+ {!topbar && !fullscreen && <ToggleSidebarButton classNames={fixedSidebarToggleStyles} />}
210
+ {!topbar && !fullscreen && (
211
+ <ToggleComplementarySidebarButton classNames={fixedComplementarySidebarToggleStyles} />
212
+ )}
213
+ <Stack
214
+ ref={deckRef}
215
+ orientation='horizontal'
216
+ size='contain'
217
+ itemsCount={itemsCount - 1}
218
+ classNames={[
219
+ 'absolute inset-block-[--main-spacing] -inset-inline-px bs-[calc(100%-2*var(--main-spacing))]',
220
+ mainPaddingTransitions,
221
+ ]}
222
+ style={padding}
223
+ onScroll={handleScroll}
224
+ >
225
+ {active.map((entryId) => (
226
+ <Fragment key={entryId}>
227
+ <PlankSeparator order={order[entryId] - 1} encapsulate={!!settings?.enableDeck} />
228
+ <Plank
229
+ id={entryId}
230
+ companionId={activeCompanions?.[entryId]}
231
+ part='deck'
232
+ order={order[entryId]}
233
+ active={active}
234
+ layoutMode={layoutMode}
235
+ settings={settings}
236
+ />
237
+ </Fragment>
238
+ ))}
239
+ </Stack>
240
+ </div>
241
+ <div
242
+ role='none'
243
+ className={solo ? 'relative overflow-hidden bg-deckSurface' : 'sr-only'}
244
+ {...(!solo && { inert: true })}
245
+ >
246
+ {!topbar && !fullscreen && <ToggleSidebarButton classNames={fixedSidebarToggleStyles} />}
247
+ {!topbar && !fullscreen && (
248
+ <ToggleComplementarySidebarButton classNames={fixedComplementarySidebarToggleStyles} />
249
+ )}
250
+ <StackContext.Provider
251
+ value={{
252
+ orientation: 'horizontal',
253
+ size: 'contain',
254
+ rail: true,
255
+ }}
256
+ >
257
+ <Plank
258
+ id={solo}
259
+ companionId={solo ? activeCompanions?.[solo] : undefined}
260
+ part='solo'
261
+ layoutMode={layoutMode}
262
+ settings={settings}
263
+ />
264
+ </StackContext.Provider>
265
+ </div>
266
+ </Main.Content>
267
+ )}
268
+
269
+ {/* Topbar. */}
270
+ {topbar && <Topbar />}
271
+
272
+ {/* Status bar. */}
273
+ {hoistStatusbar && <StatusBar showHints={settings?.showHints} />}
274
+ </Main.Root>
275
+ );
276
+ };
277
+
278
+ const PlankSeparator = ({ order, encapsulate }: { order: number; encapsulate?: boolean }) =>
279
+ order > 0 ? (
280
+ <span
281
+ role='separator'
282
+ className={mx('row-span-2 bg-deckSurface', encapsulate ? 'is-0' : 'is-4')}
283
+ style={{ gridColumn: order }}
284
+ />
285
+ ) : null;
@@ -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'>
@@ -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,7 +29,7 @@ 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}>
@@ -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
+ };
@@ -7,7 +7,7 @@ import React from 'react';
7
7
  import { Input, Select, useTranslation } from '@dxos/react-ui';
8
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,11 +19,11 @@ 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
25
  <ControlPage>
26
- <ControlSection title={t('settings title', { ns: DECK_PLUGIN })}>
26
+ <ControlSection title={t('settings title', { ns: meta.id })}>
27
27
  <ControlGroup>
28
28
  <ControlItemInput title={t('settings enable deck label')}>
29
29
  <Input.Switch
@@ -31,6 +31,12 @@ export const DeckSettings = ({ settings }: { settings: DeckSettingsProps }) => {
31
31
  onCheckedChange={(checked) => (settings.enableDeck = checked)}
32
32
  />
33
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>
34
40
  <ControlItemInput title={t('select new plank positioning label')}>
35
41
  <Select.Root
36
42
  disabled={!settings.enableDeck}