diff --git a/packages/app-store/ee/routing-forms/components/FormActions.tsx b/packages/app-store/ee/routing-forms/components/FormActions.tsx index cb31bfeeca..f50ce25bb9 100644 --- a/packages/app-store/ee/routing-forms/components/FormActions.tsx +++ b/packages/app-store/ee/routing-forms/components/FormActions.tsx @@ -447,7 +447,14 @@ export const FormAction = forwardRef(function FormAction - + {children} diff --git a/packages/app-store/ee/routing-forms/components/SingleForm.tsx b/packages/app-store/ee/routing-forms/components/SingleForm.tsx index f54d97163f..606c02c814 100644 --- a/packages/app-store/ee/routing-forms/components/SingleForm.tsx +++ b/packages/app-store/ee/routing-forms/components/SingleForm.tsx @@ -185,6 +185,7 @@ const Actions = ({ {t("Copy Typeform Redirect Url")} ) : null} + ; +export type ButtonColor = NonNullable; export type ButtonBaseProps = { /** Action that happens when the button is clicked */ onClick?: (event: React.MouseEvent) => void; @@ -22,7 +23,7 @@ export type ButtonBaseProps = { tooltip?: string; flex?: boolean; } & Omit & { - color?: NonNullable; + color?: ButtonColor; }; export type ButtonProps = ButtonBaseProps & diff --git a/packages/ui/components/form/dropdown/Dropdown.tsx b/packages/ui/components/form/dropdown/Dropdown.tsx index a17784efd9..ed47b65660 100644 --- a/packages/ui/components/form/dropdown/Dropdown.tsx +++ b/packages/ui/components/form/dropdown/Dropdown.tsx @@ -5,7 +5,7 @@ import { ComponentProps, forwardRef } from "react"; import { classNames } from "@calcom/lib"; import { SVGComponent } from "@calcom/types/SVGComponent"; -import { ButtonProps } from "@calcom/ui"; +import { ButtonColor } from "@calcom/ui"; export const Dropdown = DropdownMenuPrimitive.Root; @@ -102,7 +102,7 @@ DropdownMenuRadioItem.displayName = "DropdownMenuRadioItem"; type DropdownItemProps = { children: React.ReactNode; - color?: ButtonProps["color"]; + color?: ButtonColor; StartIcon?: SVGComponent; EndIcon?: SVGComponent; href?: string; diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx index e0676f86b1..1d35ecc384 100644 --- a/packages/ui/index.tsx +++ b/packages/ui/index.tsx @@ -150,3 +150,4 @@ export { export { default as MultiSelectCheckboxes } from "./components/form/checkbox/MultiSelectCheckboxes"; export type { Option as MultiSelectCheckboxesOptionType } from "./components/form/checkbox/MultiSelectCheckboxes"; export { default as ImageUploader } from "./components/image-uploader/ImageUploader"; +export type { ButtonColor } from "./components/button/Button";