chore: correct type definitions

kobaltedev · Apr 3, 2024 · 55823fe · 55823fe
1 parent 3d3da8e
commit 55823fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/packages/core/src/polymorphic/polymorphic.tsx b/packages/core/src/polymorphic/polymorphic.tsx
@@ -1,15 +1,13 @@
 /* @refresh reload */
 
+import { OverrideProps } from "@kobalte/utils";
 import { ComponentProps, JSX, ValidComponent, splitProps } from "solid-js";
 import { Dynamic } from "solid-js/web";
 
 /* -------------------------------------------------------------------------------------------------
  * Polymorphic
  * -----------------------------------------------------------------------------------------------*/
 
-// Combine T and P by overriding T
-export type OverrideProps<T, P> = Omit<T, keyof P> & P;
-
 /**
  * Polymorphic attribute.
  */

diff --git a/packages/utils/src/props.ts b/packages/utils/src/props.ts
@@ -19,9 +19,9 @@ export type OverrideComponentProps<T extends ValidComponent, P> = OverrideProps<
 	P
 >;
 
-export function mergeDefaultProps<T extends Record<string, any>>(
-	defaultProps: Partial<T>,
+export function mergeDefaultProps<T extends {}, D extends Partial<T>>(
+	defaultProps: D,
 	props: T,
-): T {
-	return mergeProps(defaultProps, props);
+): OverrideProps<T, D> {
+	return mergeProps(defaultProps, props) as OverrideProps<T, D>;
 }