[@mantine/styles] Improve useComponentDefaultProps types (#2065)

* fix(CompDefaultProps): comp default props type

* fix: prettier

* fix: use input props

* fix: use input props

Co-authored-by: cong <cong.li@carbonnt.com>

src/mantine-core/src/Input/use-input-props.ts

@@ -8,9 +8,9 @@ interface BaseProps extends InputWrapperBaseProps, InputSharedProps, DefaultProp
   id?: string;
 }
 
-export function useInputProps<T extends BaseProps>(
+export function useInputProps<T extends BaseProps, U extends Partial<T>>(
   component: string,
-  defaultProps: Partial<T>,
+  defaultProps: U,
   props: T
 ) {
   const {
@@ -35,7 +35,7 @@ export function useInputProps<T extends BaseProps>(
     inputWrapperOrder,
     withAsterisk,
     ...others
-  } = useComponentDefaultProps(component, defaultProps, props);
+  } = useComponentDefaultProps<T>(component, defaultProps, props);
 
   const uid = useId(id);
 

src/mantine-styles/src/theme/MantineProvider.tsx

@@ -41,11 +41,17 @@ export function useMantineEmotionCache() {
   return useContext(MantineProviderContext)?.emotionCache;
 }
 
-export function useComponentDefaultProps<T extends Record<string, any>>(
+export function useComponentDefaultProps<T extends Record<string, any>, U extends Partial<T> = {}>(
   component: string,
-  defaultProps: Partial<T>,
+  defaultProps: U,
   props: T
-): T {
+): [keyof U] extends [keyof T]
+  ? T
+  : {
+      [Key in Exclude<keyof T, keyof U>]: T[Key];
+    } & {
+      [Key in Extract<keyof T, keyof U>]-?: U[Key] & T[Key];
+    } {
   const theme = useMantineTheme();
   const contextProps = theme.components[component]?.defaultProps;
   return { ...defaultProps, ...contextProps, ...filterProps(props) };

src/mantine-styles/src/theme/utils/filter-props/filter-props.ts

@@ -1,8 +1,12 @@
+type FilterPropsRes<T extends Record<string, any>> = {
+  [Key in keyof T]-?: T[Key] extends undefined ? never : T[Key];
+};
+
 export function filterProps<T extends Record<string, any>>(props: T) {
-  return Object.keys(props).reduce<T>((acc, key: keyof T) => {
+  return Object.keys(props).reduce<FilterPropsRes<T>>((acc, key: keyof T) => {
     if (props[key] !== undefined) {
       acc[key] = props[key];
     }
     return acc;
-  }, {} as T);
+  }, {} as FilterPropsRes<T>);
 }