Autofocus simulator when expanding the mini sim (microsoft#8512)

shakao · web-flow · commit 9ed43fbb9683 · 2021-09-23T08:39:46.000-07:00
diff --git a/webapp/src/app.tsx b/webapp/src/app.tsx
@@ -202,7 +202,7 @@ export class ProjectView
         this.initSimulatorMessageHandlers();
 
         // add user hint IDs and callback to hint manager
-        this.hintManager.addHint(ProjectView.tutorialCardId, this.tutorialCardHintCallback.bind(this));
+        if (pxt.BrowserUtils.useOldTutorialLayout) this.hintManager.addHint(ProjectView.tutorialCardId, this.tutorialCardHintCallback.bind(this));
     }
 
     private autoRunOnStart(): boolean {
diff --git a/webapp/src/sidepanel.tsx b/webapp/src/sidepanel.tsx
@@ -8,6 +8,7 @@ import * as filelist from "./filelist";
 import * as keymap from "./keymap";
 import * as serialindicator from "./serialindicator"
 import * as simtoolbar from "./simtoolbar";
+import * as simulator from "./simulator";
 
 import { TabContent } from "./components/core/TabContent";
 import { TabPane } from "./components/core/TabPane";
@@ -70,6 +71,7 @@ export class Sidepanel extends data.Component<SidepanelProps, SidepanelState> {
     protected showSimulatorTab = () => {
         this.props.showMiniSim(false);
         this.setState({ activeTab: SIMULATOR_TAB, height: undefined });
+        simulator.driver.focus();
     }
 
     protected showTutorialTab = () => {

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ export class ProjectView`
`202`	`202`	`this.initSimulatorMessageHandlers();`
`203`	`203`
`204`	`204`	`// add user hint IDs and callback to hint manager`
`205`		`- this.hintManager.addHint(ProjectView.tutorialCardId, this.tutorialCardHintCallback.bind(this));`
	`205`	`+ if (pxt.BrowserUtils.useOldTutorialLayout) this.hintManager.addHint(ProjectView.tutorialCardId, this.tutorialCardHintCallback.bind(this));`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`private autoRunOnStart(): boolean {`