fix wrong transformation

mui · Jul 2, 2024 · 0af7bb1 · 0af7bb1
1 parent d6cd77f
commit 0af7bb1
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git a/packages/mui-material/src/Container/Container.js b/packages/mui-material/src/Container/Container.js
@@ -20,7 +20,7 @@ const Container = createContainer({
       ];
     },
   }),
-  useDefaultProps: (inProps) => useDefaultProps({ props: inProps, name: 'MuiContainer' }),
+  useThemeProps: (inProps) => useDefaultProps({ props: inProps, name: 'MuiContainer' }),
 });
 
 Container.propTypes /* remove-proptypes */ = {

diff --git a/packages/mui-material/src/Popper/Popper.tsx b/packages/mui-material/src/Popper/Popper.tsx
@@ -6,7 +6,8 @@ import refType from '@mui/utils/refType';
 import HTMLElementType from '@mui/utils/HTMLElementType';
 import PropTypes from 'prop-types';
 import * as React from 'react';
-import { styled, Theme, useDefaultProps } from '../styles';
+import { styled, Theme } from '../styles';
+import { useDefaultProps } from '../DefaultPropsProvider';
 
 export interface PopperProps extends Omit<BasePopperProps, 'direction'> {
   /**

diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js
@@ -516,7 +516,7 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
         {/* So the vertical align positioning algorithm kicks in. */}
         {isEmpty(display) ? (
           // notranslate needed while Google Translate will not fix zero-width space issue
-          <span className="notranslate"></span>
+          <span className="notranslate">&#8203;</span>
         ) : (
           display
         )}

diff --git a/packages/mui-material/src/Stack/Stack.js b/packages/mui-material/src/Stack/Stack.js
@@ -10,7 +10,7 @@ const Stack = createStack({
     slot: 'Root',
     overridesResolver: (props, styles) => styles.root,
   }),
-  useDefaultProps: (inProps) => useDefaultProps({ props: inProps, name: 'MuiStack' }),
+  useThemeProps: (inProps) => useDefaultProps({ props: inProps, name: 'MuiStack' }),
 });
 
 Stack.propTypes /* remove-proptypes */ = {

diff --git a/packages/mui-material/src/Unstable_Grid2/Grid2.tsx b/packages/mui-material/src/Unstable_Grid2/Grid2.tsx
@@ -2,7 +2,8 @@
 import PropTypes from 'prop-types';
 import { createGrid as createGrid2 } from '@mui/system/Unstable_Grid';
 import { OverridableComponent } from '@mui/types';
-import { styled, useDefaultProps } from '../styles';
+import { styled } from '../styles';
+import { useDefaultProps } from '../DefaultPropsProvider';
 import { Grid2TypeMap } from './Grid2Props';
 
 const Grid2 = createGrid2({

diff --git a/packages/mui-material/src/styles/index.d.ts b/packages/mui-material/src/styles/index.d.ts
@@ -70,7 +70,7 @@ export {
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function experimental_sx(): any;
 export { default as useTheme } from './useTheme';
-export { default as useDefaultProps } from './useThemeProps';
+export { default as useThemeProps } from './useThemeProps';
 export * from './useThemeProps';
 export { default as styled } from './styled';
 /**

diff --git a/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts b/packages/mui-material/src/styles/shouldSkipGeneratingVar.ts
@@ -1,8 +1,7 @@
 export default function shouldSkipGeneratingVar(keys: string[]) {
   return (
-    // ends with sxConfig
     !!keys[0].match(/(cssVarPrefix|typography|mixins|breakpoints|direction|transitions)/) ||
-    !!keys[0].match(/sxConfig$/) ||
+    !!keys[0].match(/sxConfig$/) || // ends with sxConfig
     (keys[0] === 'palette' && !!keys[1]?.match(/(mode|contrastThreshold|tonalOffset)/))
   );
 }
diff --git a/packages/mui-material/src/styles/useThemeProps.d.ts b/packages/mui-material/src/styles/useThemeProps.d.ts
@@ -11,7 +11,7 @@ export type ThemedProps<Theme, Name extends keyof any> = Theme extends {
   ? Props
   : {};
 
-export default function useDefaultProps<
+export default function useThemeProps<
   Theme extends ThemeWithProps,
   Props,
   Name extends keyof any,

diff --git a/packages/mui-material/src/styles/useThemeProps.js b/packages/mui-material/src/styles/useThemeProps.js
@@ -3,6 +3,6 @@ import systemUseThemeProps from '@mui/system/useThemeProps';
 import defaultTheme from './defaultTheme';
 import THEME_ID from './identifier';
 
-export default function useDefaultProps({ props, name }) {
+export default function useThemeProps({ props, name }) {
   return systemUseThemeProps({ props, name, defaultTheme, themeId: THEME_ID });
 }
diff --git a/packages/mui-material/src/styles/useThemeProps.spec.ts b/packages/mui-material/src/styles/useThemeProps.spec.ts
@@ -1,8 +1,8 @@
-import { Theme, useDefaultProps } from '@mui/material/styles';
+import { Theme, useThemeProps } from '@mui/material/styles';
 import { SliderProps } from '@mui/material/Slider';
 
 function ThemedComponent() {
-  const props = useDefaultProps<Theme, SliderProps, 'MuiSlider'>({
+  const props = useThemeProps<Theme, SliderProps, 'MuiSlider'>({
     props: { color: 'primary' },
     name: 'MuiSlider',
   });

diff --git a/packages/mui-material/src/zero-styled/index.ts b/packages/mui-material/src/zero-styled/index.ts
@@ -1,8 +1,8 @@
-import { useDefaultProps } from '../DefaultPropsProvider';
+import useThemeProps from '../styles/useThemeProps';
 
 export { default as styled } from '../styles/styled';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function createUseThemeProps(name: string) {
-  return useDefaultProps;
+  return useThemeProps;
 }