Transform Todo feature, ServiceBarTargetUrl, ServiceIcon, TeamDashboard, Slider, Loader & WorkspaceSwitchningIndicator into ts (#782)

3 files changed, 44 insertions, 46 deletions

diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
deleted file mode 100644
index 20945d191..000000000
--- a/src/components/ui/WebviewLoader/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import injectSheet from 'react-jss';
-import { defineMessages, injectIntl } from 'react-intl';
-
-import FullscreenLoader from '../FullscreenLoader';
-import styles from './styles';
-
-const messages = defineMessages({
-  loading: {
-    id: 'service.webviewLoader.loading',
-    defaultMessage: 'Loading {service}',
-  },
-});
-
-class WebviewLoader extends Component {
-  static propTypes = {
-    name: PropTypes.string.isRequired,
-    classes: PropTypes.object.isRequired,
-  };
-
-  render() {
-    const { classes, name } = this.props;
-    const { intl } = this.props;
-    return (
-      <FullscreenLoader
-        className={classes.component}
-        title={`${intl.formatMessage(messages.loading, { service: name })}`}
-      />
-    );
-  }
-}
-
-export default injectIntl(
-  injectSheet(styles, { injectTheme: true })(observer(WebviewLoader)),
-);
diff --git a/src/components/ui/WebviewLoader/index.tsx b/src/components/ui/WebviewLoader/index.tsx
new file mode 100644
index 000000000..81923b6ca
--- /dev/null
+++ b/src/components/ui/WebviewLoader/index.tsx
@@ -0,0 +1,44 @@
+import { Component, ReactElement } from 'react';
+import { observer } from 'mobx-react';
+import injectSheet, { WithStylesProps } from 'react-jss';
+import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import FullscreenLoader from '../FullscreenLoader';
+
+const messages = defineMessages({
+  loading: {
+    id: 'service.webviewLoader.loading',
+    defaultMessage: 'Loading {service}',
+  },
+});
+
+const styles = theme => ({
+  component: {
+    background: theme.colorWebviewLoaderBackground,
+    padding: 20,
+    width: 'auto',
+    margin: [0, 'auto'],
+    borderRadius: 6,
+  },
+});
+
+interface IProps extends WithStylesProps<typeof styles>, WrappedComponentProps {
+  name: string;
+  loaded?: boolean;
+}
+
+class WebviewLoader extends Component<IProps> {
+  render(): ReactElement {
+    const { classes, name, loaded = false, intl } = this.props;
+    return (
+      <FullscreenLoader
+        className={classes.component}
+        title={`${intl.formatMessage(messages.loading, { service: name })}`}
+        loaded={loaded}
+      />
+    );
+  }
+}
+
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WebviewLoader)),
+);
diff --git a/src/components/ui/WebviewLoader/styles.ts b/src/components/ui/WebviewLoader/styles.ts
deleted file mode 100644
index dbd75db8a..000000000
--- a/src/components/ui/WebviewLoader/styles.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export default theme => ({
-  component: {
-    background: theme.colorWebviewLoaderBackground,
-    padding: 20,
-    width: 'auto',
-    margin: [0, 'auto'],
-    borderRadius: 6,
-  },
-});