-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[system] Add
experimental_sx
utility (#29833)
- Loading branch information
Showing
15 changed files
with
292 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import * as React from 'react'; | ||
import { | ||
styled, | ||
createTheme, | ||
ThemeProvider, | ||
experimental_sx as sx, | ||
} from '@mui/system'; | ||
|
||
const customTheme = createTheme({ | ||
palette: { | ||
primary: { | ||
main: '#1976d2', | ||
contrastText: 'white', | ||
}, | ||
}, | ||
}); | ||
|
||
const MyThemeComponent = styled('div')( | ||
sx({ | ||
color: 'primary.contrastText', | ||
backgroundColor: 'primary.main', | ||
padding: 1, | ||
borderRadius: 1, | ||
}), | ||
); | ||
|
||
export default function ThemeUsage() { | ||
return ( | ||
<ThemeProvider theme={customTheme}> | ||
<MyThemeComponent>Styled div with theme</MyThemeComponent> | ||
</ThemeProvider> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import * as React from 'react'; | ||
import { | ||
styled, | ||
createTheme, | ||
ThemeProvider, | ||
experimental_sx as sx, | ||
} from '@mui/system'; | ||
|
||
const customTheme = createTheme({ | ||
palette: { | ||
primary: { | ||
main: '#1976d2', | ||
contrastText: 'white', | ||
}, | ||
}, | ||
}); | ||
|
||
const MyThemeComponent = styled('div')( | ||
sx({ | ||
color: 'primary.contrastText', | ||
backgroundColor: 'primary.main', | ||
padding: 1, | ||
borderRadius: 1, | ||
}), | ||
); | ||
|
||
export default function ThemeUsage() { | ||
return ( | ||
<ThemeProvider theme={customTheme}> | ||
<MyThemeComponent>Styled div with theme</MyThemeComponent> | ||
</ThemeProvider> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<ThemeProvider theme={customTheme}> | ||
<MyThemeComponent>Styled div with theme</MyThemeComponent> | ||
</ThemeProvider> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import { experimental_sx as sx, styled, createTheme } from '@mui/material/styles'; | ||
|
||
// Can use the experimental_sx in the styled() utility | ||
const Test = styled('div')( | ||
sx({ | ||
color: 'primary.main', | ||
bgcolor: 'primary.light', | ||
m: 2, | ||
}), | ||
); | ||
|
||
// Can use the experimental_sx in the theme's variants | ||
const customTheme = createTheme({ | ||
components: { | ||
MuiButton: { | ||
variants: [ | ||
{ | ||
props: {}, | ||
style: sx({ | ||
m: 2, | ||
p: 1, | ||
}), | ||
}, | ||
], | ||
}, | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { default } from './sx'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { default } from './sx'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import { CSSObject } from '@mui/styled-engine'; | ||
import { SxProps } from '../styleFunctionSx'; | ||
|
||
export default function sx<T extends object = {}>(styles: SxProps<T>): CSSObject; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
import styleFunctionSx from '../styleFunctionSx'; | ||
|
||
function sx(styles) { | ||
return ({ theme }) => styleFunctionSx({ sx: styles, theme }); | ||
} | ||
|
||
export default sx; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import { experimental_sx as sx, styled } from '@mui/system'; | ||
|
||
// Can be used in the styled() utility | ||
const Test = styled('div')( | ||
sx({ | ||
color: 'primary.main', | ||
bgcolor: 'primary.light', | ||
m: 2, | ||
}), | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,158 @@ | ||
import * as React from 'react'; | ||
import { expect } from 'chai'; | ||
import { createRenderer } from 'test/utils'; | ||
import { experimental_sx as sx, styled, ThemeProvider } from '@mui/system'; | ||
|
||
describe('sx', () => { | ||
const { render } = createRenderer(); | ||
const breakpointsValues = { | ||
xs: 0, | ||
sm: 600, | ||
md: 960, | ||
lg: 1280, | ||
xl: 1920, | ||
}; | ||
|
||
const round = (value) => Math.round(value * 1e5) / 1e5; | ||
|
||
const theme = { | ||
spacing: (val) => `${val * 10}px`, | ||
breakpoints: { | ||
keys: ['xs', 'sm', 'md', 'lg', 'xl'], | ||
values: breakpointsValues, | ||
up: (key) => { | ||
return `@media (min-width:${breakpointsValues[key]}px)`; | ||
}, | ||
}, | ||
unit: 'px', | ||
palette: { | ||
primary: { | ||
main: 'rgb(0, 0, 255)', | ||
}, | ||
secondary: { | ||
main: 'rgb(0, 255, 0)', | ||
}, | ||
}, | ||
typography: { | ||
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', | ||
fontWeightLight: 300, | ||
fontSize: 14, | ||
body1: { | ||
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', | ||
fontSize: '1rem', | ||
letterSpacing: `${round(0.15 / 16)}em`, | ||
fontWeight: 400, | ||
lineHeight: 1.5, | ||
}, | ||
body2: { | ||
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', | ||
fontSize: `${14 / 16}rem`, | ||
letterSpacing: `${round(0.15 / 14)}em`, | ||
fontWeight: 400, | ||
lineHeight: 1.43, | ||
}, | ||
}, | ||
}; | ||
|
||
describe('system', () => { | ||
it('resolves system when used inside styled()', function test() { | ||
if (/jsdom/.test(window.navigator.userAgent)) { | ||
this.skip(); | ||
} | ||
|
||
const Test = styled('div')( | ||
sx({ | ||
color: 'primary.main', | ||
bgcolor: 'secondary.main', | ||
m: 2, | ||
p: 1, | ||
fontSize: 'fontSize', | ||
maxWidth: 'sm', | ||
}), | ||
); | ||
|
||
const { container } = render( | ||
<ThemeProvider theme={theme}> | ||
<Test /> | ||
</ThemeProvider>, | ||
); | ||
|
||
expect(container.firstChild).toHaveComputedStyle({ | ||
color: 'rgb(0, 0, 255)', | ||
backgroundColor: 'rgb(0, 255, 0)', | ||
margin: '20px', | ||
padding: '10px', | ||
fontSize: '14px', | ||
maxWidth: '600px', | ||
}); | ||
}); | ||
|
||
it('resolves system when used inside variants', function test() { | ||
if (/jsdom/.test(window.navigator.userAgent)) { | ||
this.skip(); | ||
} | ||
|
||
const themeWithVariants = { | ||
...theme, | ||
components: { | ||
MuiTest: { | ||
variants: [ | ||
{ | ||
props: {}, // all props | ||
style: sx({ | ||
color: 'primary.main', | ||
bgcolor: 'secondary.main', | ||
m: 2, | ||
p: 1, | ||
fontSize: 'fontSize', | ||
maxWidth: 'sm', | ||
}), | ||
}, | ||
], | ||
}, | ||
}, | ||
}; | ||
|
||
const Test = styled('div', { name: 'MuiTest', slot: 'Root' })( | ||
sx({ | ||
color: 'primary.main', | ||
bgcolor: 'secondary.main', | ||
m: 2, | ||
p: 1, | ||
fontSize: 'fontSize', | ||
maxWidth: 'sm', | ||
}), | ||
); | ||
|
||
const { container } = render( | ||
<ThemeProvider theme={themeWithVariants}> | ||
<Test /> | ||
</ThemeProvider>, | ||
); | ||
|
||
expect(container.firstChild).toHaveComputedStyle({ | ||
color: 'rgb(0, 0, 255)', | ||
backgroundColor: 'rgb(0, 255, 0)', | ||
margin: '20px', | ||
padding: '10px', | ||
fontSize: '14px', | ||
maxWidth: '600px', | ||
}); | ||
}); | ||
}); | ||
|
||
it('does not throw if used without ThemeProvider', function test() { | ||
const Test = styled('div')( | ||
sx({ | ||
color: 'primary.main', | ||
bgcolor: 'secondary.main', | ||
m: 2, | ||
p: 1, | ||
fontSize: 'fontSize', | ||
maxWidth: 'sm', | ||
}), | ||
); | ||
|
||
expect(() => render(<Test />)).not.to.throw(); | ||
}); | ||
}); |