* feat: add keyboard shortcuts and tooltips to booking slideover buttons Co-Authored-By: peer@cal.com <peer@cal.com> * fix: remove duplicate useBookingLocation import and fix import ordering - Removed duplicate import of useBookingLocation from non-existent @calcom/web/modules/bookings/hooks/useBookingLocation path - Fixed import ordering to satisfy biome organizeImports rules - Removed unnecessary code comment - Original feature by @PeerRich via Devin AI Co-Authored-By: unknown <> * use same style arrows for both button and remove bydefault focus from them * fix join button tooltip hover * fix: disable keyboard shortcuts when overlays/dialogs are open on BookingDetailsSheet Co-Authored-By: unknown <> * fix: use focus-based detection instead of selector-based overlay detection for keyboard shortcuts Co-Authored-By: unknown <> * fix: allow keyboard shortcuts when focus is on sheet ancestors Co-Authored-By: unknown <> * fix: use capture phase for keyboard handler to prevent Enter from activating focused buttons Co-Authored-By: unknown <> * fix: allow shortcuts when focus is on page elements outside any Radix portal Co-Authored-By: unknown <> * fix: handle calendar event clicks in onInteractOutside to prevent sheet close/reopen Co-Authored-By: unknown <> * fix: stop arrow key propagation to prevent Radix dropdown from opening during booking navigation Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: always stop arrow key propagation when sheet is active, even at first/last booking Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: extract keyboard handler into testable utility with tests Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: resolve type errors in keyboard handler config and test mocks Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * test: add e2e tests for booking sheet keyboard shortcuts Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: replace text= locators with data-testid selectors in e2e tests Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * made 3 fixes: Fix 1 — Stabilize handleNext/handlePrevious/handleClose with useCallback In BookingDetailsSheet.tsx, all three handler functions were plain arrow functions recreated on every render, causing the useEffect to tear down and re-attach the document keydown listener unnecessarily. Wrapped all three in useCallback with proper dependency arrays (the Zustand store functions they call). Fix 2 — data-booking-list-item verified (no change needed) Confirmed that data-booking-list-item is rendered on BookingListItem.tsx and data-booking-calendar-event is rendered on Event.tsx. The onInteractOutside handler in the final merged state correctly checks both selectors. No code change required. Fix 3 — Removed dead code from JoinMeetingButton Reverted JoinMeetingButton back to a plain function component: Removed forwardRef wrapping (no caller passes a ref) Removed showTooltip prop (unused — tooltip is handled by the parent BookingDetailsSheet) Removed ref prop from the inner Button Removed unused Tod forwardRef imports --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Dhairyashil <dhairyashil10101010@gmail.com> Co-authored-by: eunjae@cal.com <hey@eunjae.dev> Co-authored-by: Dhairyashil Shinde <93669429+dhairyashiil@users.noreply.github.com>
164 lines
6.0 KiB
TypeScript
164 lines
6.0 KiB
TypeScript
import dayjs from "@calcom/dayjs";
|
|
import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events";
|
|
import type { BookingStatus } from "@calcom/prisma/enums";
|
|
import classNames from "@calcom/ui/classNames";
|
|
import { Tooltip } from "@calcom/ui/components/tooltip";
|
|
import { cva } from "class-variance-authority";
|
|
|
|
type EventProps = {
|
|
event: CalendarEvent;
|
|
currentlySelectedEventId?: number;
|
|
eventDuration: number;
|
|
onEventClick?: (event: CalendarEvent) => void;
|
|
disabled?: boolean;
|
|
isHovered?: boolean;
|
|
};
|
|
|
|
const eventClasses = cva(
|
|
"group flex h-full w-full overflow-hidden rounded-[6px] px-[6px] text-xs leading-5 border-default font-medium",
|
|
{
|
|
variants: {
|
|
status: {
|
|
ACCEPTED: "bg-subtle hover:bg-emphasis text-emphasis border-[1px] border-default",
|
|
PENDING: "bg-subtle text-subtle border-[1px] border-dashed border-default",
|
|
REJECTED: "bg-subtle border-[1px] border-dashed text-subtle line-through",
|
|
CANCELLED: "bg-subtle border-[1px] border-dashed text-subtle line-through",
|
|
AWAITING_HOST: "bg-subtle text-emphasis border-[1px] border-dashed border-default",
|
|
},
|
|
disabled: {
|
|
true: "hover:cursor-default",
|
|
false: "hover:cursor-pointer",
|
|
},
|
|
selected: {
|
|
true: "",
|
|
false: "",
|
|
},
|
|
borderOnly: {
|
|
true: "bg-transparent border-[1.5px] border-subtle border-dashed opacity-60",
|
|
false: "",
|
|
},
|
|
},
|
|
}
|
|
);
|
|
|
|
const STATUS_COLOR_MAP: Record<BookingStatus, string> = {
|
|
ACCEPTED: "bg-green-500",
|
|
PENDING: "bg-orange-500",
|
|
REJECTED: "bg-red-500",
|
|
CANCELLED: "bg-red-500",
|
|
AWAITING_HOST: "bg-blue-500",
|
|
};
|
|
|
|
// Maps booking status to color classes for the color bar
|
|
// Follows the same pattern as BookingDetailsSheet badge variants
|
|
const getStatusColorClass = (status?: BookingStatus): string | undefined => {
|
|
if (!status) return undefined;
|
|
|
|
return STATUS_COLOR_MAP[status];
|
|
};
|
|
|
|
export function Event({
|
|
event,
|
|
currentlySelectedEventId,
|
|
eventDuration,
|
|
disabled,
|
|
onEventClick,
|
|
isHovered = false,
|
|
}: EventProps) {
|
|
const selected = currentlySelectedEventId === event.id;
|
|
const { options } = event;
|
|
|
|
// Use custom color if provided, otherwise derive from status
|
|
const colorClass = !options?.color ? getStatusColorClass(options?.status) : undefined;
|
|
|
|
const Component = onEventClick ? "button" : "div";
|
|
|
|
const dayOfWeek = dayjs(event.start).day();
|
|
const tooltipSide = dayOfWeek >= 1 && dayOfWeek <= 4 ? "right" : "left";
|
|
|
|
const tooltipContent = (
|
|
<div className="flex min-w-[200px] max-w-[300px] flex-col gap-1 py-1">
|
|
<div className="flex items-start gap-2">
|
|
{(options?.color || colorClass) && (
|
|
<div
|
|
className={classNames("mt-1 h-3 w-1 shrink-0 rounded-sm", colorClass)}
|
|
style={options?.color ? { backgroundColor: options.color } : undefined}></div>
|
|
)}
|
|
<div className="flex-1">
|
|
<div className="font-semibold leading-tight">{event.title}</div>
|
|
{!event.options?.hideTime && (
|
|
<div className="text-inverted-muted mt-1 text-xs">
|
|
{dayjs(event.start).format("HH:mm")} - {dayjs(event.end).format("HH:mm")}
|
|
</div>
|
|
)}
|
|
{event.description && (
|
|
<div className="text-inverted-muted mt-1 text-xs leading-snug">{event.description}</div>
|
|
)}
|
|
{options?.status && options.status !== "ACCEPTED" && (
|
|
<div className="text-inverted-muted mt-1 text-xs capitalize">
|
|
{options.status.toLowerCase().replace("_", " ")}
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
|
|
const displayType = eventDuration < 40 ? "single-line" : eventDuration < 45 ? "multi-line" : "full";
|
|
|
|
return (
|
|
<Tooltip content={tooltipContent} className="max-w-none" side={tooltipSide}>
|
|
<Component
|
|
data-booking-calendar-event="true"
|
|
onClick={() => onEventClick?.(event)}
|
|
{...(options?.bookingUid ? { "data-booking-uid": options.bookingUid } : {})}
|
|
className={classNames(
|
|
eventClasses({
|
|
status: options?.status,
|
|
disabled,
|
|
selected,
|
|
borderOnly: options?.borderOnly ?? false,
|
|
}),
|
|
options?.className,
|
|
(isHovered || selected) && "ring-brand-default shadow-lg ring-2 ring-offset-0"
|
|
)}
|
|
style={{
|
|
transition: "all 100ms ease-out",
|
|
}}>
|
|
{(options?.color || colorClass) && (
|
|
<div
|
|
className={classNames("-ml-1.5 mr-1.5 h-full w-[3px] shrink-0", colorClass)}
|
|
style={options?.color ? { backgroundColor: options.color } : undefined}></div>
|
|
)}
|
|
<div className={classNames("flex w-full", displayType !== "single-line" && "flex-col py-1")}>
|
|
{displayType === "single-line" && (
|
|
<div
|
|
className={classNames(
|
|
"flex w-full shrink-0 gap-2 overflow-hidden text-ellipsis whitespace-nowrap text-left leading-4",
|
|
"items-center"
|
|
)}>
|
|
<span>{event.title}</span>
|
|
{!event.options?.hideTime && (
|
|
<p className="text-subtle mt-1 w-full whitespace-nowrap text-left text-[10px] leading-none">
|
|
{dayjs(event.start).format("HH:mm")} - {dayjs(event.end).format("HH:mm")}
|
|
</p>
|
|
)}
|
|
</div>
|
|
)}
|
|
{displayType !== "single-line" && (
|
|
<p className={classNames("shrink-0 whitespace-nowrap text-left leading-4")}>{event.title}</p>
|
|
)}
|
|
{displayType !== "single-line" && !event.options?.hideTime && (
|
|
<p className="text-subtle mt-1 whitespace-nowrap text-left text-[10px] leading-none">
|
|
{dayjs(event.start).format("HH:mm")} - {dayjs(event.end).format("HH:mm")}
|
|
</p>
|
|
)}
|
|
{displayType === "full" && event.description && (
|
|
<p className="text-subtle mt-1 text-left text-[10px] leading-none">{event.description}</p>
|
|
)}
|
|
</div>
|
|
</Component>
|
|
</Tooltip>
|
|
);
|
|
}
|