diff --git a/src/components/ButtonSecondary.tsx b/src/components/ButtonSecondary.tsx index 0ca0165..03c5e2b 100644 --- a/src/components/ButtonSecondary.tsx +++ b/src/components/ButtonSecondary.tsx @@ -2,14 +2,10 @@ import { clsx } from "clsx/lite"; import { getResetClassName } from "css-homogenizer/reset-scoped"; import { forwardRef } from "react"; -import type { Merge } from "../utils/types"; - -export type ButtonSecondaryProps = Merge< - React.ComponentPropsWithRef<"button">, - { - size?: "md"; - } ->; +export interface ButtonSecondaryProps + extends React.ComponentPropsWithRef<"button"> { + size?: "md"; +} export const ButtonSecondary = forwardRef(function ButtonSecondary( { size = "md", className, ...props }: ButtonSecondaryProps, diff --git a/src/components/Input.tsx b/src/components/Input.tsx index 30221e3..e1d1847 100644 --- a/src/components/Input.tsx +++ b/src/components/Input.tsx @@ -2,14 +2,10 @@ import { clsx } from "clsx/lite"; import { getResetClassName } from "css-homogenizer/reset-scoped"; import { forwardRef } from "react"; -import type { Merge } from "../utils/types"; - -export type InputProps = Merge< - React.ComponentPropsWithRef<"input">, - { - size?: "sm"; - } ->; +export interface InputProps + extends Omit, "size"> { + size?: "sm"; +} export const Input = forwardRef(function Input( { size = "sm", className, ...props }: InputProps, diff --git a/src/components/Popover.tsx b/src/components/Popover.tsx index 257e0f8..cd7154f 100644 --- a/src/components/Popover.tsx +++ b/src/components/Popover.tsx @@ -1,7 +1,7 @@ import { clsx } from "clsx/lite"; import { forwardRef } from "react"; -export type PopoverProps = React.ComponentPropsWithRef<"div">; +export interface PopoverProps extends React.ComponentPropsWithRef<"div"> {} export const Popover = forwardRef(function Popover( { className, ...props }: PopoverProps, diff --git a/src/utils/types.ts b/src/utils/types.ts deleted file mode 100644 index 9fb1919..0000000 --- a/src/utils/types.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type DistributiveOmit = T extends unknown - ? Omit - : never; - -export type Merge = DistributiveOmit & U;