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.

Sign up for GitHub

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

[typescript] Improve type definition for withStyles #8320

Merged
merged 12 commits into from
Sep 22, 2017
Merged

[typescript] Improve type definition for withStyles #8320

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4dae8dd
Improve type definition for withStyles
pelotom Sep 22, 2017
ac18a39
Capture the props enhancer type as WithStyles
pelotom Sep 22, 2017
b803e2b
Reexport WithStyles from styles
pelotom Sep 22, 2017
6b4aa42
Reexport WithStyles from root
pelotom Sep 22, 2017
ba603fe
Update tests
pelotom Sep 22, 2017
d24ec03
Provide defaults for Names type parameter for backwards compat
pelotom Sep 22, 2017
7fe86ae
Minor refactors
pelotom Sep 22, 2017
868c683
Default type argument
pelotom Sep 22, 2017
7e2b150
Merge branch 'v1-beta' into patch-2
pelotom Sep 22, 2017
6020006
Remove unnecessary StyleRules annotation
pelotom Sep 22, 2017
460ea63
Simplify definition of StyleRules, add semicolons
pelotom Sep 22, 2017
ba9139b
Use anonymous class in DecoratedComponent testcase
pelotom Sep 22, 2017
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
22 changes: 11 additions & 11 deletions test/typescript/styles.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,18 @@ const AllTheComposition = withTheme(
// Can't use withStyles effectively as a decorator in TypeScript
// due to https://github.com/Microsoft/TypeScript/issues/4881
// @withStyles(styles)
class DecoratableComponent extends React.Component<WithStyles<StyledComponentProps, 'root'>> {
render() {
const { classes, text } = this.props;
return (
<div className={classes.root}>
{text}
</div>
);
const DecoratedComponent = withStyles(styles)(
class extends React.Component<WithStyles<StyledComponentProps, 'root'>> {
render() {
const { classes, text } = this.props;
return (
<div className={classes.root}>
{text}
</div>
);
}
}
}

const DecoratedComponent = withStyles(styles)(DecoratableComponent);
);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is currently the least painful way in TypeScript that you can use a type-mutating decorator on a class.


// no 'classes' property required at element creation time (#8267)
<DecoratedComponent text="foo" />