From d5821645acf1deebb51faa0b3282d32456c85faf Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Sun, 23 Jul 2023 17:20:10 +0530
Subject: [PATCH 01/12] remove logic from theme typography

---
 packages/mui-material/src/Typography/Typography.js       | 7 +++++--
 packages/mui-material/src/styles/CssVarsProvider.test.js | 2 +-
 packages/mui-material/src/styles/createTypography.js     | 7 -------
 .../mui-material/src/styles/createTypography.test.js     | 9 ---------
 .../mui-system/src/styleFunctionSx/styleFunctionSx.js    | 4 ----
 5 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js
index 1de18d23f78cc0..967b21adab9a6f 100644
--- a/packages/mui-material/src/Typography/Typography.js
+++ b/packages/mui-material/src/Typography/Typography.js
@@ -34,7 +34,7 @@ export const TypographyRoot = styled('span', {
 
     return [
       styles.root,
-      ownerState.variant && styles[ownerState.variant],
+      ownerState&& styles[ownerState.variant],
       ownerState.align !== 'inherit' && styles[`align${capitalize(ownerState.align)}`],
       ownerState.noWrap && styles.noWrap,
       ownerState.gutterBottom && styles.gutterBottom,
@@ -43,7 +43,10 @@ export const TypographyRoot = styled('span', {
   },
 })(({ theme, ownerState }) => ({
   margin: 0,
-  ...(ownerState.variant && theme.typography[ownerState.variant]),
+  ...(ownerState.variant === 'inherit' && {
+    font: 'inherit'
+  }),
+  ...(ownerState.variant !== 'inherit' && theme.typography[ownerState.variant]),
   ...(ownerState.align !== 'inherit' && {
     textAlign: ownerState.align,
   }),
diff --git a/packages/mui-material/src/styles/CssVarsProvider.test.js b/packages/mui-material/src/styles/CssVarsProvider.test.js
index b12643e48eb087..a99e6eb0b7b855 100644
--- a/packages/mui-material/src/styles/CssVarsProvider.test.js
+++ b/packages/mui-material/src/styles/CssVarsProvider.test.js
@@ -246,7 +246,7 @@ describe('[Material UI] CssVarsProvider', () => {
       );
 
       expect(container.firstChild?.textContent).to.equal(
-        'htmlFontSize,pxToRem,fontFamily,fontSize,fontWeightLight,fontWeightRegular,fontWeightMedium,fontWeightBold,h1,h2,h3,h4,h5,h6,subtitle1,subtitle2,body1,body2,button,caption,overline,inherit',
+        'htmlFontSize,pxToRem,fontFamily,fontSize,fontWeightLight,fontWeightRegular,fontWeightMedium,fontWeightBold,h1,h2,h3,h4,h5,h6,subtitle1,subtitle2,body1,body2,button,caption,overline',
       );
     });
   });
diff --git a/packages/mui-material/src/styles/createTypography.js b/packages/mui-material/src/styles/createTypography.js
index 78775e5ce5e1c5..ca52ce80c25179 100644
--- a/packages/mui-material/src/styles/createTypography.js
+++ b/packages/mui-material/src/styles/createTypography.js
@@ -72,13 +72,6 @@ export default function createTypography(palette, typography) {
     button: buildVariant(fontWeightMedium, 14, 1.75, 0.4, caseAllCaps),
     caption: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
     overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
-    inherit: {
-      fontFamily: 'inherit',
-      fontWeight: 'inherit',
-      fontSize: 'inherit',
-      lineHeight: 'inherit',
-      letterSpacing: 'inherit',
-    },
   };
 
   return deepmerge(
diff --git a/packages/mui-material/src/styles/createTypography.test.js b/packages/mui-material/src/styles/createTypography.test.js
index 2f2fbc07c6e076..db14cdd166e6a7 100644
--- a/packages/mui-material/src/styles/createTypography.test.js
+++ b/packages/mui-material/src/styles/createTypography.test.js
@@ -74,15 +74,6 @@ describe('createTypography', () => {
     );
   });
 
-  it('should apply font CSS properties to inherit variant', () => {
-    const typography = createTypography(palette, {});
-    const fontProperties = ['fontFamily', 'fontWeight', 'fontSize', 'lineHeight', 'letterSpacing'];
-
-    fontProperties.forEach((prop) => {
-      expect(typography.inherit[prop]).to.equal('inherit');
-    });
-  });
-
   describe('warnings', () => {
     it('logs an error if `fontSize` is not of type number', () => {
       expect(() => {
diff --git a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
index ef66e3001929a9..c675671f7abc0b 100644
--- a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
+++ b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
@@ -38,10 +38,6 @@ export function unstable_createStyleFunctionSx() {
       return null;
     }
 
-    if (themeKey === 'typography' && val === 'inherit') {
-      return { [prop]: val };
-    }
-
     const themeMapping = getPath(theme, themeKey) || {};
 
     if (style) {

From 3f534b54ffec84f5a22cd2671a4c9b51bedf1ce0 Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Sun, 23 Jul 2023 18:01:42 +0530
Subject: [PATCH 02/12] prettier

---
 packages/mui-material/src/Typography/Typography.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js
index 967b21adab9a6f..625dbdfdb9a6e9 100644
--- a/packages/mui-material/src/Typography/Typography.js
+++ b/packages/mui-material/src/Typography/Typography.js
@@ -34,7 +34,7 @@ export const TypographyRoot = styled('span', {
 
     return [
       styles.root,
-      ownerState&& styles[ownerState.variant],
+      ownerState && styles[ownerState.variant],
       ownerState.align !== 'inherit' && styles[`align${capitalize(ownerState.align)}`],
       ownerState.noWrap && styles.noWrap,
       ownerState.gutterBottom && styles.gutterBottom,
@@ -44,7 +44,7 @@ export const TypographyRoot = styled('span', {
 })(({ theme, ownerState }) => ({
   margin: 0,
   ...(ownerState.variant === 'inherit' && {
-    font: 'inherit'
+    font: 'inherit',
   }),
   ...(ownerState.variant !== 'inherit' && theme.typography[ownerState.variant]),
   ...(ownerState.align !== 'inherit' && {

From 3b17f2574ca4a33f2ed813d9e643af42d07d99c1 Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Sun, 23 Jul 2023 18:16:02 +0530
Subject: [PATCH 03/12] fix ownerState.variant

---
 packages/mui-material/src/Typography/Typography.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js
index 625dbdfdb9a6e9..8094e66534cbe4 100644
--- a/packages/mui-material/src/Typography/Typography.js
+++ b/packages/mui-material/src/Typography/Typography.js
@@ -34,7 +34,7 @@ export const TypographyRoot = styled('span', {
 
     return [
       styles.root,
-      ownerState && styles[ownerState.variant],
+      ownerState.variant && styles[ownerState.variant],
       ownerState.align !== 'inherit' && styles[`align${capitalize(ownerState.align)}`],
       ownerState.noWrap && styles.noWrap,
       ownerState.gutterBottom && styles.gutterBottom,

From 0e50e0d5fd511124bfac042de806b7b97059cdba Mon Sep 17 00:00:00 2001
From: Zeeshan Tamboli <zeeshan.tamboli@gmail.com>
Date: Sun, 23 Jul 2023 19:49:54 +0530
Subject: [PATCH 04/12] Update
 packages/mui-material/src/Typography/Typography.js

Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
Signed-off-by: Zeeshan Tamboli <zeeshan.tamboli@gmail.com>
---
 packages/mui-material/src/Typography/Typography.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js
index 8094e66534cbe4..679c343cf5fe56 100644
--- a/packages/mui-material/src/Typography/Typography.js
+++ b/packages/mui-material/src/Typography/Typography.js
@@ -44,6 +44,7 @@ export const TypographyRoot = styled('span', {
 })(({ theme, ownerState }) => ({
   margin: 0,
   ...(ownerState.variant === 'inherit' && {
+    // Some elements, like <button> on Chrome have default font that doesn't inherit, reset this.
     font: 'inherit',
   }),
   ...(ownerState.variant !== 'inherit' && theme.typography[ownerState.variant]),

From 74e14c69829d51196a5fdd9cb10cb10db16ce3bd Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Fri, 28 Jul 2023 19:11:00 +0530
Subject: [PATCH 05/12] revert theme typography changes, add TODO

---
 packages/mui-material/src/styles/CssVarsProvider.test.js | 2 +-
 packages/mui-material/src/styles/createTypography.js     | 8 ++++++++
 .../mui-material/src/styles/createTypography.test.js     | 9 +++++++++
 .../mui-system/src/styleFunctionSx/styleFunctionSx.js    | 4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/mui-material/src/styles/CssVarsProvider.test.js b/packages/mui-material/src/styles/CssVarsProvider.test.js
index a99e6eb0b7b855..b12643e48eb087 100644
--- a/packages/mui-material/src/styles/CssVarsProvider.test.js
+++ b/packages/mui-material/src/styles/CssVarsProvider.test.js
@@ -246,7 +246,7 @@ describe('[Material UI] CssVarsProvider', () => {
       );
 
       expect(container.firstChild?.textContent).to.equal(
-        'htmlFontSize,pxToRem,fontFamily,fontSize,fontWeightLight,fontWeightRegular,fontWeightMedium,fontWeightBold,h1,h2,h3,h4,h5,h6,subtitle1,subtitle2,body1,body2,button,caption,overline',
+        'htmlFontSize,pxToRem,fontFamily,fontSize,fontWeightLight,fontWeightRegular,fontWeightMedium,fontWeightBold,h1,h2,h3,h4,h5,h6,subtitle1,subtitle2,body1,body2,button,caption,overline,inherit',
       );
     });
   });
diff --git a/packages/mui-material/src/styles/createTypography.js b/packages/mui-material/src/styles/createTypography.js
index ca52ce80c25179..98424f94f2b419 100644
--- a/packages/mui-material/src/styles/createTypography.js
+++ b/packages/mui-material/src/styles/createTypography.js
@@ -72,6 +72,14 @@ export default function createTypography(palette, typography) {
     button: buildVariant(fontWeightMedium, 14, 1.75, 0.4, caseAllCaps),
     caption: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
     overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
+    //  TODO v6: Remove handling of 'inherit' variant from the theme as it is already handled in Material UI's Typography component. Also, remember to remove the associated types.
+    inherit: {
+      fontFamily: 'inherit',
+      fontWeight: 'inherit',
+      fontSize: 'inherit',
+      lineHeight: 'inherit',
+      letterSpacing: 'inherit',
+    },
   };
 
   return deepmerge(
diff --git a/packages/mui-material/src/styles/createTypography.test.js b/packages/mui-material/src/styles/createTypography.test.js
index db14cdd166e6a7..2f2fbc07c6e076 100644
--- a/packages/mui-material/src/styles/createTypography.test.js
+++ b/packages/mui-material/src/styles/createTypography.test.js
@@ -74,6 +74,15 @@ describe('createTypography', () => {
     );
   });
 
+  it('should apply font CSS properties to inherit variant', () => {
+    const typography = createTypography(palette, {});
+    const fontProperties = ['fontFamily', 'fontWeight', 'fontSize', 'lineHeight', 'letterSpacing'];
+
+    fontProperties.forEach((prop) => {
+      expect(typography.inherit[prop]).to.equal('inherit');
+    });
+  });
+
   describe('warnings', () => {
     it('logs an error if `fontSize` is not of type number', () => {
       expect(() => {
diff --git a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
index c675671f7abc0b..ef66e3001929a9 100644
--- a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
+++ b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
@@ -38,6 +38,10 @@ export function unstable_createStyleFunctionSx() {
       return null;
     }
 
+    if (themeKey === 'typography' && val === 'inherit') {
+      return { [prop]: val };
+    }
+
     const themeMapping = getPath(theme, themeKey) || {};
 
     if (style) {

From 04af05aa2a6cdd6882685d312b40f8fbd3ee3539 Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Fri, 28 Jul 2023 19:11:20 +0530
Subject: [PATCH 06/12] fix types

---
 packages/mui-material/src/Typography/Typography.d.ts   | 4 ++--
 packages/mui-material/src/styles/createTypography.d.ts | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/mui-material/src/Typography/Typography.d.ts b/packages/mui-material/src/Typography/Typography.d.ts
index 483a1735550200..ed842c0327ebb9 100644
--- a/packages/mui-material/src/Typography/Typography.d.ts
+++ b/packages/mui-material/src/Typography/Typography.d.ts
@@ -48,7 +48,7 @@ export interface TypographyOwnProps extends SystemProps<Theme> {
    * Applies the theme typography styles.
    * @default 'body1'
    */
-  variant?: OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>;
+  variant?: OverridableStringUnion<Variant, TypographyPropsVariantOverrides>;
   /**
    * The component maps the variant prop to a range of different HTML element types.
    * For instance, subtitle1 to `<h6>`.
@@ -69,7 +69,7 @@ export interface TypographyOwnProps extends SystemProps<Theme> {
    * }
    */
   variantMapping?: Partial<
-    Record<OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>, string>
+    Record<OverridableStringUnion<Variant, TypographyPropsVariantOverrides>, string>
   >;
 }
 
diff --git a/packages/mui-material/src/styles/createTypography.d.ts b/packages/mui-material/src/styles/createTypography.d.ts
index d45b25ac3e8bd3..4081eb7f692381 100644
--- a/packages/mui-material/src/styles/createTypography.d.ts
+++ b/packages/mui-material/src/styles/createTypography.d.ts
@@ -15,7 +15,8 @@ export type Variant =
   | 'body2'
   | 'caption'
   | 'button'
-  | 'overline';
+  | 'overline'
+  | 'inherit';
 
 export interface FontStyle
   extends Required<{

From 729ee07ff0269de4f9f2993f687d9ebd2bc09e40 Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Fri, 28 Jul 2023 19:11:34 +0530
Subject: [PATCH 07/12] add type tests

---
 .../mui-material/src/Typography/typography.spec.tsx   |  1 +
 .../mui-material/src/styles/createTypography.spec.ts  | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/mui-material/src/Typography/typography.spec.tsx b/packages/mui-material/src/Typography/typography.spec.tsx
index cbbbeaca3a6764..3ff534d54ae9e1 100644
--- a/packages/mui-material/src/Typography/typography.spec.tsx
+++ b/packages/mui-material/src/Typography/typography.spec.tsx
@@ -36,6 +36,7 @@ const typographyTest = () => {
       <Typography component={CustomComponent} prop1="1" />
       {/* @ts-expect-error */}
       <Typography component={CustomComponent} prop1="1" prop2="12" />
+      <Typography variant="inherit" />
     </div>
   );
 };
diff --git a/packages/mui-material/src/styles/createTypography.spec.ts b/packages/mui-material/src/styles/createTypography.spec.ts
index 5e78f3df5ea39b..2c95a56951e2f0 100644
--- a/packages/mui-material/src/styles/createTypography.spec.ts
+++ b/packages/mui-material/src/styles/createTypography.spec.ts
@@ -33,3 +33,14 @@ import { expectType } from '@mui/types';
     ...theme.typography.body1,
   }));
 }
+
+// test for theme.typography.inherit
+{
+  createTheme({
+    typography: {
+      inherit: {
+        fontSize: 10,
+      },
+    },
+  });
+}

From 896a1e8bb64f2923a92873c966ec68d068fecd9a Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Fri, 28 Jul 2023 22:04:29 +0530
Subject: [PATCH 08/12] update test

---
 .../src/Typography/typography.spec.tsx             |  1 +
 .../src/styles/createTypography.spec.ts            | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/mui-material/src/Typography/typography.spec.tsx b/packages/mui-material/src/Typography/typography.spec.tsx
index 1297775d7e2ee8..499e61c10e0152 100644
--- a/packages/mui-material/src/Typography/typography.spec.tsx
+++ b/packages/mui-material/src/Typography/typography.spec.tsx
@@ -56,6 +56,7 @@ const typographyTest = () => {
       {/* @ts-expect-error */}
       <Typography component={CustomComponent} prop1="1" prop2="12" />
       <Typography variant="inherit" />
+      <Typography variantMapping={{ inherit: 'span' }} />
     </div>
   );
 };
diff --git a/packages/mui-material/src/styles/createTypography.spec.ts b/packages/mui-material/src/styles/createTypography.spec.ts
index 2c95a56951e2f0..68727e2d77c5c3 100644
--- a/packages/mui-material/src/styles/createTypography.spec.ts
+++ b/packages/mui-material/src/styles/createTypography.spec.ts
@@ -35,12 +35,8 @@ import { expectType } from '@mui/types';
 }
 
 // test for theme.typography.inherit
-{
-  createTheme({
-    typography: {
-      inherit: {
-        fontSize: 10,
-      },
-    },
-  });
-}
+const Div = styled('div')(({ theme }) => ({
+  ...theme.typography.inherit,
+  backgroundColor: theme.palette.background.paper,
+  padding: theme.spacing(1),
+}));

From dbc8315f836850acdd73647b016dccc5231be249 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Fri, 28 Jul 2023 19:22:46 +0200
Subject: [PATCH 09/12] typo

Signed-off-by: Olivier Tassinari <olivier.tassinari@gmail.com>
---
 packages/mui-material/src/styles/createTypography.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mui-material/src/styles/createTypography.js b/packages/mui-material/src/styles/createTypography.js
index 98424f94f2b419..8d2c6ed73e8c46 100644
--- a/packages/mui-material/src/styles/createTypography.js
+++ b/packages/mui-material/src/styles/createTypography.js
@@ -72,7 +72,7 @@ export default function createTypography(palette, typography) {
     button: buildVariant(fontWeightMedium, 14, 1.75, 0.4, caseAllCaps),
     caption: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
     overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
-    //  TODO v6: Remove handling of 'inherit' variant from the theme as it is already handled in Material UI's Typography component. Also, remember to remove the associated types.
+    // TODO v6: Remove handling of 'inherit' variant from the theme as it is already handled in Material UI's Typography component. Also, remember to remove the associated types.
     inherit: {
       fontFamily: 'inherit',
       fontWeight: 'inherit',

From 6f0fee9b28399290e94fb465da284461206b0cfa Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Fri, 28 Jul 2023 19:25:25 +0200
Subject: [PATCH 10/12] to remove at one point

---
 packages/mui-system/src/styleFunctionSx/styleFunctionSx.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
index ef66e3001929a9..4f391e563b674a 100644
--- a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
+++ b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js
@@ -38,6 +38,7 @@ export function unstable_createStyleFunctionSx() {
       return null;
     }
 
+    // TODO v6: remove, see https://github.com/mui/material-ui/pull/38123
     if (themeKey === 'typography' && val === 'inherit') {
       return { [prop]: val };
     }

From c56c8a459f50f201fa26f7cde3a9759fa551634a Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Fri, 28 Jul 2023 19:25:47 +0200
Subject: [PATCH 11/12] to remove at one point

---
 packages/mui-material/src/styles/createTypography.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mui-material/src/styles/createTypography.test.js b/packages/mui-material/src/styles/createTypography.test.js
index 2f2fbc07c6e076..4d19426d2eff1e 100644
--- a/packages/mui-material/src/styles/createTypography.test.js
+++ b/packages/mui-material/src/styles/createTypography.test.js
@@ -74,6 +74,7 @@ describe('createTypography', () => {
     );
   });
 
+  // TODO v6: remove, see https://github.com/mui/material-ui/pull/38123
   it('should apply font CSS properties to inherit variant', () => {
     const typography = createTypography(palette, {});
     const fontProperties = ['fontFamily', 'fontWeight', 'fontSize', 'lineHeight', 'letterSpacing'];

From 79abb092c2184eda2c2f218f662cc0719832a221 Mon Sep 17 00:00:00 2001
From: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
Date: Sat, 29 Jul 2023 11:53:20 +0530
Subject: [PATCH 12/12] revert changes

---
 packages/mui-material/src/Typography/Typography.d.ts      | 4 ++--
 packages/mui-material/src/Typography/typography.spec.tsx  | 2 --
 packages/mui-material/src/styles/createTypography.d.ts    | 3 +--
 packages/mui-material/src/styles/createTypography.spec.ts | 7 -------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/mui-material/src/Typography/Typography.d.ts b/packages/mui-material/src/Typography/Typography.d.ts
index 4d516bfe787329..646847c39e0477 100644
--- a/packages/mui-material/src/Typography/Typography.d.ts
+++ b/packages/mui-material/src/Typography/Typography.d.ts
@@ -48,7 +48,7 @@ export interface TypographyOwnProps extends SystemProps<Theme> {
    * Applies the theme typography styles.
    * @default 'body1'
    */
-  variant?: OverridableStringUnion<Variant, TypographyPropsVariantOverrides>;
+  variant?: OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>;
   /**
    * The component maps the variant prop to a range of different HTML element types.
    * For instance, subtitle1 to `<h6>`.
@@ -69,7 +69,7 @@ export interface TypographyOwnProps extends SystemProps<Theme> {
    * }
    */
   variantMapping?: Partial<
-    Record<OverridableStringUnion<Variant, TypographyPropsVariantOverrides>, string>
+    Record<OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>, string>
   >;
 }
 
diff --git a/packages/mui-material/src/Typography/typography.spec.tsx b/packages/mui-material/src/Typography/typography.spec.tsx
index 499e61c10e0152..0ef0026b5e37d7 100644
--- a/packages/mui-material/src/Typography/typography.spec.tsx
+++ b/packages/mui-material/src/Typography/typography.spec.tsx
@@ -55,8 +55,6 @@ const typographyTest = () => {
       <Typography component={CustomComponent} prop1="1" />
       {/* @ts-expect-error */}
       <Typography component={CustomComponent} prop1="1" prop2="12" />
-      <Typography variant="inherit" />
-      <Typography variantMapping={{ inherit: 'span' }} />
     </div>
   );
 };
diff --git a/packages/mui-material/src/styles/createTypography.d.ts b/packages/mui-material/src/styles/createTypography.d.ts
index 4081eb7f692381..d45b25ac3e8bd3 100644
--- a/packages/mui-material/src/styles/createTypography.d.ts
+++ b/packages/mui-material/src/styles/createTypography.d.ts
@@ -15,8 +15,7 @@ export type Variant =
   | 'body2'
   | 'caption'
   | 'button'
-  | 'overline'
-  | 'inherit';
+  | 'overline';
 
 export interface FontStyle
   extends Required<{
diff --git a/packages/mui-material/src/styles/createTypography.spec.ts b/packages/mui-material/src/styles/createTypography.spec.ts
index 68727e2d77c5c3..5e78f3df5ea39b 100644
--- a/packages/mui-material/src/styles/createTypography.spec.ts
+++ b/packages/mui-material/src/styles/createTypography.spec.ts
@@ -33,10 +33,3 @@ import { expectType } from '@mui/types';
     ...theme.typography.body1,
   }));
 }
-
-// test for theme.typography.inherit
-const Div = styled('div')(({ theme }) => ({
-  ...theme.typography.inherit,
-  backgroundColor: theme.palette.background.paper,
-  padding: theme.spacing(1),
-}));