diff --git a/.changeset/rich-impalas-hug.md b/.changeset/rich-impalas-hug.md new file mode 100644 index 0000000000..6281d4dc88 --- /dev/null +++ b/.changeset/rich-impalas-hug.md @@ -0,0 +1,5 @@ +--- +"@calcom/atoms": minor +--- + +fix: Availability atom handleFormSubmit callbacks not triggering diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsx index a11c458ced..5e1cd79728 100644 --- a/packages/platform/atoms/availability/AvailabilitySettings.tsx +++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx @@ -124,6 +124,7 @@ type AvailabilitySettingsProps = { isEventTypesFetching?: boolean; handleBulkEditDialogToggle: () => void; }; + callbacksRef?: React.MutableRefObject<{ onSuccess?: () => void; onError?: (error: Error) => void }>; }; const DeleteDialogButton = ({ @@ -306,6 +307,7 @@ export const AvailabilitySettings = forwardRef(null); - const callbacksRef = useRef<{ onSuccess?: () => void; onError?: (error: Error) => void }>({}); - const handleFormSubmit = useCallback( (customCallbacks?: { onSuccess?: () => void; onError?: (error: Error) => void }) => { - if (customCallbacks) { + if (callbacksRef && customCallbacks) { callbacksRef.current = customCallbacks; } @@ -350,14 +350,14 @@ export const AvailabilitySettings = forwardRef { try { await handleSubmit(data); - callbacksRef.current?.onSuccess?.(); + callbacksRef?.current?.onSuccess?.(); } catch (error) { - callbacksRef.current?.onError?.(error as Error); + callbacksRef?.current?.onError?.(error as Error); } })(); } }, - [form, handleSubmit] + [form, handleSubmit, callbacksRef] ); const validateForm = useCallback(async () => { diff --git a/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx b/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx index c4098ad482..2f684486cf 100644 --- a/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx +++ b/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx @@ -39,7 +39,7 @@ export type AvailabilitySettingsPlatformWrapperProps = { }; export const AvailabilitySettingsPlatformWrapper = forwardRef< -AvailabilitySettingsFormRef, + AvailabilitySettingsFormRef, AvailabilitySettingsPlatformWrapperProps >(function AvailabilitySettingsPlatformWrapper(props, ref) { const { @@ -202,6 +202,7 @@ AvailabilitySettingsFormRef, allowDelete={allowDelete} allowSetToDefault={allowSetToDefault} onFormStateChange={onFormStateChange} + callbacksRef={callbacksRef} /> );