Merge pull request #91 from duskload/feature/Add-Edge-Chromium

Feature/add edge chromium
duskload · Jun 15, 2020 · 7153b07 · 7153b07
2 parents e9b170e + ee0ae0d
commit 7153b07
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -127,7 +127,7 @@ const styles = {
 | isSafari           | bool     | returns true if browser is `Safari`                                                    |
 | isOpera            | bool     | returns true if browser is `Opera`                                                     |
 | isIE               | bool     | returns true if browser is `Internet Explorer`                                         |
-| isEdge             | bool     | returns true if browser is `Edge`                                                      |
+| isEdge             | bool     | returns true if browser is `Edge` or `Edge Chromium`                                   |
 | isYandex           | bool     | returns true if browser is `Yandex`                                                    |
 | isChromium         | bool     | returns true if browser is `Chromium`                                                  |
 | isMobileSafari     | bool     | returns true if browser is `Mobile Safari`                                             |
@@ -146,9 +146,12 @@ const styles = {
 | isIPhone13         | boolean  | returns true/false if device is iPhone and running on iOS13                            |
 | isIPad13           | boolean  | returns true/false if device is iPad and running on iOS13                              |
 | isIPod13           | boolean  | returns true/false if device is iPod and running on iOS13                              |
-| isElectron         | boolean  | returns true/false if running on Electron                                              |
-| deviceDetect       | function | return data object which includes all data about device (e.g version, engine, os etc.) |
-
+| isElectron         | boolean  | returns true/false if running on `Electron`                                            |
+| isEdgeChromium     | boolean  | returns true/false if browser is `Edge Chromium`                                       | 
+| isLegacyEdge       | boolean  | returns true if browser is `Edge`                                                      |
+| isWindows          | boolean  | returns true/false if os is `Windows`                                                  |
+| isMacOs            | boolean  | returns true/false if os is `Mac OS`                                                   |
+| deviceDetect       | boolean  | return data object which includes all data about device (e.g version, engine, os etc.) |
 ### Views
 
 Available views:
@@ -196,6 +199,17 @@ App = withOrientationChange(App)
 export { App }
 ```
 
+### Testing
+
+```js
+import * as rdd from 'react-device-detect';
+
+rdd.isMobile = true; 
+
+// use in tests
+
+```
+
 ## License
 
 MIT
diff --git a/index.d.ts b/index.d.ts
@@ -56,6 +56,10 @@ declare module "react-device-detect" {
   export import isIPhone13 = ReactDeviceDetect.isIPhone13;
   export import isIPod13 = ReactDeviceDetect.isIPod13;
   export import isElectron = ReactDeviceDetect.isElectron;
+  export import isEdgeChromium = ReactDeviceDetect.isEdgeChromium;
+  export import isLegacyEdge = ReactDeviceDetect.isLegacyEdge;
+  export import isWindows = ReactDeviceDetect.isWindows;
+  export import isMacOs = ReactDeviceDetect.isMacOs;
   export import withOrientationChange = ReactDeviceDetect.withOrientationChange;
 }
 
@@ -184,4 +188,12 @@ declare namespace ReactDeviceDetect {
   export const isIPod13: boolean;
 
   export const isElectron: boolean;
+
+  export const isEdgeChromium: boolean;
+
+  export const isLegacyEdge: boolean;
+
+  export const isWindows: boolean;
+
+  export const isMacOs: boolean;
 }
diff --git a/main.js b/main.js
@@ -32,7 +32,7 @@ var getNavigatorInstance = function getNavigatorInstance() {
 };
 var isIOS13Check = function isIOS13Check(type) {
   var nav = getNavigatorInstance();
-  return nav && (nav.platform.indexOf(type) !== -1 || nav.platform === 'MacIntel' && nav.maxTouchPoints > 1 && !window.MSStream);
+  return nav && nav.platform && (nav.platform.indexOf(type) !== -1 || nav.platform === 'MacIntel' && nav.maxTouchPoints > 1 && !window.MSStream);
 };
 
 function _typeof(obj) {
@@ -203,12 +203,15 @@ var BROWSER_TYPES = {
   EDGE: "Edge",
   CHROMIUM: "Chromium",
   IE: 'IE',
-  MOBILE_SAFARI: "Mobile Safari"
+  MOBILE_SAFARI: "Mobile Safari",
+  EDGE_CHROMIUM: "Edge Chromium"
 };
 var OS_TYPES = {
   IOS: 'iOS',
   ANDROID: "Android",
-  WINDOWS_PHONE: "Windows Phone"
+  WINDOWS_PHONE: "Windows Phone",
+  WINDOWS: 'Windows',
+  MAC_OS: 'Mac OS'
 };
 var initialData = {
   isMobile: false,
@@ -361,6 +364,14 @@ var isMobileAndTabletType = function isMobileAndTabletType() {
   }
 };
 
+var isEdgeChromiumType = function isEdgeChromiumType() {
+  if (os.name === OS_TYPES.WINDOWS && os.version === '10') {
+    return typeof ua === 'string' && ua.indexOf('Edg/') !== -1;
+  }
+
+  return false;
+};
+
 var isSmartTVType = function isSmartTVType() {
   return device.type === DEVICE_TYPES.SMART_TV;
 };
@@ -381,6 +392,14 @@ var isAndroidType = function isAndroidType() {
   return os.name === OS_TYPES.ANDROID;
 };
 
+var isWindowsType = function isWindowsType() {
+  return os.name === OS_TYPES.WINDOWS;
+};
+
+var isMacOsType = function isMacOsType() {
+  return os.name === OS_TYPES.MAC_OS;
+};
+
 var isWinPhoneType = function isWinPhoneType() {
   return os.name === OS_TYPES.WINDOWS_PHONE;
 };
@@ -519,14 +538,18 @@ var mobileModel = getMobileModel();
 var engineName = getEngineName();
 var engineVersion = getEngineVersion();
 var getUA = getUseragent();
-var isEdge = isEdgeType();
+var isEdge = isEdgeType() || isEdgeChromiumType();
 var isYandex = isYandexType();
 var deviceType = getDeviceType();
 var isIOS13 = getIOS13();
 var isIPad13 = getIPad13();
 var isIPhone13 = getIphone13();
 var isIPod13 = getIPod13();
 var isElectron = isElectronType();
+var isEdgeChromium = isEdgeChromiumType();
+var isLegacyEdge = isEdgeType();
+var isWindows = isWindowsType();
+var isMacOs = isMacOsType();
 
 var AndroidView = function AndroidView(_ref) {
   var renderWithFragment = _ref.renderWithFragment,
@@ -756,6 +779,7 @@ exports.isChrome = isChrome;
 exports.isChromium = isChromium;
 exports.isConsole = isConsole;
 exports.isEdge = isEdge;
+exports.isEdgeChromium = isEdgeChromium;
 exports.isElectron = isElectron;
 exports.isFirefox = isFirefox;
 exports.isIE = isIE;
@@ -764,6 +788,8 @@ exports.isIOS13 = isIOS13;
 exports.isIPad13 = isIPad13;
 exports.isIPhone13 = isIPhone13;
 exports.isIPod13 = isIPod13;
+exports.isLegacyEdge = isLegacyEdge;
+exports.isMacOs = isMacOs;
 exports.isMobile = isMobile;
 exports.isMobileOnly = isMobileOnly;
 exports.isMobileSafari = isMobileSafari;
@@ -773,6 +799,7 @@ exports.isSmartTV = isSmartTV;
 exports.isTablet = isTablet;
 exports.isWearable = isWearable;
 exports.isWinPhone = isWinPhone;
+exports.isWindows = isWindows;
 exports.isYandex = isYandex;
 exports.mobileModel = mobileModel;
 exports.mobileVendor = mobileVendor;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-device-detect",
-  "version": "1.12.1",
+  "version": "1.13.1",
   "description": "Detect device type and render your component according to it",
   "main": "main.js",
   "typings": "./index.d.ts",

diff --git a/src/components/helpers/selectors.js b/src/components/helpers/selectors.js
@@ -14,11 +14,21 @@ const isMobileAndTabletType = () => {
   }
 };
 
+const isEdgeChromiumType = () => {
+  if (os.name === OS_TYPES.WINDOWS && os.version === '10') {
+    return typeof ua === 'string' && ua.indexOf('Edg/') !== -1;
+  }
+
+  return false;
+};
+
 const isSmartTVType = () => device.type === DEVICE_TYPES.SMART_TV;
 const isBrowserType = () => device.type === DEVICE_TYPES.BROWSER;
 const isWearableType = () => device.type === DEVICE_TYPES.WEARABLE;
 const isConsoleType = () => device.type === DEVICE_TYPES.CONSOLE;
 const isAndroidType = () => os.name === OS_TYPES.ANDROID;
+const isWindowsType = () => os.name === OS_TYPES.WINDOWS;
+const isMacOsType = () => os.name === OS_TYPES.MAC_OS;
 const isWinPhoneType = () => os.name === OS_TYPES.WINDOWS_PHONE;
 const isIOSType = () => os.name === OS_TYPES.IOS;
 const isChromeType = () => browser.name === BROWSER_TYPES.CHROME;
@@ -89,11 +99,15 @@ export const mobileModel = getMobileModel();
 export const engineName = getEngineName();
 export const engineVersion = getEngineVersion();
 export const getUA = getUseragent();
-export const isEdge = isEdgeType();
+export const isEdge = isEdgeType() || isEdgeChromiumType();
 export const isYandex = isYandexType();
 export const deviceType = getDeviceType();
 export const isIOS13 = getIOS13();
 export const isIPad13 = getIPad13();
 export const isIPhone13 = getIphone13();
 export const isIPod13 = getIPod13();
 export const isElectron = isElectronType();
+export const isEdgeChromium = isEdgeChromiumType();
+export const isLegacyEdge = isEdgeType();
+export const isWindows = isWindowsType();
+export const isMacOs = isMacOsType();
diff --git a/src/components/helpers/types.js b/src/components/helpers/types.js
@@ -19,13 +19,16 @@ export const BROWSER_TYPES = {
   EDGE: "Edge",
   CHROMIUM: "Chromium",
   IE: 'IE',
-  MOBILE_SAFARI: "Mobile Safari"
+  MOBILE_SAFARI: "Mobile Safari",
+  EDGE_CHROMIUM: "Edge Chromium"
 };
 
 export const OS_TYPES = {
   IOS: 'iOS',
   ANDROID: "Android",
-  WINDOWS_PHONE: "Windows Phone"
+  WINDOWS_PHONE: "Windows Phone",
+  WINDOWS: 'Windows',
+  MAC_OS: 'Mac OS'
 };
 
 const initialData = {