Skip to content

Baseline/mui v3 v4 #34

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

Draft
wants to merge 10 commits into
base: baseline/master
Choose a base branch
from
Draft

Baseline/mui v3 v4 #34

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
02f8a81
WIP: @material-ui updated to v4 in package.json; Initial types and ch…
liringlas Jul 8, 2020
cee95b9
flow-typed mui v4 small fixes
liringlas Jul 8, 2020
d596269
WIP flow-typed, Theme, rex-action-application updated
liringlas Jul 10, 2020
e16180d
Removed theme.definitonList from code
liringlas Jul 10, 2020
703f12a
Fixed Theme type in rapid, updated flow-typed v4
liringlas Jul 10, 2020
2325506
Updated theme.spacing v3 -> theme.spacing(n) v4 across the codebase; …
liringlas Jul 10, 2020
18b3abb
WIP Updated mui v4 types, fixed props in code
liringlas Jul 13, 2020
cd2cf02
Updated mui v4 typings
liringlas Jul 14, 2020
f4b5bec
Grid spacing fix
liringlas Jul 15, 2020
82e52df
mui v4 flow-typed update
liringlas Jul 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
Prev Previous commit
Next Next commit
Updated mui v4 typings
  • Loading branch information
@liringlas
liringlas committed Jul 14, 2020
commit cd2cf02d63a54a36dc910adf23d2ab66dbfce9f5
19 changes: 12 additions & 7 deletions js/flow-typed/material-ui-core-4.x.x.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ declare module "@material-ui/styles/withStyles" {
declare module "@material-ui/styles/withTheme" {
import type { AbstractComponent } from "react";

declare export function withTheme<P = {}>(
C: AbstractComponent<P>,
): AbstractComponent<P>;
declare export default function withTheme(
C: AbstractComponent<any>,
): AbstractComponent<any>;
}

declare module "@material-ui/styles/DefaultTheme" {
Expand Down Expand Up @@ -745,6 +745,8 @@ declare module "@material-ui/core/colors" {
}

declare module "@material-ui/core/styles" {
import type { AbstractComponent } from "react";

import typeof _createMuiTheme from "@material-ui/core/styles/createMuiTheme";
import type {
Theme as MuiTheme,
Expand All @@ -769,7 +771,9 @@ declare module "@material-ui/core/styles" {
declare export var MuiThemeProvider: _MuiThemeProvider;
declare export var createMuiTheme: _createMuiTheme;
declare export var withStyles: _withStyles;
declare export var withTheme: _withTheme;
declare export function withTheme(
C: AbstractComponent<any>,
): AbstractComponent<any>;
declare export var createGenerateClassName: _createGenerateClassName;
declare export var jssPreset: _jssPreset;
}
Expand All @@ -782,10 +786,11 @@ declare module "@material-ui/core/styles/withStyles" {
}

declare module "@material-ui/core/styles/withTheme" {
import typeof _withTheme from "@material-ui/styles/withTheme";
import type { AbstractComponent } from "react";

declare export var withTheme: _withTheme;
declare export default withTheme;
declare export default function withTheme(
C: AbstractComponent<any>,
): AbstractComponent<any>;
}

declare module "@material-ui/core/styles/createMuiTheme" {
Expand Down