Skip to content
This repository was archived by the owner on Jun 1, 2020. It is now read-only.

Commit 1e3ad8d

Browse files
committed
Merge branch 'master' into smrsan76-master
2 parents 1cac33f + 72552a3 commit 1e3ad8d

File tree

4 files changed

+1828
-1870
lines changed

4 files changed

+1828
-1870
lines changed

example/src/menu/Menu.tsx

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,33 @@ class RawMenuAppBar extends React.Component<any, any> {
2727
const { drawerOpen } = this.state;
2828

2929
return (
30-
<AppBar position="static" className={classes.toolbar}>
31-
<Toolbar>
32-
<Hidden only={['lg', 'xl']}>
33-
<IconButton
34-
className={classes.menuButton}
35-
color="inherit"
36-
aria-label="Menu"
37-
onClick={this.toggleDrawer(true)}
38-
>
39-
<MenuIcon />
40-
</IconButton>
41-
</Hidden>
42-
<div className={classes.flexCtr}>
43-
<Typography variant="h6" color="inherit">
44-
{pkg.name}
45-
</Typography>
46-
</div>
47-
</Toolbar>
30+
<>
31+
<AppBar position="static" className={classes.toolbar}>
32+
<Toolbar>
33+
<Hidden only={['lg', 'xl']}>
34+
<IconButton
35+
className={classes.menuButton}
36+
color="inherit"
37+
aria-label="Menu"
38+
onClick={this.toggleDrawer(true)}
39+
>
40+
<MenuIcon />
41+
</IconButton>
42+
</Hidden>
43+
<div className={classes.flexCtr}>
44+
<Typography variant="h6" color="inherit">
45+
{pkg.name}
46+
</Typography>
47+
</div>
48+
</Toolbar>
49+
</AppBar>
4850
<LeftDrawer
4951
open={drawerOpen}
5052
toggleDrawer={this.toggleDrawer}
5153
onSelectMenuItem={onSelectMenuItem}
5254
selectedMenuItem={selectedMenuItem}
5355
/>
54-
</AppBar>
56+
</>
5557
);
5658
}
5759
}

example/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4855,9 +4855,9 @@ safe-regex@^1.1.0:
48554855
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
48564856

48574857
safer-eval@^1.3.0:
4858-
version "1.3.3"
4859-
resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.3.tgz#0309e9fcc0609e66c1b599fd0d4772132b260ca8"
4860-
integrity sha512-j/qb0rtnwTp5V1D7nR0Ns/14HU8OiHPaoZNJhM+Lfmv1nbXZCXG9LHaVW157agEocdSVAeeRNddK/yuWfalzGQ==
4858+
version "1.3.5"
4859+
resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.5.tgz#a75a1193a4e1dfadd34a8c87ad08e7b978c494b1"
4860+
integrity sha512-BJ//K2Y+EgCbOHEsDGS5YahYBcYy7JcFpKDo2ba5t4MnOGHYtk7HvQkcxTDFvjQvJ0CRcdas/PyF+gTTCay+3w==
48614861
dependencies:
48624862
clones "^1.2.0"
48634863

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
"np": "^5.0.3",
3535
"npm-run-all": "^4.1.5",
3636
"prettier": "^1.18.2",
37-
"pretty-quick": "^1.11.1",
37+
"pretty-quick": "^2.0.0",
3838
"react": "^16.8.6",
3939
"react-dom": "^16.8.6",
4040
"react-jsonschema-form": "^1.6.1",
41-
"rimraf": "^2.6.3",
42-
"tsdx": "^0.7.2",
41+
"rimraf": "^3.0.0",
42+
"tsdx": "^0.10.5",
4343
"tslib": "^1.10.0",
4444
"typescript": "^3.5.3"
4545
},

0 commit comments

Comments
 (0)