[AppBar] Fix component type (#37172)

mui · May 9, 2023 · 609e2a6 · 609e2a6
1 parent 8acb5dd
commit 609e2a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/packages/mui-material/src/AppBar/AppBar.d.ts b/packages/mui-material/src/AppBar/AppBar.d.ts
@@ -1,16 +1,16 @@
 import * as React from 'react';
 import { SxProps } from '@mui/system';
-import { DistributiveOmit, OverridableStringUnion } from '@mui/types';
+import { OverridableStringUnion } from '@mui/types';
 import { OverridableComponent, OverrideProps } from '@mui/material/OverridableComponent';
 import { PropTypes, Theme } from '..';
-import { PaperProps } from '../Paper';
 import { AppBarClasses } from './appBarClasses';
+import { ExtendPaperTypeMap } from '../Paper/Paper';
 
 export interface AppBarPropsColorOverrides {}
 
-export interface AppBarTypeMap<P = {}, D extends React.ElementType = 'header'> {
-  props: P &
-    DistributiveOmit<PaperProps, 'position' | 'color' | 'classes'> & {
+export type AppBarTypeMap<P = {}, D extends React.ElementType = 'header'> = ExtendPaperTypeMap<
+  {
+    props: P & {
       /**
        * Override or extend the styles applied to the component.
        */
@@ -39,8 +39,10 @@ export interface AppBarTypeMap<P = {}, D extends React.ElementType = 'header'> {
        */
       sx?: SxProps<Theme>;
     };
-  defaultComponent: D;
-}
+    defaultComponent: D;
+  },
+  'position' | 'color' | 'classes'
+>;
 
 /**
  *

diff --git a/packages/mui-material/src/AppBar/AppBar.spec.tsx b/packages/mui-material/src/AppBar/AppBar.spec.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import AppBar from '@mui/material/AppBar';
+import { expectType } from '@mui/types';
 
 const CustomComponent: React.FC<{ stringProp: string; numberProp: number }> =
   function CustomComponent() {
@@ -12,7 +13,13 @@ function AppBarTest() {
       <AppBar />
       <AppBar elevation={4} />
 
-      <AppBar component="a" href="test" />
+      <AppBar
+        component="a"
+        href="test"
+        onClick={(event) => {
+          expectType<React.MouseEvent<HTMLAnchorElement, MouseEvent>, typeof event>(event);
+        }}
+      />
       <AppBar component={CustomComponent} stringProp="test" numberProp={0} />
       {/* @ts-expect-error missing stringProp and numberProp */}
       <AppBar component={CustomComponent} />