Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(ui): confirmation and delete dialog ui (#5645)

dev-rbb2ac67410c25
diff --git a/apps/web/src/components/app/split-layout/componentRegistry.tsx b/apps/web/src/components/app/split-layout/componentRegistry.tsx
index 364ccd8117..dedf6c7dfd 100644
--- a/apps/web/src/components/app/split-layout/componentRegistry.tsx
+++ b/apps/web/src/components/app/split-layout/componentRegistry.tsx
@@ -540,7 +540,7 @@ registerComponent('calendar-event-compose', (params) => {
| ((calendarId: string, color: string) => void)
| undefined
}
- onClose={params?.onClose as (() => void) | undefined}
+ onSaveSuccess={params?.onSaveSuccess as (() => void) | undefined}
/>
);
});
diff --git a/apps/web/src/components/app/split-layout/layout.ts b/apps/web/src/components/app/split-layout/layout.ts
index 1b7307fddf..811a5aadd4 100644
--- a/apps/web/src/components/app/split-layout/layout.ts
+++ b/apps/web/src/components/app/split-layout/layout.ts
@@ -4,6 +4,7 @@ import { useContext } from 'solid-js';
import { SplitPanelContext } from './context';
import type {
OpenWithSplitOptions,
+ PopoverSplitOptions,
ReferredFrom,
SplitContent,
} from './layoutManager';
@@ -78,13 +79,16 @@ export function useSplitLayout() {
});
}
- function popoverSplit(content: SplitContent) {
+ function popoverSplit(
+ content: SplitContent,
+ options: Omit<PopoverSplitOptions, 'content'> = {}
+ ) {
const splitManager = globalSplitManager();
if (!splitManager) {
console.error('no split manager found');
return;
}
- return splitManager.createPopoverSplit({ content: content });
+ return splitManager.createPopoverSplit({ ...options, content });
}
function replaceAllSplits(
diff --git a/apps/web/src/components/app/split-layout/layoutManager.ts b/apps/web/src/components/app/split-layout/layoutManager.ts
index f5d46400f8..78a2f5314a 100644
--- a/apps/web/src/components/app/split-layout/layoutManager.ts
+++ b/apps/web/src/components/app/split-layout/layoutManager.ts
@@ -148,7 +148,8 @@ export type SplitMount = BlockMount | ComponentMount;
export type PopoverSplitOptions = {
content: SplitContent;
- onClose?: () => void;
+ /** Handles a close request. Call `close` to finish closing the popover. */
+ onClose?: (close: () => void) => void;
};
export type PopoverSplitHandle = {
@@ -1771,30 +1772,42 @@ export function createSplitLayout(
focusLock.acquire();
const mount = createPinnedMount(orchestrator, options.content);
+ let closed = false;
+
+ const close = () => {
+ if (closed) return;
+ closed = true;
+
+ // Release focus lock to return focus to previously focused element
+ focusLock.release();
+
+ setState('popovers', (prev) => {
+ const newMap = new Map(prev);
+ const popover = newMap.get(id);
+ if (popover) {
+ newMap.set(id, { ...popover, isOpen: false });
+ // Schedule cleanup after a brief delay to allow for animations
+ setTimeout(() => {
+ setState('popovers', (prev) => {
+ const cleanupMap = new Map(prev);
+ cleanupMap.delete(id);
+ return cleanupMap;
+ });
+ }, 300);
+ }
+ return newMap;
+ });
+ };
const handle: PopoverSplitHandle = {
id,
close: () => {
- // Release focus lock to return focus to previously focused element
- focusLock.release();
-
- setState('popovers', (prev) => {
- const newMap = new Map(prev);
- const popover = newMap.get(id);
- if (popover) {
- newMap.set(id, { ...popover, isOpen: false });
- // Schedule cleanup after a brief delay to allow for animations
- setTimeout(() => {
- setState('popovers', (prev) => {
- const cleanupMap = new Map(prev);
- cleanupMap.delete(id);
- return cleanupMap;
- });
- }, 300);
- }
- return newMap;
- });
- options.onClose?.();
+ if (closed) return;
+ if (options.onClose) {
+ options.onClose(close);
+ return;
+ }
+ close();
},
isOpen: () => {
const popover = state.popovers.get(id);
diff --git a/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts b/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts
index 0cb52cb8bf..98b0b40d14 100644
--- a/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts
+++ b/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts
@@ -1553,4 +1553,42 @@ describe('layoutManager', () => {
});
});
});
+
+ describe('popover splits', () => {
+ it('lets an onClose handler decide when a popover finishes closing', () => {
+ createRoot((dispose) => {
+ const manager = createSplitLayout(createMockOrchestrator(), []);
+ const onClose = vi.fn();
+ const popover = manager.createPopoverSplit({
+ content: { type: 'component', id: 'composer' },
+ onClose,
+ });
+
+ popover.close();
+
+ expect(onClose).toHaveBeenCalledOnce();
+ expect(popover.isOpen()).toBe(true);
+
+ const finishClose = onClose.mock.calls[0][0];
+ finishClose();
+ expect(popover.isOpen()).toBe(false);
+
+ dispose();
+ });
+ });
+
+ it('closes immediately when no onClose handler is provided', () => {
+ createRoot((dispose) => {
+ const manager = createSplitLayout(createMockOrchestrator(), []);
+ const popover = manager.createPopoverSplit({
+ content: { type: 'component', id: 'composer' },
+ });
+
+ popover.close();
+
+ expect(popover.isOpen()).toBe(false);
+ dispose();
+ });
+ });
+ });
});
diff --git a/apps/web/src/components/ui/components/Button.tsx b/apps/web/src/components/ui/components/Button.tsx
index a2140414d9..586c09c3f3 100644
--- a/apps/web/src/components/ui/components/Button.tsx
+++ b/apps/web/src/components/ui/components/Button.tsx
@@ -57,7 +57,7 @@ export type ButtonVariant =
const variantStyles: Record<ButtonVariant, string> = {
danger:
- 'bg-transparent text-failure border border-failure/50 not-disabled:hover:bg-failure/10 not-disabled:active:bg-failure/20 disabled:opacity-30 ',
+ 'bg-failure/10 text-failure dark:bg-failure/15 focus-visible:bg-failure/25 focus-visible:border focus-visible:border-failure/50 not-disabled:hover:bg-failure/25 not-disabled:active:bg-failure/30 disabled:opacity-30 ',
base: 'bg-transparent text-ink-muted border border-edge-muted not-disabled:hover:bg-hover not-disabled:hover:text-ink active:bg-active disabled:opacity-30 ',
active:
'bg-accent-bg not-disabled:hover:bg-accent/30 text-accent disabled:opacity-30 ',
diff --git a/apps/web/src/components/ui/components/ConfirmDialog.tsx b/apps/web/src/components/ui/components/ConfirmDialog.tsx
index ce8a2d3bfd..c8559a6105 100644
--- a/apps/web/src/components/ui/components/ConfirmDialog.tsx
+++ b/apps/web/src/components/ui/components/ConfirmDialog.tsx
@@ -1,6 +1,7 @@
import type { JSX } from 'solid-js';
+import { cn } from '../utils/classname';
import { Button } from './Button';
-import { Dialog } from './Dialog';
+import { Dialog, type DialogProps } from './Dialog';
import {
type DialogHandle,
type ManagedDialogProps,
@@ -19,6 +20,8 @@ export type ConfirmDialogDisplayProps = {
confirmLabel?: JSX.Element;
cancelLabel?: JSX.Element;
tone?: 'default' | 'danger';
+ position?: DialogProps['position'];
+ class?: string;
};
export type ConfirmDialogProps = ManagedDialogProps &
@@ -32,37 +35,38 @@ export function ConfirmDialog(props: ConfirmDialogProps) {
<Dialog
open={props.open}
onOpenChange={props.onOpenChange}
- position="center"
- class="w-[90%] max-w-120"
+ position={props.position}
+ class={cn('w-[90%] max-w-120', props.class)}
+ visibleScrim
>
<Surface depth={2} class="rounded-xl text-ink">
- <div class="shrink-0 flex items-center border-b border-edge-muted px-5 py-3">
- <Dialog.Title class="text-sm font-semibold">
+ <div class="flex flex-col gap-1 px-5 py-4">
+ <Dialog.Title class="text-base font-semibold">
{props.title}
</Dialog.Title>
- </div>
- <div class="flex flex-col gap-4 p-5">
<Dialog.Description as="div" class="text-sm leading-5 text-ink-muted">
{props.body ?? props.children}
</Dialog.Description>
- <div class="flex justify-end gap-2">
- <Button
- type="button"
- variant="ghost"
- size="sm"
- onClick={() => props.onOpenChange(false)}
- >
- {props.cancelLabel ?? 'Cancel'}
- </Button>
- <Button
- type="button"
- variant={props.tone === 'danger' ? 'danger' : 'active'}
- size="sm"
- onClick={props.onConfirm}
- >
- {props.confirmLabel ?? 'Confirm'}
- </Button>
- </div>
+ </div>
+ <div class="flex items-center justify-end gap-2 px-5 py-3">
+ <Button
+ type="button"
+ variant="ghost"
+ depth={2}
+ class="rounded-lg"
+ onClick={() => props.onOpenChange(false)}
+ >
+ {props.cancelLabel ?? 'Cancel'}
+ </Button>
+ <Button
+ type="button"
+ variant={props.tone === 'danger' ? 'danger' : 'active'}
+ depth={2}
+ class="rounded-lg"
+ onClick={props.onConfirm}
+ >
+ {props.confirmLabel ?? 'Confirm'}
+ </Button>
</div>
</Surface>
</Dialog>
diff --git a/apps/web/src/components/ui/components/DeleteDialog.tsx b/apps/web/src/components/ui/components/DeleteDialog.tsx
new file mode 100644
index 0000000000..6cca7b7542
--- /dev/null
+++ b/apps/web/src/components/ui/components/DeleteDialog.tsx
@@ -0,0 +1,124 @@
+import SpinnerIcon from '@phosphor/spinner.svg';
+import type { JSX } from 'solid-js';
+import { createSignal, createUniqueId, Show } from 'solid-js';
+import { cn } from '../utils/classname';
+import { Button } from './Button';
+import { Dialog, type DialogProps } from './Dialog';
+import type { ManagedDialogProps } from './ImperativeDialog';
+import { Surface } from './Surface';
+
+/** Presentation and behavior options for the shared deletion dialog. */
+export type DeleteDialogProps = ManagedDialogProps & {
+ title: JSX.Element;
+ /** Dialog copy. `children` is used when `body` is omitted. */
+ body?: JSX.Element;
+ children?: JSX.Element;
+ deleteLabel?: JSX.Element;
+ cancelLabel?: JSX.Element;
+ /** Exact phrase the user must enter before deletion is enabled. */
+ confirmationPhrase?: string;
+ pending?: boolean;
+ position?: DialogProps['position'];
+ class?: string;
+ onDelete: () => void;
+};
+
+/** Shared destructive-action dialog with optional typed confirmation. */
+export function DeleteDialog(props: DeleteDialogProps) {
+ const confirmationInputId = createUniqueId();
+ const [confirmation, setConfirmation] = createSignal('');
+ const canDelete = () =>
+ !props.pending &&
+ (props.confirmationPhrase === undefined ||
+ confirmation() === props.confirmationPhrase);
+
+ const close = () => {
+ if (props.pending) return;
+ setConfirmation('');
+ props.onOpenChange(false);
+ };
+
+ const deleteItem = () => {
+ if (canDelete()) props.onDelete();
+ };
+
+ return (
+ <Dialog
+ open={props.open}
+ onOpenChange={(open) => {
+ if (!open) close();
+ }}
+ position={props.position}
+ class={cn('w-[90%] max-w-120', props.class)}
+ visibleScrim
+ >
+ <Surface depth={2} class="rounded-xl text-ink">
+ <div class="flex flex-col gap-3 px-5 py-4">
+ <div class="flex flex-col gap-1">
+ <Dialog.Title class="text-base font-semibold">
+ {props.title}
+ </Dialog.Title>
+ <Dialog.Description
+ as="div"
+ class="text-sm leading-5 text-ink-muted"
+ >
+ {props.body ?? props.children}
+ </Dialog.Description>
+ </div>
+
+ <Show when={props.confirmationPhrase}>
+ {(phrase) => (
+ <div class="flex flex-col gap-2">
+ <label
+ for={confirmationInputId}
+ class="text-sm leading-5 text-ink-muted"
+ >
+ Type <span class="font-medium text-ink">{phrase()}</span> to
+ confirm.
+ </label>
+ <input
+ id={confirmationInputId}
+ type="text"
+ value={confirmation()}
+ placeholder={phrase()}
+ disabled={props.pending}
+ autofocus
+ onInput={(event) =>
+ setConfirmation(event.currentTarget.value)
+ }
+ class="h-9 w-full rounded-lg border border-edge-muted bg-transparent px-3 text-sm text-ink outline-none transition-colors placeholder:text-ink-placeholder hover:border-edge focus:border-accent disabled:opacity-70"
+ />
+ </div>
+ )}
+ </Show>
+ </div>
+
+ <div class="flex items-center justify-end gap-2 px-5 py-3">
+ <Button
+ type="button"
+ variant="ghost"
+ depth={2}
+ class="rounded-lg"
+ disabled={props.pending}
+ onClick={close}
+ >
+ {props.cancelLabel ?? 'Cancel'}
+ </Button>
+ <Button
+ type="button"
+ variant="danger"
+ depth={2}
+ class="rounded-lg"
+ disabled={!canDelete()}
+ onClick={deleteItem}
+ >
+ <Show when={props.pending} fallback={props.deleteLabel ?? 'Delete'}>
+ <SpinnerIcon class="size-4 animate-spin" />
+ <span class="sr-only">{props.deleteLabel ?? 'Delete'}</span>
+ </Show>
+ </Button>
+ </div>
+ </Surface>
+ </Dialog>
+ );
+}
diff --git a/apps/web/src/components/ui/components/ImperativeDialog.tsx b/apps/web/src/components/ui/components/ImperativeDialog.tsx
index 061b3ac157..4ac80c6593 100644
--- a/apps/web/src/components/ui/components/ImperativeDialog.tsx
+++ b/apps/web/src/components/ui/components/ImperativeDialog.tsx
@@ -28,7 +28,7 @@ export type OpenDialogOptions = {
* Capture this owner while the calling component is being created; event
* handlers generally run without an owner.
*/
- owner?: Owner;
+ owner?: Owner | null;
};
/** Why an imperative dialog was closed. */
@@ -139,7 +139,7 @@ export function openDialog<P extends ManagedDialogProps>(
id,
component: component as ManagedDialogComponent,
props: props as PropsSource<Record<string, unknown>>,
- owner: options.owner,
+ owner: options.owner ?? undefined,
isOpen,
setOpen,
finalized: false,
diff --git a/apps/web/src/components/ui/index.ts b/apps/web/src/components/ui/index.ts
index f9a2fdafc3..7583602375 100644
--- a/apps/web/src/components/ui/index.ts
+++ b/apps/web/src/components/ui/index.ts
@@ -45,6 +45,8 @@ export type {
ConfirmDialogProps,
} from './components/ConfirmDialog';
export { ConfirmDialog, confirmDialog } from './components/ConfirmDialog';
+export type { DeleteDialogProps } from './components/DeleteDialog';
+export { DeleteDialog } from './components/DeleteDialog';
export type { DialogProps } from './components/Dialog';
export { Dialog } from './components/Dialog';
export { Dropdown } from './components/Dropdown';
diff --git a/apps/web/src/features/calendar/CalendarPage.tsx b/apps/web/src/features/calendar/CalendarPage.tsx
index 5d9dc47775..2d9f534084 100644
--- a/apps/web/src/features/calendar/CalendarPage.tsx
+++ b/apps/web/src/features/calendar/CalendarPage.tsx
@@ -1,4 +1,3 @@
-import { useSplitLayout } from '@components/app/split-layout/layout';
import { toast } from '@core/component/Toast/Toast';
import { ScrollIndicators } from '@core/component/VerticalScrollIndicators';
import { useUserId } from '@core/context/user';
@@ -62,6 +61,7 @@ import {
multiDaySelectionRenderingPlugin,
} from './events/multi-day-selection-rendering';
import type { CalendarTimeFormat } from './events/types';
+import { useOpenEventComposer } from './events/useOpenEventComposer';
import { FullCalendar, useFullCalendar } from './fullcalendar-solid';
import {
CALENDAR_TIME_FORMAT_OPTIONS,
@@ -327,7 +327,7 @@ function createCalendarPageData(
export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {
const pager = useCalendarPager();
const calendarView = useCalendarView();
- const { popoverSplit } = useSplitLayout();
+ const openEventComposer = useOpenEventComposer();
const calendarsQuery = useVisibleCalendarsQuery();
const firstWritableCalendar = createMemo(() =>
calendarsQuery.data?.find((calendar) => calendar.isWritable)
@@ -382,20 +382,16 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {
if (!isActive()) return;
const calendar = firstWritableCalendar();
setSelectionColor(calendar?.color ?? DEFAULT_CALENDAR_SOURCE.color);
- popoverSplit({
- type: 'component',
- id: 'calendar-event-compose',
- params: {
- initialValues: {
- ...calendarSelectionToEditorInitialValues(selection),
- ...(calendar ? { calendarId: calendar.id } : {}),
- },
- onCalendarChange: (_calendarId: string, color: string) =>
- setSelectionColor(color),
- onClose: () => {
- selection.view.calendar.unselect();
- setSelectionColor(undefined);
- },
+ openEventComposer({
+ initialValues: {
+ ...calendarSelectionToEditorInitialValues(selection),
+ ...(calendar ? { calendarId: calendar.id } : {}),
+ },
+ onCalendarChange: (_calendarId: string, color: string) =>
+ setSelectionColor(color),
+ onClose: () => {
+ selection.view.calendar.unselect();
+ setSelectionColor(undefined);
},
});
};
diff --git a/apps/web/src/features/calendar/calendar-view.tsx b/apps/web/src/features/calendar/calendar-view.tsx
index b052d23c3f..4eee00fd49 100644
--- a/apps/web/src/features/calendar/calendar-view.tsx
+++ b/apps/web/src/features/calendar/calendar-view.tsx
@@ -4,7 +4,6 @@ import {
SplitHeaderLeft,
SplitHeaderRight,
} from '@components/app/split-layout/components/SplitHeader';
-import { useSplitLayout } from '@components/app/split-layout/layout';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { TOKENS } from '@core/hotkey/tokens';
import { isMobile } from '@core/mobile/isMobile';
@@ -42,6 +41,7 @@ import {
useCalendarView,
} from './CalendarViewContext';
import { SelectedEventDetails } from './events/EventDetailsPopover';
+import { useOpenEventComposer } from './events/useOpenEventComposer';
import { useCalendarHotkeys } from './use-calendar-hotkeys';
import './calendar.css';
@@ -175,7 +175,7 @@ function CalendarWorkspace() {
const calendarPager = useCalendarPager();
const pager = usePager<CalendarPageId>();
const calendarView = useCalendarView();
- const { popoverSplit } = useSplitLayout();
+ const openEventComposer = useOpenEventComposer();
const initialDate = new Date();
const today = createLocalToday();
@@ -266,12 +266,7 @@ function CalendarWorkspace() {
size="sm"
class="rounded-lg px-2"
label="New event"
- onClick={() =>
- popoverSplit({
- type: 'component',
- id: 'calendar-event-compose',
- })
- }
+ onClick={() => openEventComposer()}
>
<PlusIcon class="size-3.5" />
New event
diff --git a/apps/web/src/features/calendar/events/EventComposer.tsx b/apps/web/src/features/calendar/events/EventComposer.tsx
index 9245bff569..aa6eab86f6 100644
--- a/apps/web/src/features/calendar/events/EventComposer.tsx
+++ b/apps/web/src/features/calendar/events/EventComposer.tsx
@@ -1,5 +1,6 @@
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
-import { onCleanup, onMount } from 'solid-js';
+import { useHotkeyDOMScope } from '@core/hotkey/hotkeys';
+import { onMount } from 'solid-js';
import { EventComposerForm } from './EventComposerForm';
import type { EventEditorInitialValues } from './EventEditorForm';
import type { CalendarEvent } from './types';
@@ -10,13 +11,17 @@ export function EventComposer(props: {
event?: CalendarEvent;
initialValues?: EventEditorInitialValues;
onCalendarChange?: (calendarId: string, color: string) => void;
- onClose?: () => void;
+ onSaveSuccess?: () => void;
}) {
const panel = useSplitPanelOrThrow();
+ const [attachHotkeys] = useHotkeyDOMScope('event-composer', true);
const close = () => panel.handle.close();
const editor = useEventEditor({
event: () => props.event,
- onSaved: close,
+ onSaved: () => {
+ props.onSaveSuccess?.();
+ close();
+ },
});
const isEdit = () => props.event !== undefined;
@@ -24,10 +29,12 @@ export function EventComposer(props: {
onMount(() =>
panel.handle.setDisplayName(isEdit() ? 'Edit event' : 'New event')
);
- onCleanup(() => props.onClose?.());
return (
- <div class="portal-scope flex h-full min-h-0 flex-col p-4 text-ink">
+ <div
+ ref={attachHotkeys}
+ class="portal-scope flex h-full min-h-0 flex-col p-4 text-ink"
+ >
<EventComposerForm
initialValues={editor.initialValues() ?? props.initialValues}
isEdit={isEdit()}
diff --git a/apps/web/src/features/calendar/events/EventDetailsPopover.tsx b/apps/web/src/features/calendar/events/EventDetailsPopover.tsx
index 17974ba3f7..83658641d9 100644
--- a/apps/web/src/features/calendar/events/EventDetailsPopover.tsx
+++ b/apps/web/src/features/calendar/events/EventDetailsPopover.tsx
@@ -1,19 +1,24 @@
import { MobileDrawer } from '@components/app/mobile/MobileDrawer';
-import { useSplitLayout } from '@components/app/split-layout/layout';
import { toast } from '@core/component/Toast/Toast';
import { isMobile } from '@core/mobile/isMobile';
import { Popover } from '@kobalte/core/popover';
import PencilSimpleIcon from '@phosphor/pencil-simple.svg';
-import SpinnerIcon from '@phosphor/spinner.svg';
import TrashIcon from '@phosphor/trash.svg';
import CloseIcon from '@phosphor/x.svg';
import { useDeleteCalendarEventMutation } from '@queries/calendar/mutations';
import type { CalendarDeletionScope } from '@service-email/client';
-import { Button, Dialog, Layer, Panel } from '@ui';
+import {
+ Button,
+ DeleteDialog,
+ Layer,
+ type ManagedDialogProps,
+ useImperativeDialog,
+} from '@ui';
import { type Accessor, createMemo, createSignal, Show } from 'solid-js';
import { EventAttendeesSection, EventDetails } from './EventDetails';
import { EventRsvpSection } from './EventRsvpSection';
import type { CalendarEvent, CalendarTimeFormat } from './types';
+import { useOpenEventComposer } from './useOpenEventComposer';
interface SelectedEventDetailsProps {
anchor: Accessor<HTMLElement | undefined>;
@@ -96,98 +101,81 @@ interface EventDetailsOverlayProps {
}
function EventDetailsDrawer(props: EventDetailsOverlayProps) {
- const { popoverSplit } = useSplitLayout();
- const [deleteOpen, setDeleteOpen] = createSignal(false);
+ const openEventComposer = useOpenEventComposer();
+ const deleteDialog = useDeleteEventDialog({
+ event: () => props.event,
+ onDeleted: () => props.onOpenChange(false),
+ });
const canModify = () => !props.event.isReadOnly && !props.event.isCancelled;
const openEditor = () => {
- popoverSplit({
- type: 'component',
- id: 'calendar-event-compose',
- params: { event: props.event },
- });
+ openEventComposer({ event: props.event });
props.onOpenChange(false);
};
return (
- <>
- <MobileDrawer
- side="bottom"
- open
- onOpenChange={(open) => {
- if (!open && deleteOpen()) return;
- props.onOpenChange(open);
- }}
- preventScroll={false}
- preventScrollbarShift={false}
- >
- <MobileDrawer.Portal>
- <MobileDrawer.Overlay class="fixed inset-0 z-modal-overlay bg-modal-overlay pattern-diagonal-4 pattern-edge-muted" />
- <MobileDrawer.Content
- aria-label={props.event.title}
- class="overflow-hidden"
- >
- <MobileDrawer.Handle class="pointer-events-none absolute inset-x-0 top-0 z-1" />
- <div class="flex shrink-0 items-center justify-between px-2 pb-3 pt-2">
- <MobileDrawer.Close
- as={Button}
- aria-label="Close event details"
- variant="ghost"
- size="icon-md"
- depth={3}
- class="rounded-md text-ink-extra-muted [&_svg]:size-4"
- >
- <CloseIcon />
- </MobileDrawer.Close>
- <Show when={canModify()}>
- <div class="flex items-center gap-1">
- <Button
- aria-label="Edit event"
- variant="ghost"
- size="icon-md"
- depth={3}
- class="rounded-md text-ink-extra-muted [&_svg]:size-4"
- onClick={openEditor}
- >
- <PencilSimpleIcon />
- </Button>
- <Button
- aria-label="Delete event"
- variant="ghost"
- size="icon-md"
- depth={3}
- class="rounded-md text-ink-extra-muted [&_svg]:size-4"
- onClick={() => setDeleteOpen(true)}
- >
- <TrashIcon />
- </Button>
- </div>
- </Show>
- </div>
- <div class="flex min-h-0 flex-1 flex-col overflow-y-auto">
- <div class="px-3">
- <EventDetails
- event={props.event}
- timeFormat={props.timeFormat}
- />
+ <MobileDrawer
+ side="bottom"
+ open
+ onOpenChange={(open) => {
+ if (!open && deleteDialog.isOpen()) return;
+ props.onOpenChange(open);
+ }}
+ preventScroll={false}
+ preventScrollbarShift={false}
+ >
+ <MobileDrawer.Portal>
+ <MobileDrawer.Overlay class="fixed inset-0 z-modal-overlay bg-modal-overlay pattern-diagonal-4 pattern-edge-muted" />
+ <MobileDrawer.Content
+ aria-label={props.event.title}
+ class="overflow-hidden"
+ >
+ <MobileDrawer.Handle class="pointer-events-none absolute inset-x-0 top-0 z-1" />
+ <div class="flex shrink-0 items-center justify-between px-2 pb-3 pt-2">
+ <MobileDrawer.Close
+ as={Button}
+ aria-label="Close event details"
+ variant="ghost"
+ size="icon-md"
+ depth={3}
+ class="rounded-md text-ink-extra-muted [&_svg]:size-4"
+ >
+ <CloseIcon />
+ </MobileDrawer.Close>
+ <Show when={canModify()}>
+ <div class="flex items-center gap-1">
+ <Button
+ aria-label="Edit event"
+ variant="ghost"
+ size="icon-md"
+ depth={3}
+ class="rounded-md text-ink-extra-muted [&_svg]:size-4"
+ onClick={openEditor}
+ >
+ <PencilSimpleIcon />
+ </Button>
+ <Button
+ aria-label="Delete event"
+ variant="ghost"
+ size="icon-md"
+ depth={3}
+ class="rounded-md text-ink-extra-muted [&_svg]:size-4"
+ onClick={deleteDialog.open}
+ >
+ <TrashIcon />
+ </Button>
</div>
- <EventAttendeesSection attendees={props.event.attendees} />
- <EventRsvpSection event={props.event} buttonSize="md" />
+ </Show>
+ </div>
+ <div class="flex min-h-0 flex-1 flex-col overflow-y-auto">
+ <div class="px-3">
+ <EventDetails event={props.event} timeFormat={props.timeFormat} />
</div>
- </MobileDrawer.Content>
- </MobileDrawer.Portal>
- </MobileDrawer>
- <Show when={deleteOpen()}>
- <DeleteEventDialog
- open
- event={props.event}
- onClose={() => setDeleteOpen(false)}
- onDeleted={() => {
- setDeleteOpen(false);
- props.onOpenChange(false);
- }}
- />
- </Show>
- </>
+ <EventAttendeesSection attendees={props.event.attendees} />
+ <EventRsvpSection event={props.event} buttonSize="md" />
+ </div>
+ </MobileDrawer.Content>
+ </MobileDrawer.Portal>
+ </MobileDrawer>
);
}
@@ -195,12 +183,30 @@ interface EventDetailsPopoverProps extends EventDetailsOverlayProps {
anchor: HTMLElement;
}
-function DeleteEventDialog(props: {
- open: boolean;
- event: CalendarEvent;
- onClose: () => void;
+function useDeleteEventDialog(props: {
+ event: Accessor<CalendarEvent>;
onDeleted: () => void;
}) {
+ const dialog = useImperativeDialog(DeleteEventDialog);
+
+ const open = () =>
+ dialog.open({
+ event: props.event(),
+ onDeleted: () => {
+ dialog.close();
+ props.onDeleted();
+ },
+ });
+
+ return { open, isOpen: dialog.isOpen };
+}
+
+function DeleteEventDialog(
+ props: ManagedDialogProps & {
+ event: CalendarEvent;
+ onDeleted: () => void;
+ }
+) {
const isRecurring = () =>
props.event.recurrenceLines.length > 0 ||
props.event.recurrenceId !== undefined;
@@ -226,223 +232,169 @@ function DeleteEventDialog(props: {
};
return (
- <Dialog
+ <DeleteDialog
open={props.open}
- onOpenChange={(open) =>
- !open && !deleteEvent.isPending && props.onClose()
- }
+ onOpenChange={props.onOpenChange}
+ title="Delete event"
+ pending={deleteEvent.isPending}
+ onDelete={confirm}
>
- <Panel depth={2} class="max-w-[calc(100vw-2rem)] rounded-xl text-ink">
- <Panel.Header class="gap-1 px-2">
- <Dialog.CloseButton
- as={Button}
- variant="ghost"
- size="icon-sm"
- disabled={deleteEvent.isPending}
- >
- <CloseIcon />
- </Dialog.CloseButton>
- <Dialog.Title as="span" class="m-0 p-0 text-sm font-medium">
- Delete event
- </Dialog.Title>
- </Panel.Header>
- <Panel.Body class="flex flex-col gap-3 p-3">
- <Show
- when={isRecurring()}
- fallback={
- <p class="max-w-80 text-sm text-ink-muted">
- Delete “{props.event.title || 'Untitled event'}”? Guests will be
- notified.
- </p>
- }
- >
- <div class="flex max-w-80 flex-col gap-2 text-sm text-ink-muted">
- <p>
- Remove “{props.event.title || 'Untitled event'}”? Guests will be
- notified.
- </p>
- <label class="flex items-center gap-2">
- <input
- type="radio"
- name="delete-scope"
- checked={scope() === 'this_event'}
- onChange={() => setScope('this_event')}
- />
- This event
- </label>
- <label class="flex items-center gap-2">
- <input
- type="radio"
- name="delete-scope"
- checked={scope() === 'this_and_following'}
- onChange={() => setScope('this_and_following')}
- />
- This and following events
- </label>
- <label class="flex items-center gap-2">
- <input
- type="radio"
- name="delete-scope"
- checked={scope() === 'all'}
- onChange={() => setScope('all')}
- />
- All events
- </label>
- </div>
- </Show>
- <div class="flex justify-end gap-1 pt-2">
- <Button
- variant="ghost"
- class="rounded-lg"
- disabled={deleteEvent.isPending}
- label="Cancel"
- onClick={props.onClose}
- >
- Cancel
- </Button>
- <Button
- variant="active"
- class="rounded-lg"
- disabled={deleteEvent.isPending}
- label="Delete"
- onClick={confirm}
- >
- <Show when={deleteEvent.isPending} fallback="Delete">
- <SpinnerIcon class="size-4 animate-spin" />
- </Show>
- </Button>
- </div>
- </Panel.Body>
- </Panel>
- </Dialog>
+ <Show
+ when={isRecurring()}
+ fallback={
+ <p>
+ Delete “{props.event.title || 'Untitled event'}”? Guests will be
+ notified.
+ </p>
+ }
+ >
+ <div class="flex flex-col gap-2">
+ <p>
+ Remove “{props.event.title || 'Untitled event'}”? Guests will be
+ notified.
+ </p>
+ <label class="flex items-center gap-2">
+ <input
+ type="radio"
+ name="delete-scope"
+ checked={scope() === 'this_event'}
+ onChange={() => setScope('this_event')}
+ />
+ This event
+ </label>
+ <label class="flex items-center gap-2">
+ <input
+ type="radio"
+ name="delete-scope"
+ checked={scope() === 'this_and_following'}
+ onChange={() => setScope('this_and_following')}
+ />
+ This and following events
+ </label>
+ <label class="flex items-center gap-2">
+ <input
+ type="radio"
+ name="delete-scope"
+ checked={scope() === 'all'}
+ onChange={() => setScope('all')}
+ />
+ All events
+ </label>
+ </div>
+ </Show>
+ </DeleteDialog>
);
}
/** Anchors event details and actions to a rendered calendar event. */
function EventDetailsPopover(props: EventDetailsPopoverProps) {
- const { popoverSplit } = useSplitLayout();
- const [deleteOpen, setDeleteOpen] = createSignal(false);
+ const openEventComposer = useOpenEventComposer();
+ const deleteDialog = useDeleteEventDialog({
+ event: () => props.event,
+ onDeleted: () => props.onOpenChange(false),
+ });
const canModify = () => !props.event.isReadOnly && !props.event.isCancelled;
const openEditor = () => {
- popoverSplit({
- type: 'component',
- id: 'calendar-event-compose',
- params: { event: props.event },
- });
+ openEventComposer({ event: props.event });
props.onOpenChange(false);
};
return (
- <>
- <Popover
- anchorRef={() => props.anchor}
- open
- onOpenChange={(open) => {
- // Keep the popover mounted while its delete dialog is open.
- if (!open && deleteOpen()) return;
- props.onOpenChange(open);
- }}
- placement="right-start"
- gutter={8}
- flip
- slide
- >
- <Popover.Portal>
- <Layer depth={3}>
- <Popover.Content
- class="portal-scope z-modal max-w-[calc(100vw-2rem)] outline-none"
- onInteractOutside={(event) => {
- // FullCalendar selects on click (pointer release), so dismissing on
- // pointer down would briefly close the popover before reopening it.
- const target = event.detail.originalEvent.target;
- if (
- target instanceof Element &&
- target.closest('.fc-event') !== null
- ) {
- event.preventDefault();
- }
- }}
- onFocusOutside={(event) => {
- // Deep links open this popover while their freshly-opened
- // split is still claiming focus; that focus movement lands
- // outside the popover and would dismiss it on arrival. Focus
- // alone never closes the details — pointer interaction
- // outside or Escape still does.
- event.preventDefault();
- }}
- onCloseAutoFocus={(event) => {
- const shouldRestoreFocus = !event.defaultPrevented;
+ <Popover
+ anchorRef={() => props.anchor}
+ open
+ onOpenChange={(open) => {
+ // Keep the popover mounted while its delete dialog is open.
+ if (!open && deleteDialog.isOpen()) return;
+ props.onOpenChange(open);
+ }}
+ placement="right-start"
+ gutter={8}
+ flip
+ slide
+ >
+ <Popover.Portal>
+ <Layer depth={3}>
+ <Popover.Content
+ class="portal-scope z-modal max-w-[calc(100vw-2rem)] outline-none"
+ onInteractOutside={(event) => {
+ // FullCalendar selects on click (pointer release), so dismissing on
+ // pointer down would briefly close the popover before reopening it.
+ const target = event.detail.originalEvent.target;
+ if (
+ target instanceof Element &&
+ target.closest('.fc-event') !== null
+ ) {
event.preventDefault();
- if (shouldRestoreFocus && props.anchor.isConnected) {
- props.anchor.focus();
- }
- }}
- >
- <Popover.Arrow class="fill-surface" />
- <div class="w-fit min-w-[min(20rem,calc(100vw-2rem))] max-w-[min(24rem,calc(100vw-2rem))] overflow-hidden rounded-xl bg-surface text-ink shadow-menu ring ring-edge-muted">
- <Popover.Title class="sr-only">
- {props.event.title}
- </Popover.Title>
- <div class="flex items-center justify-end gap-1 px-2 pt-2">
- <Show when={canModify()}>
- <Button
- aria-label="Edit event"
- variant="ghost"
- size="icon-sm"
- depth={3}
- class="rounded-md text-ink-muted [&_svg]:size-4"
- onClick={openEditor}
- >
- <PencilSimpleIcon />
- </Button>
- <Button
- aria-label="Delete event"
- variant="ghost"
- size="icon-sm"
- depth={3}
- class="rounded-md text-ink-muted [&_svg]:size-4"
- onClick={() => setDeleteOpen(true)}
- >
- <TrashIcon />
- </Button>
- </Show>
- <Popover.CloseButton
- as={Button}
- aria-label="Close event details"
+ }
+ }}
+ onFocusOutside={(event) => {
+ // Deep links open this popover while their freshly-opened
+ // split is still claiming focus; that focus movement lands
+ // outside the popover and would dismiss it on arrival. Focus
+ // alone never closes the details — pointer interaction
+ // outside or Escape still does.
+ event.preventDefault();
+ }}
+ onCloseAutoFocus={(event) => {
+ const shouldRestoreFocus = !event.defaultPrevented;
+ event.preventDefault();
+ if (shouldRestoreFocus && props.anchor.isConnected) {
+ props.anchor.focus();
+ }
+ }}
+ >
+ <Popover.Arrow class="fill-surface" />
+ <div class="w-fit min-w-[min(20rem,calc(100vw-2rem))] max-w-[min(24rem,calc(100vw-2rem))] overflow-hidden rounded-xl bg-surface text-ink shadow-menu ring ring-edge-muted">
+ <Popover.Title class="sr-only">{props.event.title}</Popover.Title>
+ <div class="flex items-center justify-end gap-1 px-2 pt-2">
+ <Show when={canModify()}>
+ <Button
+ aria-label="Edit event"
variant="ghost"
size="icon-sm"
depth={3}
class="rounded-md text-ink-muted [&_svg]:size-4"
+ onClick={openEditor}
>
- <CloseIcon />
- </Popover.CloseButton>
- </div>
- <div>
- <div class="px-3 pb-3">
- <EventDetails
- event={props.event}
- timeFormat={props.timeFormat}
- />
- </div>
- <EventAttendeesSection attendees={props.event.attendees} />
- <EventRsvpSection event={props.event} />
+ <PencilSimpleIcon />
+ </Button>
+ <Button
+ aria-label="Delete event"
+ variant="ghost"
+ size="icon-sm"
+ depth={3}
+ class="rounded-md text-ink-muted [&_svg]:size-4"
+ onClick={deleteDialog.open}
+ >
+ <TrashIcon />
+ </Button>
+ </Show>
+ <Popover.CloseButton
+ as={Button}
+ aria-label="Close event details"
+ variant="ghost"
+ size="icon-sm"
+ depth={3}
+ class="rounded-md text-ink-muted [&_svg]:size-4"
+ >
+ <CloseIcon />
+ </Popover.CloseButton>
+ </div>
+ <div>
+ <div class="px-3 pb-3">
+ <EventDetails
+ event={props.event}
+ timeFormat={props.timeFormat}
+ />
</div>
+ <EventAttendeesSection attendees={props.event.attendees} />
+ <EventRsvpSection event={props.event} />
</div>
- </Popover.Content>
- </Layer>
- </Popover.Portal>
- </Popover>
- <Show when={deleteOpen()}>
- <DeleteEventDialog
- open
- event={props.event}
- onClose={() => setDeleteOpen(false)}
- onDeleted={() => {
- setDeleteOpen(false);
- props.onOpenChange(false);
- }}
- />
- </Show>
- </>
+ </div>
+ </Popover.Content>
+ </Layer>
+ </Popover.Portal>
+ </Popover>
);
}
diff --git a/apps/web/src/features/calendar/events/useOpenEventComposer.ts b/apps/web/src/features/calendar/events/useOpenEventComposer.ts
new file mode 100644
index 0000000000..46b8be770a
--- /dev/null
+++ b/apps/web/src/features/calendar/events/useOpenEventComposer.ts
@@ -0,0 +1,66 @@
+import { useSplitLayout } from '@components/app/split-layout/layout';
+import { confirmDialog } from '@ui';
+import { getOwner } from 'solid-js';
+import type { EventEditorInitialValues } from './EventEditorForm';
+import type { CalendarEvent } from './types';
+
+/** Values and lifecycle callbacks used to open an event composer. */
+export interface OpenEventComposerOptions {
+ event?: CalendarEvent;
+ initialValues?: EventEditorInitialValues;
+ onCalendarChange?: (calendarId: string, color: string) => void;
+ onClose?: () => void;
+}
+
+/** Opens an event composer with confirmation before discarding a new event. */
+export function useOpenEventComposer() {
+ const { popoverSplit } = useSplitLayout();
+ const owner = getOwner();
+
+ return (options: OpenEventComposerOptions = {}) => {
+ let eventSaved = false;
+ let closeConfirmationPending = false;
+
+ return popoverSplit(
+ {
+ type: 'component',
+ id: 'calendar-event-compose',
+ params: {
+ event: options.event,
+ initialValues: options.initialValues,
+ onCalendarChange: options.onCalendarChange,
+ onSaveSuccess: () => {
+ eventSaved = true;
+ },
+ },
+ },
+ {
+ onClose: async (close) => {
+ if (closeConfirmationPending) return;
+
+ if (!eventSaved) {
+ closeConfirmationPending = true;
+ try {
+ const confirmed = await confirmDialog(
+ {
+ title: 'You still have remaining changes',
+ body: 'Closing this event will discard your changes.',
+ confirmLabel: 'Discard',
+ cancelLabel: 'Keep editing',
+ tone: 'danger',
+ },
+ { owner }
+ );
+ if (!confirmed) return;
+ } finally {
+ closeConfirmationPending = false;
+ }
+ }
+
+ options.onClose?.();
+ close();
+ },
+ }
+ );
+ };
+}
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 20bc20e817..2ee3505687 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -142,7 +142,7 @@ body.tauri-ios {
--color-surface: var(--b0);
--color-drop-shadow: oklch(0.15 0 0 / 0.04);
- --color-overlay: oklch(0 0 0 / 0.05);
+ --color-overlay: oklch(0 0 0 / 0.25);
--color-edge-muted: var(--b3);
--color-edge: var(--b4);