From 97ca2e9d94fabe2b22c20fd8e2331d20a28b23e5 Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Sun, 2 Sep 2018 13:24:55 +0200
Subject: [PATCH] Convert pure Components to functions

---
 src/components/SideBar.js | 82 ++++++++++++++++-----------------------
 src/components/TopBar.js  | 43 ++++++++------------
 2 files changed, 49 insertions(+), 76 deletions(-)

diff --git a/src/components/SideBar.js b/src/components/SideBar.js
index afea280..94e1570 100644
--- a/src/components/SideBar.js
+++ b/src/components/SideBar.js
@@ -21,57 +21,41 @@ export type SideBarProps = {
   children?: React.Node
 };
 
-export type SideBarState = {
-};
-
 type Props = SideBarProps & Classes;
 
-class SideBar extends React.PureComponent<Props, SideBarState> {
-  constructor(props: Props) {
-    super(props);
-  }
+const SideBar = (props: Props) => (
+  <Drawer open={props.open}
+    anchor="right"
+    onClose={props.onCloseRequest()}
+    classes={{paper: props.classes.drawerPaper}}
+    variant="persistent"
+  >
+    <AppBar position="static">
+      <Toolbar>
+        <span>
+          {props.icon == null || renderRawIcon(props.icon, "mdi-36px")}
+        </span>
+        <Typography variant="title" className={props.classes.flex}>
+          {props.control == null ? "" : props.control.name}
+        </Typography>
+        <IconButton onClick={props.onCloseRequest}>
+          <i className="mdi mdi-close mdi-36px"></i>
+        </IconButton>
+      </Toolbar>
+    </AppBar>
+    <List id="drawer_uiComponents">
+      <React.Fragment>{props.children}</React.Fragment>
+    </List>
+  </Drawer>
+);
 
-  static styles(): Object {
-    return {
-      drawerPaper: {
-        width: 340
-      },
-      flex: {
-        flex: 1
-      }
-    };
+const styles = {
+  drawerPaper: {
+    width: 340
+  },
+  flex: {
+    flex: 1
   }
+};
 
-  close() {
-    this.props.onCloseRequest();
-  }
-
-  render() {
-    return (
-      <Drawer open={this.props.open}
-        anchor="right"
-        onClose={this.close}
-        classes={{paper: this.props.classes.drawerPaper}}
-        variant="persistent"
-      >
-        <AppBar position="static">
-          <Toolbar>
-            <span>{this.props.icon == null
-              || renderRawIcon(this.props.icon, "mdi-36px")}</span>
-            <Typography variant="title" className={this.props.classes.flex}>
-              {this.props.control == null ? "" : this.props.control.name}
-            </Typography>
-            <IconButton onClick={this.close.bind(this)}>
-              <i className="mdi mdi-close mdi-36px"></i>
-            </IconButton>
-          </Toolbar>
-        </AppBar>
-        <List id="drawer_uiComponents">
-          <React.Fragment>{this.props.children}</React.Fragment>
-        </List>
-      </Drawer>
-    );
-  }
-}
-
-export default withStyles(SideBar.styles)(SideBar);
+export default withStyles(styles)(SideBar);
diff --git a/src/components/TopBar.js b/src/components/TopBar.js
index 0d4953f..c40d139 100644
--- a/src/components/TopBar.js
+++ b/src/components/TopBar.js
@@ -11,33 +11,22 @@ export type TopBarProps = {
   connected: boolean
 };
 
-export type TopBarState = {
-
+const renderConnectionIndicator = (connected: boolean) => {
+  if (connected) {
+    return (<i style={{fontSize: 48}} className="mdi mdi-map"></i>);
+  }
+  return (
+    <CircularProgress size={48} style={{color: "rgba(0, 0, 0, 0.54)"}} />
+  );
 };
 
-export default class TopBar
-  extends React.PureComponent<TopBarProps, TopBarState> {
-  constructor(props: TopBarProps) {
-    super(props);
-  }
+const TopBar = (props: TopBarProps) => (
+  <AppBar position="static">
+    <Toolbar>
+      {renderConnectionIndicator(props.connected)}
+      <Typography variant="title">{props.title}</Typography>
+    </Toolbar>
+  </AppBar>
+);
 
-  render() {
-    return (
-      <AppBar position="static">
-        <Toolbar>
-          {this.renderConnectionIndicator()}
-          <Typography variant="title">{this.props.title}</Typography>
-        </Toolbar>
-      </AppBar>
-    );
-  }
-
-  renderConnectionIndicator() {
-    if (this.props.connected) {
-      return (<i style={{fontSize: 48}} className="mdi mdi-map"></i>);
-    }
-    return (
-      <CircularProgress size={48} style={{color: "rgba(0, 0, 0, 0.54)"}} />
-    );
-  }
-}
+export default TopBar;