feat: Added DeviceTypeDesktop to getDeviceType() (#1137)

* Added DeviceTypeDesktop (true for windows, catalyst target builds, and macos builds * Using Platform.OS to detect windows version and return Desktop Co-authored-by: vinzenz <vinzenz@nsynk.de>
react-native-device-info · Jan 2, 2021 · c9ae5f7 · c9ae5f7
1 parent 28554e2
commit c9ae5f7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/ios/RNDeviceInfo/RNDeviceInfo.m b/ios/RNDeviceInfo/RNDeviceInfo.m
@@ -25,10 +25,11 @@ typedef NS_ENUM(NSInteger, DeviceType) {
     DeviceTypeHandset,
     DeviceTypeTablet,
     DeviceTypeTv,
+    DeviceTypeDesktop,
     DeviceTypeUnknown
 };
 
-#define DeviceTypeValues [NSArray arrayWithObjects: @"Handset", @"Tablet", @"Tv", @"unknown", nil]
+#define DeviceTypeValues [NSArray arrayWithObjects: @"Handset", @"Tablet", @"Tv", @"Desktop", @"unknown", nil]
 
 #if !(TARGET_OS_TV)
 @import CoreTelephony;
@@ -110,8 +111,9 @@ - (DeviceType) getDeviceType
 {
     switch ([[UIDevice currentDevice] userInterfaceIdiom]) {
         case UIUserInterfaceIdiomPhone: return DeviceTypeHandset;
-        case UIUserInterfaceIdiomPad: return DeviceTypeTablet;
+        case UIUserInterfaceIdiomPad: return TARGET_OS_MACCATALYST ? DeviceTypeDesktop : DeviceTypeTablet;
         case UIUserInterfaceIdiomTV: return DeviceTypeTv;
+        case UIUserInterfaceIdiomMac: return DeviceTypeDesktop;
         default: return DeviceTypeUnknown;
     }
 }

diff --git a/src/index.js.flow b/src/index.js.flow
@@ -1,6 +1,6 @@
 // @flow
 
-export type DeviceType = 'Handset' | 'Tablet' | 'Tv' | 'unknown';
+export type DeviceType = 'Handset' | 'Tablet' | 'Tv' | 'Desktop' | 'unknown';
 
 export type BatteryState = 'unknown' | 'unplugged' | 'charging' | 'full';
 

diff --git a/src/index.ts b/src/index.ts
@@ -558,21 +558,29 @@ export const [isAirplaneMode, isAirplaneModeSync] = getSupportedPlatformInfoFunc
   defaultValue: false,
 });
 
-export const getDeviceType = () =>
-  getSupportedPlatformInfoSync({
+export const getDeviceType = () => {
+
+  if (Platform.OS === "windows") return "Desktop"
+
+  return getSupportedPlatformInfoSync({
     memoKey: 'deviceType',
     supportedPlatforms: ['android', 'ios'],
     defaultValue: 'unknown',
     getter: () => RNDeviceInfo.deviceType,
   });
+}
 
-export const getDeviceTypeSync = () =>
-  getSupportedPlatformInfoSync({
+export const getDeviceTypeSync = () => {
+
+  if (Platform.OS === "windows") return "Desktop"
+
+  return getSupportedPlatformInfoSync({
     memoKey: 'deviceType',
     supportedPlatforms: ['android', 'ios'],
     defaultValue: 'unknown',
     getter: () => RNDeviceInfo.deviceType,
   });
+}
 
 export const [supportedAbis, supportedAbisSync] = getSupportedPlatformInfoFunctions({
   memoKey: '_supportedAbis',

diff --git a/src/internal/types.ts b/src/internal/types.ts
@@ -1,4 +1,4 @@
-export type DeviceType = 'Handset' | 'Tablet' | 'Tv' | 'unknown';
+export type DeviceType = 'Handset' | 'Tablet' | 'Tv'  | 'Desktop' | 'unknown';
 
 export type BatteryState = 'unknown' | 'unplugged' | 'charging' | 'full';