fix issue with getting list of apple devices and launching (tvos)

Author: ElenaDiachenko

packages/config-templates/pluginTemplates/@react-native-community/cli-platform-apple/overrides.json

@@ -1,8 +1,12 @@
 {
     "overrides": {
         "build/tools/listDevices.js": {
-            "const parsedSimctlOutput = Object.keys(simctlOutput.devices).map(key => simctlOutput.devices[key]).reduce((acc, val) => acc.concat(val), []);": "const parsedSimctlOutput = Object.keys(simctlOutput.devices)\n  .map(key => {\n    const runtimeVersionMatch = key.match(/-(\\d+-\\d+)/);\n    const runtimeVersion = runtimeVersionMatch ? runtimeVersionMatch[1].replace('-', '.') : null;\n    return simctlOutput.devices[key].map(sim => ({ ...sim, version: runtimeVersion, }));\n  }).reduce((acc, val) => acc.concat(val), []);  // <= PATCHED BY RENATIVE"
-        }
+            "const parsedSimctlOutput = Object.keys(simctlOutput.devices).map(key => simctlOutput.devices[key]).reduce((acc, val) => acc.concat(val), []);": "const parsedSimctlOutput = Object.keys(simctlOutput.devices)\n  .map(key => {\n    const runtimeVersionMatch = key.match(/-(\\d+-\\d+)/);\n    const runtimeVersion = runtimeVersionMatch ? runtimeVersionMatch[1].replace('-', '.') : null;\n    return simctlOutput.devices[key].map(sim => ({ ...sim, version: runtimeVersion, }));\n  }).reduce((acc, val) => acc.concat(val), []);  // <= PATCHED BY RENATIVE",
+            "rawOutput.filter(device => sdkNames.includes(stripPlatform(device === null || device === void 0 ? void 0 : device.platform))).sort(device => device.simulator ? 1 : -1).map(device => {":"rawOutput.sort(device => device.simulator ? 1 : -1).map(device => { // <= PATCHED BY RENATIVE"
+        },
+        "build/commands/runCommand/installApp.js": {
+            "}).trim();":"\n  _child_process().default.spawnSync('xcrun', ['simctl', 'terminate', udid, bundleID]); // <= PATCHED BY RENATIVE"
+        } 
     }
 }
 

packages/sdk-apple/src/deviceManager.ts

@@ -56,14 +56,18 @@ export const getAppleDevices = async (ignoreDevices?: boolean, ignoreSimulators?
 
 const _parseNewIOSDevicesList = (rawDevices: Array<DeviceType>) => {
     const decideIcon = (device: DeviceType) => {
-        const { name } = device;
-        if (name?.includes('iPhone') || name?.includes('iPod')) {
+        const { name, sdk } = device;
+        if (
+            name?.includes('iPhone') ||
+            name?.includes('iPod') ||
+            sdk?.replace('com.apple.platform.', '') === 'iphoneos'
+        ) {
             return 'Phone 📱';
         }
         if (name?.includes('iPad')) {
             return 'Tablet 💊';
         }
-        if (name?.includes('Apple TV')) {
+        if (name?.includes('Apple TV') || sdk?.replace('com.apple.platform.', '') === 'appletvos') {
             return 'TV 📺';
         }
         return 'Apple Device';
@@ -77,7 +81,6 @@ const _parseNewIOSDevicesList = (rawDevices: Array<DeviceType>) => {
             name,
             icon,
             version,
-            // modelName,
             isDevice: type === 'device',
         };
     });