Load device into script tag for initial open

microsoft · Feb 13, 2020 · f657255 · f657255
1 parent 997719d
commit f657255
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/debuggerCommunicationServer.ts b/src/debuggerCommunicationServer.ts
@@ -11,10 +11,12 @@ export class DebuggerCommunicationServer {
     private serverHttp: http.Server;
     private serverIo: socketio.Server;
     private simulatorWebview: WebviewPanel | undefined;
+    private currentActiveDevice;
 
     constructor(
         webviewPanel: WebviewPanel | undefined,
-        port = SERVER_INFO.DEFAULT_SERVER_PORT
+        port = SERVER_INFO.DEFAULT_SERVER_PORT,
+        currentActiveDevice:string
     ) {
         this.port = port;
         this.serverHttp = new http.Server();
@@ -25,6 +27,7 @@ export class DebuggerCommunicationServer {
         this.initEventsHandlers();
         console.info(`Server running on port ${this.port}`);
 
+        this.currentActiveDevice=currentActiveDevice
     }
 
     public closeConnection(): void {

diff --git a/src/extension.ts b/src/extension.ts
@@ -41,7 +41,7 @@ let currentActiveDevice: string = DEFAULT_DEVICE;
 export let outChannel: vscode.OutputChannel | undefined;
 
 function loadScript(context: vscode.ExtensionContext, scriptPath: string) {
-    return `<script src="${vscode.Uri.file(context.asAbsolutePath(scriptPath))
+    return `<script initialDevice=${currentActiveDevice} src="${vscode.Uri.file(context.asAbsolutePath(scriptPath))
         .with({ scheme: "vscode-resource" })
         .toString()}"></script>`;
 }
@@ -138,6 +138,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     enableScripts: true,
                 }
             );
+
 
             currentPanel.webview.html = getWebviewContent(context);
 
@@ -918,7 +919,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 debuggerCommunicationHandler = new DebuggerCommunicationServer(
                     currentPanel,
                     utils.getServerPortConfig(),
-
+                    currentActiveDevice
                 );
                 openWebview();
                 if (currentPanel) {
@@ -1140,9 +1141,10 @@ function getWebviewContent(context: vscode.ExtensionContext) {
             </head>
           <body>
             <div id="root"></div>
-            <script>
+            <script >
               const vscode = acquireVsCodeApi();
             </script>
+            <script ></script>
             ${loadScript(context, "out/vendor.js")}
             ${loadScript(context, "out/simulator.js")}
           </body>

diff --git a/src/view/App.tsx b/src/view/App.tsx
@@ -28,6 +28,14 @@ class App extends React.Component<{}, IState> {
         this.state = defaultState;
     }
     componentDidMount() {
+        if (document.currentScript) {
+            const initialDevice = document.currentScript.getAttribute('initialDevice')
+
+            if (initialDevice) {
+                this.setState({ currentDevice: initialDevice })
+
+            }
+        }
         window.addEventListener("message", this.handleMessage);
     }
     componentWillUnmount() {

diff --git a/src/view/index.tsx b/src/view/index.tsx
@@ -14,7 +14,6 @@ const locale = "en";
 const message = {
     en: messageEn,
 };
-
 ReactDOM.render(
     <IntlProvider locale={locale} messages={message[locale]}>
         <App />