fix(web): handle calendar event keyboard bugs

Author: Uarmagan

packages/web/src/common/calendar-grid/components/CalendarAllDayEventCard.tsx

@@ -126,6 +126,7 @@ const CalendarAllDayEventCardBase = (
         }
 
         e.preventDefault();
+        e.stopPropagation();
         if (isPending) {
           return;
         }

packages/web/src/common/calendar-grid/components/CalendarEventCard.test.tsx

@@ -109,6 +109,29 @@ describe("CalendarEventCard", () => {
     expect(onEventKeyDown).not.toHaveBeenCalled();
   });
 
+  it("keeps timed event keyboard activation from reaching parent shortcuts", () => {
+    const onEventKeyDown = mock();
+    const onParentKeyDown = mock();
+
+    render(
+      // biome-ignore lint/a11y/noStaticElementInteractions: test wrapper simulates a parent shortcut listener.
+      <div onKeyDown={onParentKeyDown}>
+        <CalendarTimedEventCard
+          displayMode="saved"
+          event={createEvent()}
+          motionMode="idle"
+          onEventKeyDown={onEventKeyDown}
+          position={position}
+        />
+      </div>,
+    );
+
+    fireEvent.keyDown(screen.getByRole("button"), { key: "Enter" });
+
+    expect(onEventKeyDown).toHaveBeenCalledTimes(1);
+    expect(onParentKeyDown).not.toHaveBeenCalled();
+  });
+
   it("renders all-day event details, interaction attributes, acknowledgement animation, and resize handles", () => {
     const onEventMouseDown = mock();
     const onScalerMouseDown = mock();
@@ -181,4 +204,29 @@ describe("CalendarEventCard", () => {
 
     expect(onEventKeyDown).not.toHaveBeenCalled();
   });
+
+  it("keeps all-day event keyboard activation from reaching parent shortcuts", () => {
+    const onEventKeyDown = mock();
+    const onParentKeyDown = mock();
+
+    render(
+      // biome-ignore lint/a11y/noStaticElementInteractions: test wrapper simulates a parent shortcut listener.
+      <div onKeyDown={onParentKeyDown}>
+        <CalendarAllDayEventCard
+          event={createEvent({
+            isAllDay: true,
+            title: "Conference",
+          })}
+          isPlaceholder={false}
+          onEventKeyDown={onEventKeyDown}
+          position={position}
+        />
+      </div>,
+    );
+
+    fireEvent.keyDown(screen.getByRole("button"), { key: "Enter" });
+
+    expect(onEventKeyDown).toHaveBeenCalledTimes(1);
+    expect(onParentKeyDown).not.toHaveBeenCalled();
+  });
 });

packages/web/src/common/calendar-grid/components/CalendarTimedEventCard.tsx

@@ -218,6 +218,7 @@ const CalendarTimedEventCardBase = (
         }
 
         e.preventDefault();
+        e.stopPropagation();
         if (isPending || !onEventKeyDown) {
           return;
         }

packages/web/src/views/Week/components/Draft/hooks/state/useDraftConfirmation.test.tsx

@@ -0,0 +1,107 @@
+import { act, renderHook } from "@testing-library/react";
+import { Origin, Priorities } from "@core/constants/core.constants";
+import { RecurringEventUpdateScope } from "@core/types/event.types";
+import { type Schema_GridEvent } from "@web/common/types/web.event.types";
+import { useDraftConfirmation } from "./useDraftConfirmation";
+import { describe, expect, it, mock } from "bun:test";
+
+const createDraft = (
+  overrides: Partial<Schema_GridEvent> = {},
+): Schema_GridEvent => ({
+  _id: "event-1",
+  title: "Seed event",
+  startDate: "2026-05-31T10:00:00.000Z",
+  endDate: "2026-05-31T11:00:00.000Z",
+  isAllDay: false,
+  isSomeday: false,
+  origin: Origin.COMPASS,
+  priority: Priorities.UNASSIGNED,
+  user: "user-1",
+  position: {
+    isOverlapping: false,
+    totalEventsInGroup: 1,
+    widthMultiplier: 1,
+    horizontalOrder: 1,
+    dragOffset: { x: 0, y: 0 },
+    initialX: null,
+    initialY: null,
+  },
+  ...overrides,
+});
+
+const renderDraftConfirmation = ({
+  draft = createDraft(),
+  isInstance = false,
+  isRecurrence = false,
+  isSomeday = false,
+}: {
+  draft?: Schema_GridEvent;
+  isInstance?: boolean;
+  isRecurrence?: boolean;
+  isSomeday?: boolean;
+} = {}) => {
+  const discard = mock();
+  const deleteEvent = mock();
+  const submit = mock();
+
+  const context = {
+    actions: {
+      discard,
+      deleteEvent,
+      isInstance: () => isInstance,
+      isRecurrence: () => isRecurrence,
+      isSomeday: () => isSomeday,
+      submit,
+    },
+    state: {
+      draft,
+    },
+  } as unknown as Parameters<typeof useDraftConfirmation>[0];
+
+  const { result } = renderHook(() => useDraftConfirmation(context));
+
+  return { deleteEvent, discard, result, submit };
+};
+
+describe("useDraftConfirmation", () => {
+  it("submits a new recurring draft without opening the update scope dialog", async () => {
+    const draft = createDraft({
+      _id: undefined,
+      recurrence: {
+        rule: ["FREQ=WEEKLY;COUNT=4"],
+      },
+    });
+    const { discard, result, submit } = renderDraftConfirmation({ draft });
+
+    await act(async () => {
+      await result.current.onSubmit(draft);
+    });
+
+    expect(result.current.isRecurrenceUpdateScopeDialogOpen).toBe(false);
+    expect(result.current.finalDraft).toBeNull();
+    expect(submit).toHaveBeenCalledTimes(1);
+    expect(submit).toHaveBeenCalledWith(
+      draft,
+      RecurringEventUpdateScope.THIS_EVENT,
+    );
+    expect(discard).toHaveBeenCalledTimes(1);
+  });
+
+  it("opens the update scope dialog for existing recurring drafts", async () => {
+    const draft = createDraft({
+      recurrence: {
+        rule: ["FREQ=WEEKLY;COUNT=4"],
+      },
+    });
+    const { discard, result, submit } = renderDraftConfirmation({ draft });
+
+    await act(async () => {
+      await result.current.onSubmit(draft);
+    });
+
+    expect(result.current.isRecurrenceUpdateScopeDialogOpen).toBe(true);
+    expect(result.current.finalDraft).toBe(draft);
+    expect(submit).not.toHaveBeenCalled();
+    expect(discard).not.toHaveBeenCalled();
+  });
+});

packages/web/src/views/Week/components/Draft/hooks/state/useDraftConfirmation.ts

@@ -42,7 +42,9 @@ export const useDraftConfirmation = ({
         _draft.recurrence?.eventId ?? "",
       );
       const draftIsRecurring = Array.isArray(rule) || draftIsInstance;
-      const isRecurringEvent = isRecurrence() || draftIsRecurring;
+      const isExistingDraft = Boolean(_draft._id) || draftIsInstance;
+      const isRecurringEvent =
+        isExistingDraft && (isRecurrence() || draftIsRecurring);
       const instanceEvent = isInstance() || draftIsInstance;
       const toStandAlone = instanceEvent && rule === null;
       const applyTo = toStandAlone