From bf98ff90a7ad9fad79f75a2215108dcfdaa02ed2 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Tue, 28 Jan 2020 17:00:00 +0300
Subject: feat!: install Typescript, migrate Window to .tsx

---
 src/lib/components/Window/Window.js                | 55 -------------------
 src/lib/components/Window/Window.tsx               | 63 ++++++++++++++++++++++
 src/lib/components/Window/WindowSurface.tsx        | 46 ++++++++++++++++
 .../Window/WindowSurface/WindowSurface.js          | 36 -------------
 src/lib/components/Window/types.d.ts               | 11 ++++
 5 files changed, 120 insertions(+), 91 deletions(-)
 delete mode 100644 src/lib/components/Window/Window.js
 create mode 100644 src/lib/components/Window/Window.tsx
 create mode 100644 src/lib/components/Window/WindowSurface.tsx
 delete mode 100644 src/lib/components/Window/WindowSurface/WindowSurface.js
 create mode 100644 src/lib/components/Window/types.d.ts

(limited to 'src/lib')

diff --git a/src/lib/components/Window/Window.js b/src/lib/components/Window/Window.js
deleted file mode 100644
index 027213f..0000000
--- a/src/lib/components/Window/Window.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-
-import { Typography, Divider, makeStyles } from '@material-ui/core';
-
-import WindowSurface from './WindowSurface/WindowSurface';
-
-
-const useStyles = makeStyles(theme => ({
-  header: {
-    padding: theme.spacing(1, 0, 1, 2),
-    background: theme.palette.background.elevation2,
-  },
-}));
-
-
-const Window = ({ type, name, children }) => {
-  const classes = useStyles();
-
-  const size = {
-    height: '85vh',
-  };
-
-  const position = {
-    bottom: '3vh',
-  };
-
-  if (type === 'primary') {
-    size.width = '63vw';
-    position.left = '2vw';
-  } else if (type === 'secondary') {
-    size.width = '31vw';
-    position.right = '2vw';
-  } else if (type === 'mono') {
-    position.left = '2vw';
-    position.right = '2vw';
-  }
-
-  return (
-    <WindowSurface
-      size={size}
-      position={position}
-    >
-      {name &&
-      <div>
-        <Typography variant="h5" className={classes.header}>{name}</Typography>
-        <Divider />
-      </div>
-      }
-      {children}
-    </WindowSurface>
-  );
-};
-
-
-export default Window;
diff --git a/src/lib/components/Window/Window.tsx b/src/lib/components/Window/Window.tsx
new file mode 100644
index 0000000..4821cb3
--- /dev/null
+++ b/src/lib/components/Window/Window.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+
+import { Typography, Divider, makeStyles } from '@material-ui/core';
+
+import WindowSurface from './WindowSurface';
+import { SurfaceSize, SurfacePosition } from './types';
+
+
+interface PropTypes {
+  type: 'primary' | 'secondary' | 'mono';
+  name?: string;
+  children?: any;
+}
+
+
+const useStyles = makeStyles((theme: any) => ({
+  header: {
+    padding: theme.spacing(1, 0, 1, 2),
+    background: theme.palette.background.elevation2,
+  },
+}));
+
+
+const Window = (props: PropTypes) => {
+  const classes = useStyles();
+  const { type, name, children } = props;
+
+  const size: SurfaceSize = {
+    height: '85vh',
+  };
+
+  const position: SurfacePosition = {
+    bottom: '3vh',
+  };
+
+  if (type === 'primary') {
+    size.width = '63vw';
+    position.left = '2vw';
+  } else if (type === 'secondary') {
+    size.width = '31vw';
+    position.right = '2vw';
+  } else if (type === 'mono') {
+    position.left = '2vw';
+    position.right = '2vw';
+  }
+
+  return (
+    <WindowSurface
+      size={size}
+      position={position}
+    >
+      {name &&
+      <div>
+        <Typography variant="h5" className={classes.header}>{name}</Typography>
+        <Divider />
+      </div>
+      }
+      {children}
+    </WindowSurface>
+  );
+};
+
+export default Window;
diff --git a/src/lib/components/Window/WindowSurface.tsx b/src/lib/components/Window/WindowSurface.tsx
new file mode 100644
index 0000000..aaaa984
--- /dev/null
+++ b/src/lib/components/Window/WindowSurface.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+
+import { Paper, makeStyles } from '@material-ui/core';
+
+import { SurfaceSize, SurfacePosition } from './types';
+
+
+interface PropTypes {
+  size: SurfaceSize;
+  position: SurfacePosition;
+  children?: any;
+}
+
+
+const useStyles = makeStyles((theme: any) => ({
+  surface: {
+    position: 'absolute',
+    display: 'flex',
+    flexDirection: 'column',
+    overflowY: 'auto',
+    scrollbarColor: `${theme.palette.secondary.dark} ${theme.palette.secondary.light}`,
+
+    '& a.MuiTypography-root': {
+      color: theme.palette.primary.light,
+    },
+  }
+}));
+
+
+const WindowSurface = (props: PropTypes) => {
+  const classes = useStyles();
+  const { size, position, children } = props;
+
+  return (
+    <Paper
+      variant="outlined"
+      style={{...size, ...position}}
+      className={classes.surface}
+    >
+      {children}
+    </Paper>
+  )
+};
+
+
+export default WindowSurface;
diff --git a/src/lib/components/Window/WindowSurface/WindowSurface.js b/src/lib/components/Window/WindowSurface/WindowSurface.js
deleted file mode 100644
index 7859bf6..0000000
--- a/src/lib/components/Window/WindowSurface/WindowSurface.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-
-import { Paper, makeStyles } from '@material-ui/core';
-
-
-const useStyles = makeStyles(theme => ({
-  surface: {
-    position: 'absolute',
-    display: 'flex',
-    flexDirection: 'column',
-    overflowY: 'auto',
-    scrollbarColor: `${theme.palette.secondary.dark} ${theme.palette.secondary.light}`,
-
-    '& a.MuiTypography-root': {
-      color: theme.palette.primary.light,
-    },
-  }
-}));
-
-
-const WindowSurface = ({ size, position, children }) => {
-  const classes = useStyles();
-
-  return (
-    <Paper
-      variant="outlined"
-      style={{...size, ...position}}
-      className={classes.surface}
-    >
-      {children}
-    </Paper>
-  )
-};
-
-
-export default WindowSurface;
diff --git a/src/lib/components/Window/types.d.ts b/src/lib/components/Window/types.d.ts
new file mode 100644
index 0000000..9e18fe3
--- /dev/null
+++ b/src/lib/components/Window/types.d.ts
@@ -0,0 +1,11 @@
+export interface SurfaceSize {
+  height: string;
+  width?: string;
+}
+
+export interface SurfacePosition {
+  bottom: string;
+  left?: string;
+  right?: string;
+}
+
-- 
cgit v1.2.3