* chore: add new view for two step slot selection for embed * fix: make sure two step slot selection is false by default * chore: update embed playground to showcase two step slot selection * chore: add tests * chore: update embed snippet generator code to include two step slot selection * chore: update docs * fix: back button styling * chore: implement feedback from cubic * fix: add missing isEnableTwoStepSlotSelectionVisible properties to test mock store Co-Authored-By: unknown <> * chore: implement PR feedback * chore: update slot selection modal * chore: add prop to hide available times header * fix: scope two-step slot selection visibility to mobile only Restores the isMobile check in the timeslot visibility guard to ensure desktop embeds continue to show the booking UI when two-step slot selection is enabled. The feature should only hide the timeslot list on mobile devices. Addresses Cubic AI review feedback (confidence 9/10). Co-Authored-By: unknown <> * fixup: use translations for loading instead of actual word * fix: type check * fix: add window.matchMedia mock for jsdom test environment Co-Authored-By: [email protected] <[email protected]> * fix: add window.matchMedia mock to packages/testing/src/setupVitest.ts Co-Authored-By: [email protected] <[email protected]> * fix: unit tests failing * add a width style to the two-step slot selection embed container. * refactor: rename enableTwoStepSlotSelection to useSlotsViewOnSmallScreen - Rename external-facing embed config option from enableTwoStepSlotSelection to useSlotsViewOnSmallScreen - Update URL parameter parsing in embed-iframe.ts - Update type definitions in types.ts and index.d.ts - Update internal variable names to slotsViewOnSmallScreen for consistency - Update documentation, playground examples, and tests Co-Authored-By: [email protected] <[email protected]> * Add config to prefill all booking fields so that slot has confirm button along with it * chore: implement PR feedback * fix: move twoStepSlotSelection embed outside misc-embeds div to fix e2e test The e2e test was failing because the misc-embeds div content was intercepting pointer events on mobile viewport. This follows the same pattern used for skeletonDemo - the embed is now outside misc-embeds and the div is hidden when testing this namespace. Co-Authored-By: [email protected] <[email protected]> * fix: prevent pointer event interception in twoStepSlotSelection embed Hide heading and note elements and set pointer-events: none on container elements while keeping pointer-events: auto on the iframe container. This prevents the container from intercepting clicks on the iframe during mobile viewport e2e tests. Co-Authored-By: [email protected] <[email protected]> * fix: hide all non-essential content for twoStepSlotSelection e2e test Co-Authored-By: [email protected] <[email protected]> * fix: disable pointer-events on body for twoStepSlotSelection e2e test Co-Authored-By: [email protected] <[email protected]> * fix: remove pointer-events: auto on container to let clicks pass through to iframe Co-Authored-By: [email protected] <[email protected]> * fix: explicitly set pointer-events: none on container and inline-embed-container Co-Authored-By: [email protected] <[email protected]> * fix: also set pointer-events: none on html element to prevent interception Co-Authored-By: [email protected] <[email protected]> * fix: make .place div fill viewport for twoStepSlotSelection e2e test Co-Authored-By: [email protected] <[email protected]> * fix: failing embed tests * fixup * fixup fixup * fix: failing tests * fix: update checks for verifying prefilled date --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Peer Richelsen <[email protected]> Co-authored-by: Hariom Balhara <[email protected]>
122 lines
4.3 KiB
TypeScript
122 lines
4.3 KiB
TypeScript
import { useEffect, useRef } from "react";
|
|
import { shallow } from "zustand/shallow";
|
|
|
|
import {
|
|
useEmbedType,
|
|
useEmbedUiConfig,
|
|
useIsEmbed,
|
|
} from "@calcom/embed-core/embed-iframe";
|
|
import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
|
|
import type { BookerEvent } from "@calcom/features/bookings/types";
|
|
import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
|
|
import type { BookerLayouts } from "@calcom/prisma/zod-utils";
|
|
import { defaultBookerLayoutSettings } from "@calcom/prisma/zod-utils";
|
|
import { useSlotsViewOnSmallScreen } from "@calcom/features/bookings/Booker/components/hooks/useSlotsViewOnSmallScreen";
|
|
|
|
import { extraDaysConfig } from "../../config";
|
|
import type { BookerLayout } from "../../types";
|
|
import { validateLayout } from "../../utils/layout";
|
|
import { getQueryParam } from "../../utils/query-param";
|
|
|
|
export type UseBookerLayoutType = ReturnType<typeof useBookerLayout>;
|
|
|
|
export const useBookerLayout = (
|
|
profileBookerLayouts:
|
|
| BookerEvent["profile"]["bookerLayouts"]
|
|
| undefined
|
|
| null
|
|
) => {
|
|
const [_layout, setLayout] = useBookerStoreContext(
|
|
(state) => [state.layout, state.setLayout],
|
|
shallow
|
|
);
|
|
const isEmbed = useIsEmbed();
|
|
const isMobile = useMediaQuery("(max-width: 768px)");
|
|
const isTablet = useMediaQuery("(max-width: 1024px)");
|
|
const embedUiConfig = useEmbedUiConfig();
|
|
// In Embed we give preference to embed configuration for the layout.If that's not set, we use the App configuration for the event layout
|
|
// But if it's mobile view, there is only one layout supported which is 'mobile'
|
|
const layout = isEmbed
|
|
? isMobile
|
|
? "mobile"
|
|
: validateLayout(embedUiConfig.layout) || _layout
|
|
: _layout;
|
|
const extraDays = isTablet
|
|
? extraDaysConfig[layout].tablet
|
|
: extraDaysConfig[layout].desktop;
|
|
const embedType = useEmbedType();
|
|
// Floating Button and Element Click both are modal and thus have dark background
|
|
const hasDarkBackground = isEmbed && embedType !== "inline";
|
|
const columnViewExtraDays = useRef<number>(
|
|
isTablet ? extraDaysConfig[layout].tablet : extraDaysConfig[layout].desktop
|
|
);
|
|
const bookerLayouts = profileBookerLayouts || defaultBookerLayoutSettings;
|
|
const defaultLayout = isEmbed
|
|
? validateLayout(embedUiConfig.layout) || bookerLayouts.defaultLayout
|
|
: bookerLayouts.defaultLayout;
|
|
|
|
useEffect(() => {
|
|
if (isMobile && layout !== "mobile") {
|
|
setLayout("mobile");
|
|
} else if (!isMobile && layout === "mobile") {
|
|
setLayout(defaultLayout);
|
|
}
|
|
}, [isMobile, setLayout, layout, defaultLayout]);
|
|
//setting layout from query param
|
|
useEffect(() => {
|
|
const layout = getQueryParam("layout") as BookerLayouts;
|
|
if (
|
|
!isMobile &&
|
|
!isEmbed &&
|
|
validateLayout(layout) &&
|
|
bookerLayouts?.enabledLayouts?.length &&
|
|
layout !== _layout
|
|
) {
|
|
const validLayout = bookerLayouts.enabledLayouts.find(
|
|
(userLayout) => userLayout === layout
|
|
);
|
|
if (validLayout) setLayout(validLayout);
|
|
}
|
|
}, [bookerLayouts, setLayout, _layout, isEmbed, isMobile]);
|
|
|
|
// In Embed, a Dialog doesn't look good, we disable it intentionally for the layouts that support showing Form without Dialog(i.e. no-dialog Form)
|
|
const shouldShowFormInDialogMap: Record<BookerLayout, boolean> = {
|
|
// mobile supports showing the Form without Dialog
|
|
mobile: !isEmbed,
|
|
// We don't show Dialog in month_view currently. Can be easily toggled though as it supports no-dialog Form
|
|
month_view: false,
|
|
// week_view doesn't support no-dialog Form
|
|
// When it's supported, disable it for embed
|
|
week_view: true,
|
|
// column_view doesn't support no-dialog Form
|
|
// When it's supported, disable it for embed
|
|
column_view: true,
|
|
};
|
|
|
|
const shouldShowFormInDialog = shouldShowFormInDialogMap[layout];
|
|
|
|
const hideEventTypeDetailsParam = getQueryParam("hideEventTypeDetails");
|
|
const hideEventTypeDetails = isEmbed
|
|
? embedUiConfig.hideEventTypeDetails
|
|
: typeof hideEventTypeDetailsParam === "string"
|
|
? hideEventTypeDetailsParam === "true"
|
|
: false;
|
|
|
|
const slotsViewOnSmallScreen = useSlotsViewOnSmallScreen();
|
|
|
|
return {
|
|
shouldShowFormInDialog,
|
|
hasDarkBackground,
|
|
extraDays,
|
|
columnViewExtraDays,
|
|
isMobile,
|
|
isEmbed,
|
|
isTablet,
|
|
layout,
|
|
defaultLayout,
|
|
hideEventTypeDetails,
|
|
slotsViewOnSmallScreen,
|
|
bookerLayouts,
|
|
};
|
|
};
|