Skip to content

Commit

Permalink
fix: more specific interfaces and index signatures
Browse files Browse the repository at this point in the history
A more specific interface can't be assigned to a more generic
one if the generic one has an index signature. Workaround
used from microsoft/TypeScript#15300 (comment)
  • Loading branch information
eps1lon committed Feb 1, 2020
1 parent 77e0123 commit 2cba1fb
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/ClippedDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const useStyles = makeStyles(theme => ({
flexGrow: 1,
padding: theme.spacing(3),
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
}));

export default function ClippedDrawer() {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/ClippedDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const useStyles = makeStyles((theme: Theme) =>
flexGrow: 1,
padding: theme.spacing(3),
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
}),
);

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/PermanentDrawerLeft.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const useStyles = makeStyles(theme => ({
drawerPaper: {
width: drawerWidth,
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
content: {
flexGrow: 1,
backgroundColor: theme.palette.background.default,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/PermanentDrawerLeft.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const useStyles = makeStyles((theme: Theme) =>
drawerPaper: {
width: drawerWidth,
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
content: {
flexGrow: 1,
backgroundColor: theme.palette.background.default,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/PermanentDrawerRight.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const useStyles = makeStyles(theme => ({
drawerPaper: {
width: drawerWidth,
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
content: {
flexGrow: 1,
backgroundColor: theme.palette.background.default,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/PermanentDrawerRight.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const useStyles = makeStyles((theme: Theme) =>
drawerPaper: {
width: drawerWidth,
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
content: {
flexGrow: 1,
backgroundColor: theme.palette.background.default,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/ResponsiveDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const useStyles = makeStyles(theme => ({
display: 'none',
},
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
drawerPaper: {
width: drawerWidth,
},
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/drawers/ResponsiveDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const useStyles = makeStyles((theme: Theme) =>
display: 'none',
},
},
toolbar: theme.mixins.toolbar,
toolbar: { ...theme.mixins.toolbar },
drawerPaper: {
width: drawerWidth,
},
Expand Down

0 comments on commit 2cba1fb

Please sign in to comment.