From 06044d9460b1c646d3e71b7d7c92ecd6f0456ce7 Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Wed, 27 Feb 2019 18:33:29 +0000
Subject: [PATCH] Convert ext popup to typescript

---
 ext/src/global.d.ts                    |   5 +
 ext/src/options/index.tsx              |   4 +-
 ext/src/popup/{index.jsx => index.tsx} | 151 +++++++++++++++----------
 ext/src/types.ts                       |  13 +++
 ext/webpack.config.js                  |   2 +-
 5 files changed, 111 insertions(+), 64 deletions(-)
 rename ext/src/popup/{index.jsx => index.tsx} (70%)
 create mode 100644 ext/src/types.ts

diff --git a/ext/src/global.d.ts b/ext/src/global.d.ts
index 54ba330..6c6bb32 100644
--- a/ext/src/global.d.ts
+++ b/ext/src/global.d.ts
@@ -15,6 +15,11 @@ declare namespace browser.runtime {
     interface Port {
         error: { message: string };
     }
+
+    function connect (connectInfo: {
+            name?: string
+          , includeTlsChannelId?: boolean
+      }): browser.runtime.Port;
 }
 
 // Allow default attribute on <button>
diff --git a/ext/src/options/index.tsx b/ext/src/options/index.tsx
index d3f2e8d..9dd750b 100644
--- a/ext/src/options/index.tsx
+++ b/ext/src/options/index.tsx
@@ -51,7 +51,7 @@ interface OptionsAppState {
     hasSaved: boolean;
 }
 
-class App extends Component<{}, OptionsAppState> {
+class OptionsApp extends Component<{}, OptionsAppState> {
     private form: HTMLFormElement;
 
     constructor (props: {}) {
@@ -358,5 +358,5 @@ class App extends Component<{}, OptionsAppState> {
 
 
 ReactDOM.render(
-    <App />
+    <OptionsApp />
   , document.querySelector("#root"));
diff --git a/ext/src/popup/index.jsx b/ext/src/popup/index.tsx
similarity index 70%
rename from ext/src/popup/index.jsx
rename to ext/src/popup/index.tsx
index 2dfb330..ebd31f2 100755
--- a/ext/src/popup/index.jsx
+++ b/ext/src/popup/index.tsx
@@ -1,9 +1,11 @@
+/* tslint:disable:max-line-length */
 "use strict";
 
 import React, { Component } from "react";
-import ReactDOM             from "react-dom";
+import ReactDOM from "react-dom";
 
 import { getNextEllipsis } from "../lib/utils";
+import * as types from "../types";
 
 const _ = browser.i18n.getMessage;
 
@@ -19,16 +21,25 @@ browser.runtime.getPlatformInfo()
     });
 
 
-let winWidth = 350;
+const winWidth = 350;
 let winHeight = 200;
 
-let frameHeight;
-let frameWidth;
+let frameHeight: number;
+let frameWidth: number;
 
 
-class App extends Component {
-    constructor () {
-        super();
+interface PopupAppState {
+    receivers: types.Receiver[];
+    selectedMedia: string;
+    isLoading: boolean;
+}
+
+class PopupApp extends Component<{}, PopupAppState> {
+    private port: browser.runtime.Port;
+    private win: browser.windows.Window;
+
+    constructor (props: {}) {
+        super(props);
 
         this.state = {
             receivers: []
@@ -42,9 +53,57 @@ class App extends Component {
             frameHeight = win.height - window.innerHeight;
             frameWidth = win.width - window.innerWidth;
         });
+
+        this.onSelectChange = this.onSelectChange.bind(this);
+        this.onCast = this.onCast.bind(this);
     }
 
-    async setPort (shimTabId, shimFrameId) {
+    componentDidMount () {
+        const backgroundPort = browser.runtime.connect({
+            name: "popup"
+        });
+
+        backgroundPort.onMessage.addListener((message: types.Message) => {
+            if (message.subject === "popup:/assignShim") {
+                this.setPort(message.data.tabId
+                           , message.data.frameId);
+            }
+        });
+    }
+
+    render () {
+        const shareMedia =
+                this.state.selectedMedia === "tab"
+             || this.state.selectedMedia === "screen";
+
+        return (
+            <div>
+                <div className="media-select">
+                    Cast
+                    <select value={ this.state.selectedMedia }
+                            onChange={ this.onSelectChange }
+                            className="media-select-dropdown">
+                        <option value="app" disabled={ shareMedia }>this site's app</option>
+                        <option value="tab" disabled={ !shareMedia }>Tab</option>
+                        <option value="screen" disabled={ !shareMedia }>Screen</option>
+                    </select>
+                    to:
+                </div>
+                <ul className="receivers">
+                    { this.state.receivers.map((receiver, i) => {
+                        return (
+                           <Receiver receiver={ receiver }
+                                     onCast={ this.onCast }
+                                     isLoading={ this.state.isLoading }
+                                     key={ i }/>
+                        );
+                    })}
+                </ul>
+            </div>
+        );
+    }
+
+    private async setPort (shimTabId: number, shimFrameId: number) {
         if (this.port) {
             this.port.disconnect();
         }
@@ -58,7 +117,7 @@ class App extends Component {
             subject: "shim:/popupReady"
         });
 
-        this.port.onMessage.addListener(message => {
+        this.port.onMessage.addListener((message: types.Message) => {
             switch (message.subject) {
                 case "popup:/populateReceiverList": {
                     this.setState({
@@ -86,20 +145,7 @@ class App extends Component {
         });
     }
 
-    componentDidMount () {
-        const backgroundPort = browser.runtime.connect({
-            name: "popup"
-        });
-
-        backgroundPort.onMessage.addListener(message => {
-            if (message.subject === "popup:/assignShim") {
-                this.setPort(message.data.tabId
-                           , message.data.frameId);
-            }
-        });
-    }
-
-    onCast (receiver) {
+    private onCast (receiver: types.Receiver) {
         this.setState({
             isLoading: true
         });
@@ -109,57 +155,40 @@ class App extends Component {
           , data: {
                 receiver
               , selectedMedia: this.state.selectedMedia
+              , a: 5
             }
         });
     }
 
-    onSelectChange (ev) {
+    private onSelectChange (ev: React.ChangeEvent<HTMLSelectElement>) {
         this.setState({
             selectedMedia: ev.target.value
         });
     }
-
-    render () {
-        const shareMedia =
-                this.state.selectedMedia === "tab"
-             || this.state.selectedMedia === "screen";
-
-        return (
-            <div>
-                <div className="media-select">
-                    Cast
-                    <select value={this.state.selectedMedia}
-                            onChange={this.onSelectChange.bind(this)}
-                            className="media-select-dropdown">
-                        <option value="app" disabled={shareMedia}>this site's app</option>
-                        <option value="tab" disabled={!shareMedia}>Tab</option>
-                        <option value="screen" disabled={!shareMedia}>Screen</option>
-                    </select>
-                    to:
-                </div>
-                <ul className="receivers">
-                    { this.state.receivers.map((receiver, i) => {
-                        return (
-                           <Receiver receiver={receiver}
-                                     onCast={this.onCast.bind(this)}
-                                     isLoading={this.state.isLoading}
-                                     key={i}/>
-                        );
-                    })}
-                </ul>
-            </div>
-        );
-    }
 }
 
-class Receiver extends Component {
-    constructor () {
-        super();
+
+interface ReceiverProps {
+    receiver: types.Receiver;
+    isLoading: boolean;
+    onCast (receiver: types.Receiver): void;
+}
+
+interface ReceiverState {
+    ellipsis: string;
+    isLoading: boolean;
+}
+
+class Receiver extends Component<ReceiverProps, ReceiverState> {
+    constructor (props: ReceiverProps) {
+        super(props);
 
         this.state = {
             isLoading: false
           , ellipsis: ""
         };
+
+        this.onClick = this.onClick.bind(this);
     }
 
     onClick () {
@@ -191,7 +220,7 @@ class Receiver extends Component {
                         `- ${this.props.receiver.currentApp}` }
                 </div>
                 <button className="receiver-connect"
-                        onClick={this.onClick.bind(this)}
+                        onClick={ this.onClick }
                         disabled={this.props.isLoading}>
                     { this.state.isLoading
                         ? _("popupCastingButtonLabel") +
@@ -207,5 +236,5 @@ class Receiver extends Component {
 
 
 ReactDOM.render(
-    <App />
+    <PopupApp />
   , document.querySelector("#root"));
diff --git a/ext/src/types.ts b/ext/src/types.ts
new file mode 100644
index 0000000..dc7e03a
--- /dev/null
+++ b/ext/src/types.ts
@@ -0,0 +1,13 @@
+"use strict";
+
+export interface Message {
+    subject: string;
+    data: any;
+}
+
+export interface Receiver {
+    friendlyName: string;
+    address: string;
+    port: number;
+    currentApp: string;
+}
diff --git a/ext/webpack.config.js b/ext/webpack.config.js
index e2f893e..09c4f54 100755
--- a/ext/webpack.config.js
+++ b/ext/webpack.config.js
@@ -7,7 +7,7 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 module.exports = (env) => ({
     entry: {
         "main"           : `${env.includePath}/main.ts`
-      , "popup/bundle"   : `${env.includePath}/popup/index.jsx`
+      , "popup/bundle"   : `${env.includePath}/popup/index.tsx`
       , "options/bundle" : `${env.includePath}/options/index.tsx`
       , "updater/bundle" : `${env.includePath}/updater/index.jsx`
       , "mediaCast"      : `${env.includePath}/mediaCast.js`