Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] Interoperability guide updates #23030

Merged
merged 101 commits into from
Oct 16, 2020
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
fd5714f
wip
mnajdova Oct 12, 2020
6188a3a
styled-components, emotion, global
mnajdova Oct 13, 2020
9573264
Merge branch 'next' into docs/interoperability-cleanup
mnajdova Oct 13, 2020
4f28599
prettier
mnajdova Oct 13, 2020
6f9816f
css modules updated
mnajdova Oct 13, 2020
07c7501
fixed duplicated import
mnajdova Oct 13, 2020
cf7f2ef
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
a327bb0
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
2da9677
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
06b5395
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
33343f4
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
db88770
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
92c19b3
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
3290700
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
1895e90
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
9a25f71
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
34c122f
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
c661742
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
3ac70ed
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
017f3ce
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
3460bde
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
a786cc8
addressed some comments
mnajdova Oct 14, 2020
c2181c6
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
118861e
Removed emotion's theming guide and linked styled-components instead
mnajdova Oct 14, 2020
5b60ec9
Merge branch 'docs/interoperability-cleanup' of https://github.com/mn…
mnajdova Oct 14, 2020
fbff3c0
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
cfc0efc
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
3e46d88
specified emotion in the demo
mnajdova Oct 14, 2020
e3241cc
updated global css guide
mnajdova Oct 14, 2020
fa38925
Updated all depeer elements sections
mnajdova Oct 14, 2020
36f50ce
cleanups
mnajdova Oct 14, 2020
9657598
Matt's feedback
mnajdova Oct 14, 2020
f050dc9
changed theme syntax
mnajdova Oct 14, 2020
a453edd
theme provider wording
mnajdova Oct 14, 2020
29202c3
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
7a8dd4b
controlling priority section
mnajdova Oct 14, 2020
84c5840
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
91f2657
deeper elements section
mnajdova Oct 14, 2020
fd41fef
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
6935937
componentProps section
mnajdova Oct 14, 2020
737ef67
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
4b7e792
prettier
mnajdova Oct 14, 2020
1c0ca57
Merge branch 'docs/interoperability-cleanup' of https://github.com/mn…
mnajdova Oct 14, 2020
f6fc598
wip
mnajdova Oct 12, 2020
b81f588
styled-components, emotion, global
mnajdova Oct 13, 2020
547b10c
prettier
mnajdova Oct 13, 2020
23ba19f
css modules updated
mnajdova Oct 13, 2020
76f30db
fixed duplicated import
mnajdova Oct 13, 2020
83ff71d
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
7b8f67c
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
73bf359
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
f53c876
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
4ea9daa
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
f28e476
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
6369872
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
82098ef
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
0c06f38
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
03da879
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
2eaa50f
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
69c4904
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
00b4b7e
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
a1e5f2d
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
90f7016
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
90fa6a7
addressed some comments
mnajdova Oct 14, 2020
8ca5309
Removed emotion's theming guide and linked styled-components instead
mnajdova Oct 14, 2020
e676fa7
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
be6ee9a
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
8607637
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
0014193
specified emotion in the demo
mnajdova Oct 14, 2020
a87f906
updated global css guide
mnajdova Oct 14, 2020
9ae4d6d
Updated all depeer elements sections
mnajdova Oct 14, 2020
8e9a790
cleanups
mnajdova Oct 14, 2020
d9489fc
Matt's feedback
mnajdova Oct 14, 2020
298eb42
changed theme syntax
mnajdova Oct 14, 2020
69809ea
theme provider wording
mnajdova Oct 14, 2020
82ea13f
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
afb379c
controlling priority section
mnajdova Oct 14, 2020
b817a97
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
2095d6e
deeper elements section
mnajdova Oct 14, 2020
5c08358
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
a0c52f2
componentProps section
mnajdova Oct 14, 2020
efed276
prettier
mnajdova Oct 14, 2020
7c6a6f0
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 14, 2020
b4c8623
Merge branch 'next' into docs/interoperability-cleanup
mnajdova Oct 15, 2020
c144996
Merge branch 'docs/interoperability-cleanup' of https://github.com/mn…
mnajdova Oct 15, 2020
24fcc7b
Olivier's comments
mnajdova Oct 15, 2020
3d79425
fixed css strings
mnajdova Oct 15, 2020
969a319
prettier
mnajdova Oct 15, 2020
350ddd2
trigger build
mnajdova Oct 15, 2020
f80854f
small details
oliviertassinari Oct 15, 2020
e8696c6
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
ff362f8
updated css injection section
mnajdova Oct 15, 2020
fd05e55
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
99c41f4
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
84a015c
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
f32e303
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
be53e01
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
172160a
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
81ebeb6
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
be47315
Update docs/src/pages/guides/interoperability/interoperability.md
mnajdova Oct 15, 2020
49f495a
Updated codesandbox links
mnajdova Oct 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions docs/src/pages/guides/interoperability/EmotionCSS.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
/** @jsx jsx */
import { jsx, css } from '@emotion/core';
import Button from '@material-ui/core/Button';
import Slider from '@material-ui/lab/SliderStyled';
import Box from '@material-ui/core/Box';

export default function EmotionCSS() {
return (
<div>
<Button>Default</Button>
<Button
<Box width={300}>
<Slider defaultValue={30} />
<Slider
defaultValue={30}
css={css`
background-color: #6772e5;
color: #fff;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11),
0 1px 3px rgba(0, 0, 0, 0.08);
padding: 7px 14px;
&:hover {
background-color: #5469d4;
color: #20b2aa;
:hover {
color: #2e8b57;
}
`}
>
Customized
</Button>
</div>
/>
</Box>
);
}
26 changes: 11 additions & 15 deletions docs/src/pages/guides/interoperability/EmotionCSS.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
/** @jsx jsx */
import { jsx, css } from '@emotion/core';
import Button from '@material-ui/core/Button';
import Slider from '@material-ui/lab/SliderStyled';
import Box from '@material-ui/core/Box';

export default function EmotionCSS() {
return (
<div>
<Button>Default</Button>
<Button
<Box width={300}>
<Slider defaultValue={30} />
<Slider
defaultValue={30}
css={css`
background-color: #6772e5;
color: #fff;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11),
0 1px 3px rgba(0, 0, 0, 0.08);
padding: 7px 14px;
&:hover {
background-color: #5469d4;
color: #20b2aa;
:hover {
color: #2e8b57;
}
`}
>
Customized
</Button>
</div>
/>
</Box>
);
}
35 changes: 12 additions & 23 deletions docs/src/pages/guides/interoperability/EmotionTheme.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,35 @@
/** @jsx jsx */
import { jsx, css } from '@emotion/core';
import Button from '@material-ui/core/Button';
import { ThemeProvider } from 'emotion-theming';
import Slider from '@material-ui/lab/SliderStyled';
import {
createMuiTheme,
ThemeProvider as MuiThemeProvider,
ThemeProvider,
darken,
} from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';

const customTheme = createMuiTheme({
palette: {
primary: {
main: '#6772e5',
main: '#20b2aa',
},
},
});

export default function EmotionTheme() {
return (
<MuiThemeProvider theme={customTheme}>
<Box width={300}>
<ThemeProvider theme={customTheme}>
<Button>Default</Button>
<Button
<Slider
defaultValue={30}
css={(theme) => css`
background-color: ${theme.palette.primary.main};
color: #fff;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11),
0 1px 3px rgba(0, 0, 0, 0.08);
padding: 4px 10px;
font-size: 13px;
&:hover {
background-color: ${darken(theme.palette.primary.main, 0.2)};
}
${theme.breakpoints.up('sm')} {
font-size: 14px;
padding: 7px 14px;
color: ${theme.palette.primary.main};
:hover {
color: ${darken(theme.palette.primary.main, 0.2)};
}
`}
>
Customized
</Button>
/>
</ThemeProvider>
</MuiThemeProvider>
</Box>
);
}
35 changes: 12 additions & 23 deletions docs/src/pages/guides/interoperability/EmotionTheme.tsx
Original file line number Diff line number Diff line change
@@ -1,46 +1,35 @@
/** @jsx jsx */
import { jsx, css } from '@emotion/core';
import Button from '@material-ui/core/Button';
import { ThemeProvider } from 'emotion-theming';
import Slider from '@material-ui/lab/SliderStyled';
import {
createMuiTheme,
ThemeProvider as MuiThemeProvider,
ThemeProvider,
darken,
} from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';

const customTheme = createMuiTheme({
palette: {
primary: {
main: '#6772e5',
main: '#20b2aa',
},
},
});

export default function EmotionTheme() {
return (
<MuiThemeProvider theme={customTheme}>
<Box width={300}>
<ThemeProvider theme={customTheme}>
<Button>Default</Button>
<Button
<Slider
defaultValue={30}
css={(theme) => css`
background-color: ${theme.palette.primary.main};
color: #fff;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11),
0 1px 3px rgba(0, 0, 0, 0.08);
padding: 4px 10px;
font-size: 13px;
&:hover {
background-color: ${darken(theme.palette.primary.main, 0.2)};
}
${theme.breakpoints.up('sm')} {
font-size: 14px;
padding: 7px 14px;
color: ${theme.palette.primary.main};
:hover {
color: ${darken(theme.palette.primary.main, 0.2)};
}
`}
>
Customized
</Button>
/>
</ThemeProvider>
</MuiThemeProvider>
</Box>
);
}
25 changes: 11 additions & 14 deletions docs/src/pages/guides/interoperability/StyledComponents.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
import * as React from 'react';
import styled from 'styled-components';
import Button from '@material-ui/core/Button';
import NoSsr from '@material-ui/core/NoSsr';
import { experimentalStyled as styled } from '@material-ui/core/styles';
import Slider from '@material-ui/lab/SliderStyled';
import Box from '@material-ui/core/Box';

const StyledButton = styled(Button)`
background-color: #6772e5;
color: #fff;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08);
padding: 7px 14px;
&:hover {
background-color: #5469d4;
const SliderCustomized = styled(Slider)`
color: #20b2aa;
:hover {
color: #2e8b57;
}
`;

export default function StyledComponents() {
return (
<NoSsr>
<Button>Default</Button>
<StyledButton>Customized</StyledButton>
</NoSsr>
<Box width={300}>
<Slider defaultValue={30} />
<SliderCustomized defaultValue={30} />
</Box>
);
}
25 changes: 11 additions & 14 deletions docs/src/pages/guides/interoperability/StyledComponents.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
import * as React from 'react';
import styled from 'styled-components';
import Button from '@material-ui/core/Button';
import NoSsr from '@material-ui/core/NoSsr';
import { experimentalStyled as styled } from '@material-ui/core/styles';
import Slider from '@material-ui/lab/SliderStyled';
import Box from '@material-ui/core/Box';

const StyledButton = styled(Button)`
background-color: #6772e5;
color: #fff;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08);
padding: 7px 14px;
&:hover {
background-color: #5469d4;
const SliderCustomized = styled(Slider)`
color: #20b2aa;
:hover {
color: #2e8b57;
}
`;

export default function StyledComponents() {
return (
<NoSsr>
<Button>Default</Button>
<StyledButton>Customized</StyledButton>
</NoSsr>
<Box width={300}>
<Slider defaultValue={30} />
<SliderCustomized defaultValue={30} />
</Box>
);
}
30 changes: 14 additions & 16 deletions docs/src/pages/guides/interoperability/StyledComponentsDeep.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
import * as React from 'react';
import styled from 'styled-components';
import Button from '@material-ui/core/Button';
import NoSsr from '@material-ui/core/NoSsr';
import { experimentalStyled as styled } from '@material-ui/core/styles';
import Slider from '@material-ui/lab/SliderStyled';
import Box from '@material-ui/core/Box';

const StyledButton = styled(Button)`
background-color: #6772e5;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08);
padding: 7px 14px;
&:hover {
background-color: #5469d4;
const SliderCustomized = styled(Slider)`
color: #20b2aa;
:hover {
color: #2e8b57;
}
& .MuiButton-label {
color: #fff;
& .MuiSlider-thumb {
border-radius: 1px;
}
`;

export default function StyledComponentsDeep() {
export default function StyledComponents() {
return (
<NoSsr>
<Button>Default</Button>
<StyledButton>Customized</StyledButton>
</NoSsr>
<Box width={300}>
<Slider defaultValue={30} />
<SliderCustomized defaultValue={30} />
</Box>
);
}
30 changes: 14 additions & 16 deletions docs/src/pages/guides/interoperability/StyledComponentsDeep.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
import * as React from 'react';
import styled from 'styled-components';
import Button from '@material-ui/core/Button';
import NoSsr from '@material-ui/core/NoSsr';
import { experimentalStyled as styled } from '@material-ui/core/styles';
import Slider from '@material-ui/lab/SliderStyled';
import Box from '@material-ui/core/Box';

const StyledButton = styled(Button)`
background-color: #6772e5;
box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08);
padding: 7px 14px;
&:hover {
background-color: #5469d4;
const SliderCustomized = styled(Slider)`
color: #20b2aa;
:hover {
color: #2e8b57;
}
& .MuiButton-label {
color: #fff;
& .MuiSlider-thumb {
border-radius: 1px;
}
`;

export default function StyledComponentsDeep() {
export default function StyledComponents() {
return (
<NoSsr>
<Button>Default</Button>
<StyledButton>Customized</StyledButton>
</NoSsr>
<Box width={300}>
<Slider defaultValue={30} />
<SliderCustomized defaultValue={30} />
</Box>
);
}
Loading