From f2cc0eaa2a018f64a747f6e65834437733e268f8 Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Sun, 8 Apr 2018 10:28:46 +0200
Subject: [PATCH] Make everything compatible with the latest material-ui
 version

---
 src/components/SideBar.js           | 6 +++---
 src/components/TopBar.js            | 2 +-
 src/components/UiItemList/UiItem.js | 6 ++++--
 src/components/UiItemList/index.js  | 2 +-
 webpack.prod.js                     | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/SideBar.js b/src/components/SideBar.js
index f938fe0..505c582 100644
--- a/src/components/SideBar.js
+++ b/src/components/SideBar.js
@@ -31,7 +31,7 @@ class SideBar extends React.Component<SideBarProps & Classes, SideBarState> {
   static styles(_theme: Object): Object {
     return {
       drawerPaper: {
-        width: 320
+        width: 340
       },
       flex: {
         flex: 1
@@ -49,13 +49,13 @@ class SideBar extends React.Component<SideBarProps & Classes, SideBarState> {
         anchor="right"
         onRequestClose={this.close}
         classes={{paper: this.props.classes.drawerPaper}}
-        type="persistent"
+        variant="persistent"
       >
         <AppBar position="static">
           <Toolbar>
             {this.props.icon == null
               || renderIcon(this.props.icon, "mdi-36px")}
-            <Typography type="title" className={this.props.classes.flex}>
+            <Typography variant="title" className={this.props.classes.flex}>
               {this.props.control == null || this.props.control.name}
             </Typography>
             <IconButton onClick={this.close.bind(this)}>
diff --git a/src/components/TopBar.js b/src/components/TopBar.js
index 9fe4243..1e3455d 100644
--- a/src/components/TopBar.js
+++ b/src/components/TopBar.js
@@ -25,7 +25,7 @@ export default class TopBar extends React.Component<TopBarProps, TopBarState> {
       <AppBar position="static">
         <Toolbar>
           {this.renderConnectionIndicator()}
-          <Typography type="title">{this.props.title}</Typography>
+          <Typography variant="title">{this.props.title}</Typography>
         </Toolbar>
       </AppBar>
     );
diff --git a/src/components/UiItemList/UiItem.js b/src/components/UiItemList/UiItem.js
index f2dedfb..36fc687 100644
--- a/src/components/UiItemList/UiItem.js
+++ b/src/components/UiItemList/UiItem.js
@@ -134,7 +134,8 @@ export class Toggle extends UiControl<UIToggle> {
         <Switch label={this.props.item.text}
           checked={this.isToggled()}
           onChange={this.runPrimaryAction}
-          disabled={!this.isEnabled()} />
+          disabled={!this.isEnabled()}
+          color="primary" />
       </ListItemSecondaryAction>
     ];
   }
@@ -195,7 +196,8 @@ export class Link extends UiItem<UILink> {
 
   render() {
     return (
-      <Button raised
+      <Button
+        variant="raised"
         onClick={this.runPrimaryAction}
         color="primary"
         disabled={!this.isEnabled()}
diff --git a/src/components/UiItemList/index.js b/src/components/UiItemList/index.js
index a267629..9302ce4 100644
--- a/src/components/UiItemList/index.js
+++ b/src/components/UiItemList/index.js
@@ -123,7 +123,7 @@ export default class UiItemList extends React.Component<UiItemListProps> {
               on(control.delayedApply)();
             }}
             onDragStop={on(false)}
-            style={{width: 100}}
+            style={{width: 100, marginTop: 54}}
           /></MuiThemeProvider>
       </ListItemSecondaryAction>
     ];
diff --git a/webpack.prod.js b/webpack.prod.js
index 4c333b3..7f4896a 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -41,7 +41,7 @@ module.exports = env => merge(common, {
         'NODE_ENV': JSON.stringify('production')
       }
     }),
-    new LodashModuleReplacementPlugin(),
+ //   new LodashModuleReplacementPlugin(),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.HashedModuleIdsPlugin(),
     new webpack.optimize.AggressiveMergingPlugin()