@domicile-desktop/manganese 1.1.1 → 1.2.0
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.
- package/package.json +38 -39
- package/src/Desktop.tsx +137 -26
- package/src/page-duplicates.ts +41 -0
- package/styled-system/patterns/aspect-ratio.mjs +2 -2
- package/styled-system/patterns/bleed.mjs +1 -2
- package/styled-system/patterns/float.mjs +5 -11
- package/styled-system/patterns/grid-item.mjs +1 -2
- package/styled-system/patterns/grid.mjs +1 -2
- package/styled-system/patterns/link-overlay.mjs +1 -1
- package/styled-system/patterns/spacer.mjs +3 -3
- package/styled-system/patterns/visually-hidden.mjs +1 -1
- package/styled-system/styles.css +2815 -2371
- package/styled-system/types/prop-type.d.ts +1 -1
package/package.json
CHANGED
|
@@ -1,41 +1,41 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
3
|
"@cprussin/option-result": "^2.0.1",
|
|
4
|
-
"@domicile-desktop/component-library": "2.0
|
|
5
|
-
"@domicile-desktop/manganese-bar": "1.1.
|
|
6
|
-
"@domicile-desktop/manganese-bar-module-battery": "1.1.
|
|
7
|
-
"@domicile-desktop/manganese-bar-module-bluetooth": "1.1.
|
|
8
|
-
"@domicile-desktop/manganese-bar-module-brightness": "2.0.
|
|
9
|
-
"@domicile-desktop/manganese-bar-module-cast": "0.1.
|
|
10
|
-
"@domicile-desktop/manganese-bar-module-clock": "1.0.
|
|
11
|
-
"@domicile-desktop/manganese-bar-module-downloads": "0.1.
|
|
12
|
-
"@domicile-desktop/manganese-bar-module-gmail": "2.0.
|
|
13
|
-
"@domicile-desktop/manganese-bar-module-google-messages": "1.0.
|
|
14
|
-
"@domicile-desktop/manganese-bar-module-idle-inhibitor": "1.1.
|
|
15
|
-
"@domicile-desktop/manganese-bar-module-keymap": "0.1.
|
|
16
|
-
"@domicile-desktop/manganese-bar-module-launcher-button": "1.0
|
|
17
|
-
"@domicile-desktop/manganese-bar-module-network": "1.1.
|
|
18
|
-
"@domicile-desktop/manganese-bar-module-notifications": "
|
|
19
|
-
"@domicile-desktop/manganese-bar-module-sharing": "1.1.
|
|
20
|
-
"@domicile-desktop/manganese-bar-module-theme-switch": "1.1.
|
|
21
|
-
"@domicile-desktop/manganese-bar-module-tray": "1.1.
|
|
22
|
-
"@domicile-desktop/manganese-bar-module-volume": "2.0.
|
|
23
|
-
"@domicile-desktop/manganese-bar-module-workspace-switcher": "1.
|
|
24
|
-
"@domicile-desktop/manganese-clipboard": "1.1.
|
|
25
|
-
"@domicile-desktop/manganese-host": "2.0.
|
|
26
|
-
"@domicile-desktop/manganese-inbox-gmail": "0.1.
|
|
27
|
-
"@domicile-desktop/manganese-inbox-google-messages": "0.1.
|
|
28
|
-
"@domicile-desktop/manganese-launcher": "1.1.
|
|
29
|
-
"@domicile-desktop/manganese-lock": "1.0.
|
|
30
|
-
"@domicile-desktop/manganese-notifications": "
|
|
31
|
-
"@domicile-desktop/manganese-quick-settings": "1.0.
|
|
32
|
-
"@domicile-desktop/manganese-wallpaper": "1.1.
|
|
33
|
-
"@domicile-desktop/manganese-window-management": "1.
|
|
34
|
-
"@domicile-desktop/react": "0.1.
|
|
35
|
-
"@domicile-desktop/sdk": "2.
|
|
36
|
-
"@domicile-desktop/system-apps": "1.
|
|
37
|
-
"@domicile-desktop/system-audio": "1.1.
|
|
38
|
-
"@domicile-desktop/system-backlight": "1.1.
|
|
4
|
+
"@domicile-desktop/component-library": "2.1.0",
|
|
5
|
+
"@domicile-desktop/manganese-bar": "1.1.2",
|
|
6
|
+
"@domicile-desktop/manganese-bar-module-battery": "1.1.2",
|
|
7
|
+
"@domicile-desktop/manganese-bar-module-bluetooth": "1.1.2",
|
|
8
|
+
"@domicile-desktop/manganese-bar-module-brightness": "2.0.2",
|
|
9
|
+
"@domicile-desktop/manganese-bar-module-cast": "0.1.2",
|
|
10
|
+
"@domicile-desktop/manganese-bar-module-clock": "1.0.3",
|
|
11
|
+
"@domicile-desktop/manganese-bar-module-downloads": "0.1.2",
|
|
12
|
+
"@domicile-desktop/manganese-bar-module-gmail": "2.0.2",
|
|
13
|
+
"@domicile-desktop/manganese-bar-module-google-messages": "1.0.2",
|
|
14
|
+
"@domicile-desktop/manganese-bar-module-idle-inhibitor": "1.1.2",
|
|
15
|
+
"@domicile-desktop/manganese-bar-module-keymap": "0.1.2",
|
|
16
|
+
"@domicile-desktop/manganese-bar-module-launcher-button": "1.1.0",
|
|
17
|
+
"@domicile-desktop/manganese-bar-module-network": "1.1.2",
|
|
18
|
+
"@domicile-desktop/manganese-bar-module-notifications": "2.0.0",
|
|
19
|
+
"@domicile-desktop/manganese-bar-module-sharing": "1.1.2",
|
|
20
|
+
"@domicile-desktop/manganese-bar-module-theme-switch": "1.1.2",
|
|
21
|
+
"@domicile-desktop/manganese-bar-module-tray": "1.1.2",
|
|
22
|
+
"@domicile-desktop/manganese-bar-module-volume": "2.0.2",
|
|
23
|
+
"@domicile-desktop/manganese-bar-module-workspace-switcher": "1.2.0",
|
|
24
|
+
"@domicile-desktop/manganese-clipboard": "1.1.2",
|
|
25
|
+
"@domicile-desktop/manganese-host": "2.0.2",
|
|
26
|
+
"@domicile-desktop/manganese-inbox-gmail": "0.1.2",
|
|
27
|
+
"@domicile-desktop/manganese-inbox-google-messages": "0.1.2",
|
|
28
|
+
"@domicile-desktop/manganese-launcher": "1.1.2",
|
|
29
|
+
"@domicile-desktop/manganese-lock": "1.0.3",
|
|
30
|
+
"@domicile-desktop/manganese-notifications": "2.0.0",
|
|
31
|
+
"@domicile-desktop/manganese-quick-settings": "1.0.2",
|
|
32
|
+
"@domicile-desktop/manganese-wallpaper": "1.1.2",
|
|
33
|
+
"@domicile-desktop/manganese-window-management": "1.3.0",
|
|
34
|
+
"@domicile-desktop/react": "0.1.2",
|
|
35
|
+
"@domicile-desktop/sdk": "2.2.0",
|
|
36
|
+
"@domicile-desktop/system-apps": "1.2.0",
|
|
37
|
+
"@domicile-desktop/system-audio": "1.1.2",
|
|
38
|
+
"@domicile-desktop/system-backlight": "1.1.2",
|
|
39
39
|
"@pandacss/dev": "^1.12.1",
|
|
40
40
|
"@phosphor-icons/react": "^2.1.10",
|
|
41
41
|
"react": "^19.2.8",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"description": "Domicile's default desktop shell: runManganese() composes manganese's packages into a desktop.",
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@cprussin/tsconfig": "^5.0.0",
|
|
47
|
-
"@domicile-desktop/dev-shell": "0.0.
|
|
47
|
+
"@domicile-desktop/dev-shell": "0.0.3",
|
|
48
48
|
"@domicile-desktop/test-support": "0.0.2",
|
|
49
49
|
"@pandacss/preset-panda": "^1.12.1",
|
|
50
50
|
"@testing-library/react": "^16.3.3",
|
|
@@ -57,8 +57,7 @@
|
|
|
57
57
|
"vite": "^8.2.2"
|
|
58
58
|
},
|
|
59
59
|
"engines": {
|
|
60
|
-
"bun": ">=1.4.2"
|
|
61
|
-
"node": ">=24"
|
|
60
|
+
"bun": ">=1.4.2"
|
|
62
61
|
},
|
|
63
62
|
"exports": {
|
|
64
63
|
".": "./src/index.tsx",
|
|
@@ -108,5 +107,5 @@
|
|
|
108
107
|
"watch:css": "panda cssgen --watch --silent"
|
|
109
108
|
},
|
|
110
109
|
"type": "module",
|
|
111
|
-
"version": "1.
|
|
110
|
+
"version": "1.2.0"
|
|
112
111
|
}
|
package/src/Desktop.tsx
CHANGED
|
@@ -59,6 +59,12 @@ import type { Direction } from "@domicile-desktop/manganese-window-management/di
|
|
|
59
59
|
import type { FloatingRules } from "@domicile-desktop/manganese-window-management/floating/floating-rules";
|
|
60
60
|
import { useKeybindings } from "@domicile-desktop/manganese-window-management/keyboard/useKeybindings";
|
|
61
61
|
import { useModifiers } from "@domicile-desktop/manganese-window-management/keyboard/useModifiers";
|
|
62
|
+
import { OverviewBackdrop } from "@domicile-desktop/manganese-window-management/overview/OverviewBackdrop";
|
|
63
|
+
import { OverviewPicker } from "@domicile-desktop/manganese-window-management/overview/OverviewPicker";
|
|
64
|
+
import { screenOverviewsOf } from "@domicile-desktop/manganese-window-management/overview/overview";
|
|
65
|
+
import { sightOf } from "@domicile-desktop/manganese-window-management/overview/sight";
|
|
66
|
+
import { steeredInOverview } from "@domicile-desktop/manganese-window-management/overview/steering";
|
|
67
|
+
import { useOverviewPhase } from "@domicile-desktop/manganese-window-management/overview/useOverviewPhase";
|
|
62
68
|
import type { Geometry } from "@domicile-desktop/manganese-window-management/placement";
|
|
63
69
|
import type {
|
|
64
70
|
Focus,
|
|
@@ -100,7 +106,13 @@ import {
|
|
|
100
106
|
useAutoBrightness,
|
|
101
107
|
} from "@domicile-desktop/system-backlight/react";
|
|
102
108
|
import type { ReactNode } from "react";
|
|
103
|
-
import {
|
|
109
|
+
import {
|
|
110
|
+
useCallback,
|
|
111
|
+
useEffect,
|
|
112
|
+
useLayoutEffect,
|
|
113
|
+
useMemo,
|
|
114
|
+
useState,
|
|
115
|
+
} from "react";
|
|
104
116
|
import { useCastHolds } from "./cast-holds";
|
|
105
117
|
import { LOCK_BAR } from "./default-bars";
|
|
106
118
|
import {
|
|
@@ -114,6 +126,7 @@ import { LevelNotice } from "./LevelNotice";
|
|
|
114
126
|
import { launcherGlancesOf } from "./launcher-glances";
|
|
115
127
|
import { pressMediaKey } from "./media-keys";
|
|
116
128
|
import { options } from "./options";
|
|
129
|
+
import { usePageDuplicates } from "./page-duplicates";
|
|
117
130
|
import { Monitor } from "./screens/Monitor";
|
|
118
131
|
import { NoScreens } from "./screens/NoScreens";
|
|
119
132
|
import { showsSharing } from "./shows-sharing";
|
|
@@ -251,7 +264,15 @@ export const Desktop = ({
|
|
|
251
264
|
() => inboxes.map(({ notifiesAs }) => notifiesAs),
|
|
252
265
|
[inboxes],
|
|
253
266
|
);
|
|
254
|
-
|
|
267
|
+
// An inbox's window whose page notifies what the inbox notifies already
|
|
268
|
+
// notifies nothing.
|
|
269
|
+
const pageDuplicates = usePageDuplicates(domicile, inboxes);
|
|
270
|
+
const notifications = useNotifications(
|
|
271
|
+
domicile,
|
|
272
|
+
toasts,
|
|
273
|
+
inboxSenders,
|
|
274
|
+
pageDuplicates,
|
|
275
|
+
);
|
|
255
276
|
const { dismiss: dismissNotifications, read } = notifications;
|
|
256
277
|
// What `notifications clear` dismisses, as the drawer's "Clear all" does.
|
|
257
278
|
const notificationIds = useMemo(
|
|
@@ -316,6 +337,28 @@ export const Desktop = ({
|
|
|
316
337
|
|
|
317
338
|
const screens = useStageScreens(windows, displays);
|
|
318
339
|
|
|
340
|
+
// Each screen's workspaces at once, while open and while it closes.
|
|
341
|
+
const { closed: overviewClosed, phase: overviewPhase } = useOverviewPhase(
|
|
342
|
+
windows.overviewOpen,
|
|
343
|
+
);
|
|
344
|
+
const overviews = useMemo(
|
|
345
|
+
() =>
|
|
346
|
+
overviewPhase === undefined
|
|
347
|
+
? undefined
|
|
348
|
+
: screenOverviewsOf(windows, screens, overviewPhase === "closing"),
|
|
349
|
+
[overviewPhase, screens, windows],
|
|
350
|
+
);
|
|
351
|
+
const sight = useMemo(
|
|
352
|
+
() => (overviews === undefined ? undefined : sightOf(overviews)),
|
|
353
|
+
[overviews],
|
|
354
|
+
);
|
|
355
|
+
// With no screen there is no backdrop to end the closing fade.
|
|
356
|
+
useEffect(() => {
|
|
357
|
+
if (overviewPhase === "closing" && overviews?.length === 0) {
|
|
358
|
+
overviewClosed();
|
|
359
|
+
}
|
|
360
|
+
}, [overviewClosed, overviewPhase, overviews]);
|
|
361
|
+
|
|
319
362
|
// The pointer follows the keyboard. Focus follows the pointer, so otherwise
|
|
320
363
|
// the next pointer event would undo a keyboard focus change. See
|
|
321
364
|
// `pointer-warp.ts`.
|
|
@@ -453,7 +496,17 @@ export const Desktop = ({
|
|
|
453
496
|
}
|
|
454
497
|
default: {
|
|
455
498
|
spendShift();
|
|
456
|
-
|
|
499
|
+
// In the overview, `focus` and `move` step its workspaces.
|
|
500
|
+
act(
|
|
501
|
+
windows.overviewOpen && overviews !== undefined
|
|
502
|
+
? steeredInOverview(
|
|
503
|
+
action,
|
|
504
|
+
overviews,
|
|
505
|
+
windows.overviewAim,
|
|
506
|
+
windows.focused,
|
|
507
|
+
)
|
|
508
|
+
: action,
|
|
509
|
+
);
|
|
457
510
|
// Moves the pointer with the keyboard; see `usePointerWarp`.
|
|
458
511
|
// Dispatched in the same turn so both land in one render.
|
|
459
512
|
act(WindowAction.KeyPressed());
|
|
@@ -469,9 +522,12 @@ export const Desktop = ({
|
|
|
469
522
|
notificationIds,
|
|
470
523
|
notificationsOpen,
|
|
471
524
|
openNotifications,
|
|
525
|
+
overviews,
|
|
472
526
|
spendShift,
|
|
473
527
|
volumeKeys,
|
|
474
528
|
windows.focused,
|
|
529
|
+
windows.overviewAim,
|
|
530
|
+
windows.overviewOpen,
|
|
475
531
|
],
|
|
476
532
|
);
|
|
477
533
|
|
|
@@ -501,6 +557,33 @@ export const Desktop = ({
|
|
|
501
557
|
},
|
|
502
558
|
[act],
|
|
503
559
|
);
|
|
560
|
+
const overviewAimed = useCallback(
|
|
561
|
+
(workspace: string) => {
|
|
562
|
+
act(WindowAction.OverviewAimed(workspace));
|
|
563
|
+
},
|
|
564
|
+
[act],
|
|
565
|
+
);
|
|
566
|
+
const overviewDismissed = useCallback(() => {
|
|
567
|
+
act(WindowAction.OverviewDismissed());
|
|
568
|
+
}, [act]);
|
|
569
|
+
const overviewPicked = useCallback(
|
|
570
|
+
(workspace: string) => {
|
|
571
|
+
act(WindowAction.OverviewPicked(workspace));
|
|
572
|
+
},
|
|
573
|
+
[act],
|
|
574
|
+
);
|
|
575
|
+
const overviewWindowPicked = useCallback(
|
|
576
|
+
(id: string) => {
|
|
577
|
+
act(WindowAction.OverviewWindowPicked(id));
|
|
578
|
+
},
|
|
579
|
+
[act],
|
|
580
|
+
);
|
|
581
|
+
const windowMovedTo = useCallback(
|
|
582
|
+
(id: string, workspace: string) => {
|
|
583
|
+
act(WindowAction.WindowMovedToWorkspace(id, workspace));
|
|
584
|
+
},
|
|
585
|
+
[act],
|
|
586
|
+
);
|
|
504
587
|
const copied = useCallback(
|
|
505
588
|
(entry: number) => {
|
|
506
589
|
domicile.clipboard.copy(entry);
|
|
@@ -532,13 +615,13 @@ export const Desktop = ({
|
|
|
532
615
|
);
|
|
533
616
|
const drawer = useMemo(
|
|
534
617
|
() => ({
|
|
535
|
-
doNotDisturb: notifications.doNotDisturb,
|
|
536
618
|
handle: notificationsHandle,
|
|
619
|
+
paused: notifications.pause !== undefined,
|
|
537
620
|
unread: notifications.unread + inboxDrawer.unread,
|
|
538
621
|
}),
|
|
539
622
|
[
|
|
540
623
|
inboxDrawer.unread,
|
|
541
|
-
notifications.
|
|
624
|
+
notifications.pause,
|
|
542
625
|
notifications.unread,
|
|
543
626
|
notificationsHandle,
|
|
544
627
|
],
|
|
@@ -567,11 +650,22 @@ export const Desktop = ({
|
|
|
567
650
|
focused: windows.focused,
|
|
568
651
|
homes: windows.homes,
|
|
569
652
|
mode: windows.mode,
|
|
653
|
+
overviewOpen: windows.overviewOpen,
|
|
570
654
|
select: (workspace: string) => {
|
|
571
655
|
act(WindowAction.WorkspaceSelected(workspace));
|
|
572
656
|
},
|
|
657
|
+
toggleOverview: () => {
|
|
658
|
+
act(WindowAction.OverviewToggled());
|
|
659
|
+
},
|
|
573
660
|
}),
|
|
574
|
-
[
|
|
661
|
+
[
|
|
662
|
+
act,
|
|
663
|
+
current,
|
|
664
|
+
windows.focused,
|
|
665
|
+
windows.homes,
|
|
666
|
+
windows.mode,
|
|
667
|
+
windows.overviewOpen,
|
|
668
|
+
],
|
|
575
669
|
);
|
|
576
670
|
|
|
577
671
|
// A global shortcuts review flags these.
|
|
@@ -587,6 +681,7 @@ export const Desktop = ({
|
|
|
587
681
|
onModeChanged: (mode) => {
|
|
588
682
|
act(WindowAction.ModeSet(mode));
|
|
589
683
|
},
|
|
684
|
+
overviewOpen: windows.overviewOpen,
|
|
590
685
|
});
|
|
591
686
|
|
|
592
687
|
useScreenFollowsPointer({ act, displays, focused: windows.focused });
|
|
@@ -625,6 +720,18 @@ export const Desktop = ({
|
|
|
625
720
|
name={name}
|
|
626
721
|
/>
|
|
627
722
|
))}
|
|
723
|
+
{/*
|
|
724
|
+
Under every window and over the wallpaper: the overview's dimmed
|
|
725
|
+
screens, tiles and names.
|
|
726
|
+
*/}
|
|
727
|
+
{overviews !== undefined && (
|
|
728
|
+
<OverviewBackdrop
|
|
729
|
+
cards={windows.overviewCards}
|
|
730
|
+
closing={overviewPhase === "closing"}
|
|
731
|
+
onClosed={overviewClosed}
|
|
732
|
+
overviews={overviews}
|
|
733
|
+
/>
|
|
734
|
+
)}
|
|
628
735
|
{/*
|
|
629
736
|
Every window, once for the desk and after every bar, so a window wins a
|
|
630
737
|
tie with a bar it overlaps; see `Stage`.
|
|
@@ -634,6 +741,7 @@ export const Desktop = ({
|
|
|
634
741
|
activeId={windows.activeId}
|
|
635
742
|
behindPanel={
|
|
636
743
|
windows.launcherOpen ||
|
|
744
|
+
windows.overviewOpen ||
|
|
637
745
|
windows.clipboardOpen ||
|
|
638
746
|
opened !== undefined ||
|
|
639
747
|
portal.url !== undefined ||
|
|
@@ -650,12 +758,27 @@ export const Desktop = ({
|
|
|
650
758
|
focusedId={windows.focusedId}
|
|
651
759
|
modifiers={modifiers}
|
|
652
760
|
{...stageActions}
|
|
761
|
+
overview={sight}
|
|
653
762
|
popups={windows.popups}
|
|
654
763
|
scratchpad={windows.scratchpad}
|
|
655
764
|
screens={screens}
|
|
656
765
|
windows={windows.windows}
|
|
657
766
|
/>
|
|
658
767
|
)}
|
|
768
|
+
{/* Over every window, while the overview is open. */}
|
|
769
|
+
{overviews !== undefined && overviewPhase === "open" && (
|
|
770
|
+
<OverviewPicker
|
|
771
|
+
aim={windows.overviewAim}
|
|
772
|
+
cards={windows.overviewCards}
|
|
773
|
+
focused={windows.focused}
|
|
774
|
+
onAim={overviewAimed}
|
|
775
|
+
onDismiss={overviewDismissed}
|
|
776
|
+
onMove={windowMovedTo}
|
|
777
|
+
onPick={overviewPicked}
|
|
778
|
+
onPickWindow={overviewWindowPicked}
|
|
779
|
+
overviews={overviews}
|
|
780
|
+
/>
|
|
781
|
+
)}
|
|
659
782
|
{/* Panels cover the whole desktop, not one screen. */}
|
|
660
783
|
<Launcher
|
|
661
784
|
fromPrivate={activeIsPrivate(windows)}
|
|
@@ -730,7 +853,6 @@ export const Desktop = ({
|
|
|
730
853
|
/>
|
|
731
854
|
{/* Under the bell that opened it. */}
|
|
732
855
|
<NotificationDrawer
|
|
733
|
-
doNotDisturb={notifications.doNotDisturb}
|
|
734
856
|
handle={notificationsHandle}
|
|
735
857
|
inboxes={inboxes.length === 0 ? undefined : inboxDrawer.drawer}
|
|
736
858
|
items={notifications.items}
|
|
@@ -738,10 +860,12 @@ export const Desktop = ({
|
|
|
738
860
|
onAction={pressNotification}
|
|
739
861
|
onClose={closeNotifications}
|
|
740
862
|
onDismiss={notifications.dismiss}
|
|
741
|
-
onDoNotDisturb={notifications.setDoNotDisturb}
|
|
742
863
|
onOpen={openNotifications}
|
|
864
|
+
onPause={notifications.pauseFor}
|
|
743
865
|
onReply={notifications.reply}
|
|
866
|
+
onResume={notifications.resume}
|
|
744
867
|
open={notificationsOpen && !lock.locked}
|
|
868
|
+
pause={notifications.pause}
|
|
745
869
|
screen={notificationsOn}
|
|
746
870
|
/>
|
|
747
871
|
{/*
|
|
@@ -938,14 +1062,11 @@ const stageActionsOf = (
|
|
|
938
1062
|
act(WindowAction.WindowDroppedOnScreen(id, aim.name));
|
|
939
1063
|
break;
|
|
940
1064
|
}
|
|
941
|
-
case AimKind.Group:
|
|
942
|
-
act(WindowAction.WindowDroppedOn(id, { id: aim.id, up: 1 }, aim.edge));
|
|
943
|
-
break;
|
|
944
|
-
}
|
|
1065
|
+
case AimKind.Group:
|
|
945
1066
|
case AimKind.Strip:
|
|
946
1067
|
case AimKind.Tab:
|
|
947
1068
|
case AimKind.Window: {
|
|
948
|
-
act(WindowAction.WindowDroppedOn(id,
|
|
1069
|
+
act(WindowAction.WindowDroppedOn(id, aim.node, aim.edge));
|
|
949
1070
|
break;
|
|
950
1071
|
}
|
|
951
1072
|
}
|
|
@@ -967,25 +1088,15 @@ const stageActionsOf = (
|
|
|
967
1088
|
},
|
|
968
1089
|
onGroupDropOn: (group: NodeRef, aim: Aim) => {
|
|
969
1090
|
switch (aim.kind) {
|
|
970
|
-
case AimKind.Group: {
|
|
971
|
-
act(
|
|
972
|
-
WindowAction.GroupDroppedOn(group, { id: aim.id, up: 1 }, aim.edge),
|
|
973
|
-
);
|
|
974
|
-
break;
|
|
975
|
-
}
|
|
976
1091
|
case AimKind.Screen: {
|
|
977
1092
|
act(WindowAction.GroupDroppedOnScreen(group, aim.name));
|
|
978
1093
|
break;
|
|
979
1094
|
}
|
|
980
|
-
case AimKind.
|
|
981
|
-
|
|
982
|
-
throw new Error(`desktop: group ${group.id} aimed along a strip`);
|
|
983
|
-
}
|
|
1095
|
+
case AimKind.Group:
|
|
1096
|
+
case AimKind.Strip:
|
|
984
1097
|
case AimKind.Tab:
|
|
985
1098
|
case AimKind.Window: {
|
|
986
|
-
act(
|
|
987
|
-
WindowAction.GroupDroppedOn(group, { id: aim.id, up: 0 }, aim.edge),
|
|
988
|
-
);
|
|
1099
|
+
act(WindowAction.GroupDroppedOn(group, aim.node, aim.edge));
|
|
989
1100
|
break;
|
|
990
1101
|
}
|
|
991
1102
|
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { Inbox } from "@domicile-desktop/manganese-notifications/inbox";
|
|
2
|
+
import { InboxKind } from "@domicile-desktop/manganese-notifications/inbox";
|
|
3
|
+
import type { Domicile } from "@domicile-desktop/sdk/desktop/desktop";
|
|
4
|
+
import { useCallback, useMemo, useSyncExternalStore } from "react";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The browser windows whose pages notify what their inbox notifies already:
|
|
8
|
+
* each open window of an inbox whose `app.pageNotifies`, such as a Gmail
|
|
9
|
+
* account's. Their pages' notifications are cleared as they arrive. Empty
|
|
10
|
+
* until the engine lists the windows.
|
|
11
|
+
*/
|
|
12
|
+
export const usePageDuplicates = (
|
|
13
|
+
domicile: Pick<Domicile, "browser">,
|
|
14
|
+
inboxes: readonly Inbox[],
|
|
15
|
+
): readonly string[] => {
|
|
16
|
+
const appIds = useMemo(() => inboxes.flatMap(duplicatingAppIdsOf), [inboxes]);
|
|
17
|
+
const subscribe = useCallback(
|
|
18
|
+
(changed: () => void) => domicile.browser.on("change", changed),
|
|
19
|
+
[domicile],
|
|
20
|
+
);
|
|
21
|
+
// Joined, so a list that changes no such window changes nothing.
|
|
22
|
+
const ids = useSyncExternalStore(subscribe, () =>
|
|
23
|
+
(domicile.browser.windows ?? [])
|
|
24
|
+
.filter(({ appId }) => appIds.includes(appId))
|
|
25
|
+
.map(({ id }) => id)
|
|
26
|
+
.join(" "),
|
|
27
|
+
);
|
|
28
|
+
return useMemo(() => (ids === "" ? [] : ids.split(" ")), [ids]);
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
/** The app id of `inbox`'s window, if its page notifies the inbox's news. */
|
|
32
|
+
const duplicatingAppIdsOf = (inbox: Inbox): readonly string[] => {
|
|
33
|
+
switch (inbox.kind) {
|
|
34
|
+
case InboxKind.Watched: {
|
|
35
|
+
return inbox.app?.pageNotifies === true ? [inbox.app.appId] : [];
|
|
36
|
+
}
|
|
37
|
+
case InboxKind.Window: {
|
|
38
|
+
return [];
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
};
|
|
@@ -3,11 +3,11 @@ import { css } from '../css/index.mjs';
|
|
|
3
3
|
|
|
4
4
|
const aspectRatioConfig = {
|
|
5
5
|
transform(props, { map }) {
|
|
6
|
-
const { ratio =
|
|
6
|
+
const { ratio = 1.3333333333333333, ...rest } = props;
|
|
7
7
|
return {
|
|
8
8
|
position: "relative",
|
|
9
9
|
_before: {
|
|
10
|
-
content:
|
|
10
|
+
content: '""',
|
|
11
11
|
display: "block",
|
|
12
12
|
height: "0",
|
|
13
13
|
paddingBottom: map(ratio, (r) => `${1 / r * 100}%`)
|
|
@@ -3,8 +3,7 @@ import { css } from '../css/index.mjs';
|
|
|
3
3
|
|
|
4
4
|
const bleedConfig = {
|
|
5
5
|
transform(props, { map, isCssUnit, isCssVar }) {
|
|
6
|
-
const { inline, block, ...rest } = props
|
|
7
|
-
const valueFn = (v) => isCssUnit(v) || isCssVar(v) ? v : `token(spacing.${v}, ${v})`;
|
|
6
|
+
const { inline, block, ...rest } = props, valueFn = (v) => isCssUnit(v) || isCssVar(v) ? v : `token(spacing.${v}, ${v})`;
|
|
8
7
|
return {
|
|
9
8
|
"--bleed-x": map(inline, valueFn),
|
|
10
9
|
"--bleed-y": map(block, valueFn),
|
|
@@ -11,28 +11,22 @@ transform(props, { map }) {
|
|
|
11
11
|
position: "absolute",
|
|
12
12
|
insetBlockStart: map(placement, (v) => {
|
|
13
13
|
const [side] = v.split("-");
|
|
14
|
-
|
|
15
|
-
return map2[side];
|
|
14
|
+
return { top: offsetY, middle: "50%", bottom: "auto" }[side];
|
|
16
15
|
}),
|
|
17
16
|
insetBlockEnd: map(placement, (v) => {
|
|
18
17
|
const [side] = v.split("-");
|
|
19
|
-
|
|
20
|
-
return map2[side];
|
|
18
|
+
return { top: "auto", middle: "50%", bottom: offsetY }[side];
|
|
21
19
|
}),
|
|
22
20
|
insetInlineStart: map(placement, (v) => {
|
|
23
21
|
const [, align] = v.split("-");
|
|
24
|
-
|
|
25
|
-
return map2[align];
|
|
22
|
+
return { start: offsetX, center: "50%", end: "auto" }[align];
|
|
26
23
|
}),
|
|
27
24
|
insetInlineEnd: map(placement, (v) => {
|
|
28
25
|
const [, align] = v.split("-");
|
|
29
|
-
|
|
30
|
-
return map2[align];
|
|
26
|
+
return { start: "auto", center: "50%", end: offsetX }[align];
|
|
31
27
|
}),
|
|
32
28
|
translate: map(placement, (v) => {
|
|
33
|
-
const [side, align] = v.split("-");
|
|
34
|
-
const mapX = { start: "-50%", center: "-50%", end: "50%" };
|
|
35
|
-
const mapY = { top: "-50%", middle: "-50%", bottom: "50%" };
|
|
29
|
+
const [side, align] = v.split("-"), mapX = { start: "-50%", center: "-50%", end: "50%" }, mapY = { top: "-50%", middle: "-50%", bottom: "50%" };
|
|
36
30
|
return `${mapX[align]} ${mapY[side]}`;
|
|
37
31
|
}),
|
|
38
32
|
...rest
|
|
@@ -3,8 +3,7 @@ import { css } from '../css/index.mjs';
|
|
|
3
3
|
|
|
4
4
|
const gridItemConfig = {
|
|
5
5
|
transform(props, { map }) {
|
|
6
|
-
const { colSpan, rowSpan, colStart, rowStart, colEnd, rowEnd, ...rest } = props
|
|
7
|
-
const spanFn = (v) => v === "auto" ? v : `span ${v}`;
|
|
6
|
+
const { colSpan, rowSpan, colStart, rowStart, colEnd, rowEnd, ...rest } = props, spanFn = (v) => v === "auto" ? v : `span ${v}`;
|
|
8
7
|
return {
|
|
9
8
|
gridColumn: colSpan != null ? map(colSpan, spanFn) : void 0,
|
|
10
9
|
gridRow: rowSpan != null ? map(rowSpan, spanFn) : void 0,
|
|
@@ -3,8 +3,7 @@ import { css } from '../css/index.mjs';
|
|
|
3
3
|
|
|
4
4
|
const gridConfig = {
|
|
5
5
|
transform(props, { map, isCssUnit }) {
|
|
6
|
-
const { columnGap, rowGap, gap, columns, minChildWidth, ...rest } = props
|
|
7
|
-
const getValue = (v) => isCssUnit(v) ? v : `token(sizes.${v}, ${v})`;
|
|
6
|
+
const { columnGap, rowGap, gap, columns, minChildWidth, ...rest } = props, getValue = (v) => isCssUnit(v) ? v : `token(sizes.${v}, ${v})`;
|
|
8
7
|
return {
|
|
9
8
|
display: "grid",
|
|
10
9
|
gridTemplateColumns: columns != null ? map(columns, (v) => `repeat(${v}, minmax(0, 1fr))`) : minChildWidth != null ? map(minChildWidth, (v) => `repeat(auto-fit, minmax(${getValue(v)}, 1fr))`) : void 0,
|
|
@@ -8,9 +8,9 @@ transform(props, { map, isCssUnit, isCssVar }) {
|
|
|
8
8
|
alignSelf: "stretch",
|
|
9
9
|
justifySelf: "stretch",
|
|
10
10
|
flex: map(size, (v) => {
|
|
11
|
-
if (v == null)
|
|
12
|
-
|
|
13
|
-
return `0 0 ${
|
|
11
|
+
if (v == null)
|
|
12
|
+
return "1";
|
|
13
|
+
return `0 0 ${isCssUnit(v) || isCssVar(v) ? v : `token(spacing.${v}, ${v})`}`;
|
|
14
14
|
}),
|
|
15
15
|
...rest
|
|
16
16
|
};
|