[menu-bar] Focus simulator window when launching an app

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Added local HTTP server to circumvent deep-link limitations. ([#52](https://github.com/expo/orbit/pull/52), [#53](https://github.com/expo/orbit/pull/53), [#54](https://github.com/expo/orbit/pull/54), [#55](https://github.com/expo/orbit/pull/55) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 - Added Projects section to the menu bar. ([#46](https://github.com/expo/orbit/pull/46), [#59](https://github.com/expo/orbit/pull/59) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 - Added support for login to Expo. ([#41](https://github.com/expo/orbit/pull/41), [#43](https://github.com/expo/orbit/pull/43), [#44](https://github.com/expo/orbit/pull/44), [#45](https://github.com/expo/orbit/pull/45), [#62](https://github.com/expo/orbit/pull/62), [#67](https://github.com/expo/orbit/pull/67) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Focus simulator/emulator window when launching an app. ([#75](https://github.com/expo/orbit/pull/75) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
 ### 🐛 Bug fixes
 

apps/menu-bar/macos/Podfile

@@ -53,7 +53,7 @@ post_install do |installer|
         xcconfig = File.read(xcconfig_path)
         xcode_major_version = `(xcodebuild -version | grep -oE '[0-9]*' | head -n 1)`.strip
 
-        if $xcode_major_version.to_i >= 15
+        if xcode_major_version.to_i >= 15
           xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
         else
           xcconfig_mod = xcconfig.gsub(/TOOLCHAIN_DIR/, "DT_TOOLCHAIN_DIR")

apps/menu-bar/macos/Podfile.lock

@@ -642,6 +642,6 @@ SPEC CHECKSUMS:
   Swifter: e71dd674404923d7f03ebb03f3f222d1c570bc8e
   Yoga: b01d8e70b1bc0e88b40040a7d9c50fdadb1054b9
 
-PODFILE CHECKSUM: 81e540cf8116d2cad65b04b4aed2f9512982ea39
+PODFILE CHECKSUM: 3ee64bd16ae5677f1957974b6e7eb9189851163d
 
 COCOAPODS: 1.13.0

package.json

@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "build": "lerna run build",
-    "watch": "lerna run watch --stream",
+    "watch": "lerna run watch --stream --parallel",
     "typecheck": "lerna run typecheck",
     "postinstall": "patch-package"
   },

packages/eas-shared/src/paths.ts

@@ -8,7 +8,7 @@ const {
   cache: CACHE_PATH,
   log: LOG_PATH,
   temp: TEMP_PATH,
-} = envPaths("eas-cli");
+} = envPaths("expo-orbit");
 
 export const getDataDirectory = (): string => DATA_PATH;
 export const getConfigDirectory = (): string => CONFIG_PATH;

packages/eas-shared/src/run/android/emulator.ts

@@ -122,6 +122,10 @@ export async function installAppAsync(
   Log.log("Installing your app...");
 
   assert(emulator.pid);
+  await activateEmulatorWindowAsync({
+    pid: emulator.pid,
+    deviceType: "emulator",
+  });
   await adbAsync("-s", emulator.pid, "install", "-r", "-d", apkFilePath);
 
   Log.succeed("Successfully installed your app!");
@@ -199,7 +203,7 @@ export async function getAdbOutputAsync(args: string[]): Promise<string> {
 }
 
 export async function openURLAsync({ pid, url }: { pid: string; url: string }) {
-  // await activateEmulatorWindowAsync({ pid });
+  await activateEmulatorWindowAsync({ pid, deviceType: "emulator" });
 
   try {
     // NOTE(brentvatne): temporary workaround! launch Expo Go first, then

packages/eas-shared/src/run/index.ts

@@ -28,6 +28,7 @@ export async function runAppOnAndroidEmulatorAsync(
 ): Promise<void> {
   await assertExecutablesExistAsync();
   const bootedEmulator = await Emulator.ensureEmulatorBootedAsync(emulator);
+  await Emulator.activateEmulatorWindowAsync(bootedEmulator);
   await Emulator.installAppAsync(bootedEmulator, appPath);
   const { packageName, activityName } = await getAptParametersAsync(appPath);
   await Emulator.startAppAsync(bootedEmulator, packageName, activityName);

packages/eas-shared/src/run/ios/simulator.ts

@@ -117,7 +117,7 @@ export async function launchAppAsync(
 ): Promise<void> {
   Log.newLine();
   Log.log("Launching your app...");
-
+  await activateSimulatorWindowAsync();
   await simctlAsync(["launch", simulatorUdid, bundleIdentifier]);
 
   Log.succeed("Successfully launched your app!");
@@ -146,6 +146,24 @@ async function waitForSimulatorAppToStartAsync(
   throw new Error("Timed out waiting for the iOS simulator to start.");
 }
 
+export async function activateSimulatorWindowAsync(): Promise<void> {
+  await osascript.execAsync(`
+    tell application "System Events"
+      set assistiveAccess to UI elements enabled
+    end tell
+
+    if assistiveAccess then
+      tell application "System Events" to tell process "Simulator"
+        perform action "AXRaise" of window 0
+      end tell
+    else
+      tell application "Simulator"
+        activate
+      end tell
+    end if
+  `);
+}
+
 async function isSimulatorAppRunningAsync(): Promise<boolean> {
   try {
     const result = await osascript.execAsync(
@@ -223,6 +241,7 @@ export async function openURLAsync(options: {
   udid: string;
   url: string;
 }): Promise<void> {
+  await activateSimulatorWindowAsync();
   await xcrunAsync(["simctl", "openurl", options.udid, options.url]);
 }