Load correct device on new file command (#203)

microsoft · Feb 15, 2020 · e3fb24c · e3fb24c
1 parent 8891bf5
commit e3fb24c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -41,7 +41,9 @@ 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>`;
 }
@@ -1137,7 +1139,7 @@ function getWebviewContent(context: vscode.ExtensionContext) {
             </head>
           <body>
             <div id="root"></div>
-            <script>
+            <script >
               const vscode = acquireVsCodeApi();
             </script>
             ${loadScript(context, "out/vendor.js")}

diff --git a/src/view/App.tsx b/src/view/App.tsx
@@ -28,6 +28,15 @@ 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 />