Skip to content

[typescript] Fix keyof for typescript@2.9 #11669

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

Merged
pelotom merged 2 commits into from
Jun 1, 2018
Merged

[typescript] Fix keyof for typescript@2.9 #11669

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
658cc94
fix keyof for ts 2.9
Jun 1, 2018
23f0584
extends keyof any in omit
Jun 1, 2018
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
4 changes: 2 additions & 2 deletions packages/material-ui/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export { StyledComponentProps };
* certain `classes`, on which one can also set a top-level `className` and inline
* `style`.
*/
export type StandardProps<C, ClassKey extends string, Removals extends keyof C = never> = Omit<
Copy link
Copy Markdown
Collaborator

@pelotom pelotom Jun 1, 2018

Choose a reason for hiding this comment

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

Why not just redefine Omit to allow using any valid key type?

export type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;

Copy link
Copy Markdown
Contributor Author

@mctep mctep Jun 1, 2018

Choose a reason for hiding this comment

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

Yes. It is better. Thank you! 👍

export type StandardProps<C, ClassKey extends string, Removals extends Extract<keyof C, string> = never> = Omit<
C,
'classes' | Removals
> &
Expand Down Expand Up @@ -54,7 +54,7 @@ export type ConsistentWith<T, U> = Pick<U, keyof T & keyof U>;
*
* @internal
*/
export type Overwrite<T, U> = (U extends ConsistentWith<U, T> ? T : Omit<T, keyof U>) & U;
export type Overwrite<T, U> = (U extends ConsistentWith<U, T> ? T : Omit<T, Extract<keyof U, string>>) & U;

export namespace PropTypes {
type Alignment = 'inherit' | 'left' | 'center' | 'right' | 'justify';
Expand Down