Scheduling infrastructure for absolutely everyone.
fix: cal atoms schedule container class in availability settings custom class names not being applied (#21733)
Parteek malikcf83038a7aed
diff --git a/packages/features/schedules/components/Schedule.tsx b/packages/features/schedules/components/Schedule.tsxindex 0bf477d1914..8972cb67a98 100644--- a/packages/features/schedules/components/Schedule.tsx+++ b/packages/features/schedules/components/Schedule.tsx@@ -12,6 +12,7 @@ import type {import { Controller, useFieldArray, useFormContext } from "react-hook-form";import type { GroupBase, Props } from "react-select";+import type { scheduleClassNames } from "@calcom/atoms/availability/types";import type { ConfigType } from "@calcom/dayjs";import dayjs from "@calcom/dayjs";import { defaultDayRange as DEFAULT_DAY_RANGE } from "@calcom/lib/availability";@@ -19,13 +20,13 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";import { weekdayNames } from "@calcom/lib/weekday";import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";import type { TimeRange } from "@calcom/types/schedule";-import { Select } from "@calcom/ui/components/form";-import { SkeletonText } from "@calcom/ui/components/skeleton";+import cn from "@calcom/ui/classNames";import { Button } from "@calcom/ui/components/button";-import classNames from "@calcom/ui/classNames";import { Dropdown, DropdownMenuContent, DropdownMenuTrigger } from "@calcom/ui/components/dropdown";+import { Select } from "@calcom/ui/components/form";import { CheckboxField } from "@calcom/ui/components/form";import { Switch } from "@calcom/ui/components/form";+import { SkeletonText } from "@calcom/ui/components/skeleton";export type { TimeRange };@@ -47,7 +48,7 @@ export const ScheduleDay = <TFieldValues extends FieldValues>({disabled,labels,userTimeFormat,- className,+ classNames,}: {name: ArrayPath<TFieldValues>;weekday: string;@@ -56,29 +57,23 @@ export const ScheduleDay = <TFieldValues extends FieldValues>({disabled?: boolean;labels?: ScheduleLabelsType;userTimeFormat: number | null;- className?: {- scheduleDay?: string;- dayRanges?: string;- timeRangeField?: string;- labelAndSwitchContainer?: string;- scheduleContainer?: string;- };+ classNames?: scheduleClassNames;}) => {const { watch, setValue } = useFormContext();const watchDayRange = watch(name);return (<div- className={classNames(+ className={cn("flex w-full flex-col gap-4 last:mb-0 sm:flex-row sm:gap-6 sm:px-0",- className?.scheduleDay+ classNames?.scheduleDay)}data-testid={weekday}>{/* Label & switch container */}<div- className={classNames(+ className={cn("flex h-[36px] items-center justify-between sm:w-32",- className?.labelAndSwitchContainer+ classNames?.labelAndSwitchContainer)}><div><label className="text-default flex flex-row items-center space-x-2 rtl:space-x-reverse">@@ -107,9 +102,9 @@ export const ScheduleDay = <TFieldValues extends FieldValues>({control={control}name={name}disabled={disabled}- className={{- dayRanges: className?.dayRanges,- timeRangeField: className?.timeRangeField,+ classNames={{+ dayRanges: classNames?.dayRanges,+ timeRangeField: classNames?.timeRangeField,}}/>{!disabled && <div className="block">{CopyButton}</div>}@@ -137,7 +132,7 @@ const CopyButton = ({<Dropdown open={open} onOpenChange={setOpen}><DropdownMenuTrigger asChild><Button- className={classNames(+ className={cn("text-default",open && "ring-brand-500 !bg-subtle outline-none ring-2 ring-offset-1")}@@ -191,7 +186,7 @@ export const ScheduleComponent = <weekStart = 0,labels,userTimeFormat,- className,+ classNames,}: {name: TPath;control: Control<TFieldValues>;@@ -199,30 +194,19 @@ export const ScheduleComponent = <disabled?: boolean;labels?: ScheduleLabelsType;userTimeFormat: number | null;- className?: {- schedule?: string;- scheduleDay?: string;- dayRanges?: string;- timeRanges?: string;- labelAndSwitchContainer?: string;- };+ classNames?: Omit<scheduleClassNames, "scheduleContainer">;}) => {const { i18n } = useLocale();return (- <div className={classNames("flex flex-col gap-4 p-2 sm:p-4", className?.schedule)}>+ <div className={cn("flex flex-col gap-4 p-2 sm:p-4", classNames?.schedule)}>{/* First iterate for each day */}{weekdayNames(i18n.language, weekStart, "long").map((weekday, num) => {const weekdayIndex = (num + weekStart) % 7;const dayRangeName = `${name}.${weekdayIndex}` as ArrayPath<TFieldValues>;return (<ScheduleDay- className={{- scheduleDay: className?.scheduleDay,- dayRanges: className?.dayRanges,- timeRangeField: className?.timeRanges,- labelAndSwitchContainer: className?.labelAndSwitchContainer,- }}+ classNames={classNames}userTimeFormat={userTimeFormat}labels={labels}disabled={disabled}@@ -246,17 +230,14 @@ export const DayRanges = <TFieldValues extends FieldValues>({control,labels,userTimeFormat,- className,+ classNames,}: {name: ArrayPath<TFieldValues>;control?: Control<TFieldValues>;disabled?: boolean;labels?: ScheduleLabelsType;userTimeFormat: number | null;- className?: {- dayRanges?: string;- timeRangeField?: string;- };+ classNames?: Pick<scheduleClassNames, "dayRanges" | "timeRangeField">;}) => {const { t } = useLocale();const { getValues } = useFormContext();@@ -269,7 +250,7 @@ export const DayRanges = <TFieldValues extends FieldValues>({if (!fields.length) return null;return (- <div className={classNames("flex flex-col gap-2", className?.dayRanges)}>+ <div className={cn("flex flex-col gap-2", classNames?.dayRanges)}>{fields.map((field, index: number) => (<Fragment key={field.id}><div className="flex gap-1 last:mb-0 sm:gap-2">@@ -277,7 +258,7 @@ export const DayRanges = <TFieldValues extends FieldValues>({name={`${name}.${index}`}render={({ field }) => (<TimeRangeField- className={className?.timeRangeField}+ className={classNames?.timeRangeField}userTimeFormat={userTimeFormat}{...field}/>@@ -361,7 +342,7 @@ const TimeRangeField = ({} & ControllerRenderProps) => {// this is a controlled component anyway given it uses LazySelect, so keep it RHF agnostic.return (- <div className={classNames("flex flex-row gap-2 sm:gap-3", className)}>+ <div className={cn("flex flex-row gap-2 sm:gap-3", className)}><LazySelectuserTimeFormat={userTimeFormat}className="block w-[90px] sm:w-[100px]"diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsxindex bb979bc73ac..f46a42fa6ff 100644--- a/packages/platform/atoms/availability/AvailabilitySettings.tsx+++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx@@ -38,7 +38,7 @@ import { Tooltip } from "@calcom/ui/components/tooltip";import { Shell as PlatformShell } from "../src/components/ui/shell";import { cn } from "../src/lib/utils";import { Timezone as PlatformTimzoneSelect } from "../timezone/index";-import type { AvailabilityFormValues } from "./types";+import type { AvailabilityFormValues, scheduleClassNames } from "./types";export type Schedule = {id: number;@@ -58,13 +58,7 @@ export type CustomClassNames = {formClassName?: string;timezoneSelectClassName?: string;subtitlesClassName?: string;- scheduleClassNames?: {- scheduleContainer?: string;- scheduleDay?: string;- dayRanges?: string;- timeRanges?: string;- labelAndSwitchContainer?: string;- };+ scheduleClassNames?: scheduleClassNames;overridesModalClassNames?: string;hiddenSwitchClassname?: {container?: string;@@ -564,7 +558,11 @@ export function AvailabilitySettings({}}className={cn(customClassNames?.formClassName, "flex flex-col sm:mx-0 xl:flex-row xl:space-x-6")}><div className="flex-1 flex-row xl:mr-0">- <div className="border-subtle mb-6 rounded-md border">+ <div+ className={cn(+ "border-subtle mb-6 rounded-md border",+ customClassNames?.scheduleClassNames?.scheduleContainer+ )}><div>{typeof weekStart === "string" && (<Schedule@@ -573,7 +571,7 @@ export function AvailabilitySettings({copyTime: t("copy_times_to"),deleteTime: t("delete"),}}- className={+ classNames={customClassNames?.scheduleClassNames ? { ...customClassNames.scheduleClassNames } : {}}control={form.control}diff --git a/packages/platform/atoms/availability/types.ts b/packages/platform/atoms/availability/types.tsindex 9422e9cbd3b..140b1dbd68a 100644--- a/packages/platform/atoms/availability/types.ts+++ b/packages/platform/atoms/availability/types.ts@@ -20,3 +20,12 @@ export type AvailabilityFormValues = {timeZone: string;isDefault: boolean;};++export type scheduleClassNames = {+ schedule?: string;+ scheduleDay?: string;+ dayRanges?: string;+ timeRangeField?: string;+ labelAndSwitchContainer?: string;+ scheduleContainer?: string;+};