Merge pull request #58 from duskload/RDD-55-56-57-Address-Issues

duskload · web-flow · commit 11bc7657f195 · 2019-11-28T08:52:20.000+02:00
#55 #56 #57 address issues
diff --git a/index.d.ts b/index.d.ts
@@ -51,6 +51,10 @@ declare module "react-device-detect" {
   export import getUA = ReactDeviceDetect.getUA;
   export import deviceType = ReactDeviceDetect.deviceType;
   export import deviceDetect = ReactDeviceDetect.deviceDetect;
+  export import isIOS13 = ReactDeviceDetect.isIOS13;
+  export import isIPad13 = ReactDeviceDetect.isIPad13;
+  export import isIPhone13 = ReactDeviceDetect.isIPhone13;
+  export import isIPod13 = ReactDeviceDetect.isIPod13;
   export import withOrientationChange = ReactDeviceDetect.withOrientationChange;
 }
 
@@ -169,4 +173,12 @@ declare namespace ReactDeviceDetect {
   export const getUA: string;
 
   export const deviceType: string;
+
+  export const isIOS13: boolean;
+
+  export const isIPad13: boolean;
+
+  export const isIPhone13: boolean;
+
+  export const isIPod13: boolean;
 }
diff --git a/main.js b/main.js
@@ -17,9 +17,12 @@ var engine = UA.getEngine();
 var os = UA.getOS();
 var ua = UA.getUA();
 var setDefaults = function setDefaults(p) {
-  var d = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'none';
+  var d = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "none";
   return p ? p : d;
 };
+var isIOS13Check = function isIOS13Check(type) {
+  return navigator.platform.includes(type) || navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1 && !window.MSStream;
+};
 
 function _typeof(obj) {
   if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
@@ -72,6 +75,24 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
 
@@ -393,6 +414,22 @@ var isIEType = function isIEType() {
   return browser.name === BROWSER_TYPES.INTERNET_EXPLORER || browser.name === BROWSER_TYPES.IE;
 };
 
+var getIOS13 = function getIOS13() {
+  return (/iPad|iPhone|iPod/.test(navigator.platform) || navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1) && !window.MSStream;
+};
+
+var getIPad13 = function getIPad13() {
+  return isIOS13Check("iPad");
+};
+
+var getIphone13 = function getIphone13() {
+  return isIOS13Check("iPhone");
+};
+
+var getIPod13 = function getIPod13() {
+  return isIOS13Check("iPod");
+};
+
 var getBrowserFullVersion = function getBrowserFullVersion() {
   return setDefaults(browser.version);
 };
@@ -434,7 +471,7 @@ var getUseragent = function getUseragent() {
 };
 
 var getDeviceType = function getDeviceType() {
-  return setDefaults(device.type, '');
+  return setDefaults(device.type, "browser");
 };
 
 var isSmartTV = isSmartTVType();
@@ -467,6 +504,10 @@ var getUA = getUseragent();
 var isEdge = isEdgeType();
 var isYandex = isYandexType();
 var deviceType = getDeviceType();
+var isIOS13 = getIOS13();
+var isIPad13 = getIPad13();
+var isIPhone13 = getIphone13();
+var isIPod13 = getIPod13();
 
 var AndroidView = function AndroidView(_ref) {
   var renderWithFragment = _ref.renderWithFragment,
@@ -658,10 +699,10 @@ function withOrientationChange(WrappedComponent) {
       }, {
         key: "render",
         value: function render() {
-          return React__default.createElement(WrappedComponent, {
+          return React__default.createElement(WrappedComponent, _extends({}, this.props, {
             isLandscape: this.state.isLandscape,
             isPortrait: this.state.isPortrait
-          });
+          }));
         }
       }]);
 
@@ -699,6 +740,10 @@ exports.isEdge = isEdge;
 exports.isFirefox = isFirefox;
 exports.isIE = isIE;
 exports.isIOS = isIOS;
+exports.isIOS13 = isIOS13;
+exports.isIPad13 = isIPad13;
+exports.isIPhone13 = isIPhone13;
+exports.isIPod13 = isIPod13;
 exports.isMobile = isMobile;
 exports.isMobileOnly = isMobileOnly;
 exports.isMobileSafari = isMobileSafari;
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/helpers/get-ua-data.js b/src/components/helpers/get-ua-data.js
@@ -14,4 +14,13 @@ export const mockUserAgent = userAgent => {
   window.navigator.__defineGetter__("userAgent", () => userAgent);
 };
 
-export const setDefaults = (p, d = 'none') => p ? p : d
+export const setDefaults = (p, d = "none") => (p ? p : d);
+
+export const isIOS13Check = type => {
+  return (
+    navigator.platform.includes(type) ||
+    (navigator.platform === "MacIntel" &&
+      navigator.maxTouchPoints > 1 &&
+      !window.MSStream)
+  );
+};
diff --git a/src/components/helpers/selectors.js b/src/components/helpers/selectors.js
@@ -1,4 +1,12 @@
-import { os, device, browser, ua, engine, setDefaults } from "./get-ua-data";
+import {
+  os,
+  device,
+  browser,
+  ua,
+  engine,
+  setDefaults,
+  isIOS13Check
+} from "./get-ua-data";
 import { BROWSER_TYPES, DEVICE_TYPES, OS_TYPES } from "./types";
 
 const isMobileType = () => device.type === DEVICE_TYPES.MOBILE;
@@ -27,11 +35,25 @@ const isChromiumType = () => browser.name === BROWSER_TYPES.CHROMIUM;
 const isEdgeType = () => browser.name === BROWSER_TYPES.EDGE;
 const isYandexType = () => browser.name === BROWSER_TYPES.YANDEX;
 const isSafariType = () =>
-  browser.name === BROWSER_TYPES.SAFARI || browser.name === BROWSER_TYPES.MOBILE_SAFARI;
+  browser.name === BROWSER_TYPES.SAFARI ||
+  browser.name === BROWSER_TYPES.MOBILE_SAFARI;
 const isMobileSafariType = () => browser.name === BROWSER_TYPES.MOBILE_SAFARI;
 const isOperaType = () => browser.name === BROWSER_TYPES.OPERA;
 const isIEType = () =>
-  browser.name === BROWSER_TYPES.INTERNET_EXPLORER || browser.name === BROWSER_TYPES.IE;
+  browser.name === BROWSER_TYPES.INTERNET_EXPLORER ||
+  browser.name === BROWSER_TYPES.IE;
+
+const getIOS13 = () => {
+  return (
+    (/iPad|iPhone|iPod/.test(navigator.platform) ||
+      (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)) &&
+    !window.MSStream
+  );
+};
+
+const getIPad13 = () => isIOS13Check("iPad");
+const getIphone13 = () => isIOS13Check("iPhone");
+const getIPod13 = () => isIOS13Check("iPod");
 
 const getBrowserFullVersion = () => setDefaults(browser.version);
 const getBrowserVersion = () => setDefaults(browser.major);
@@ -43,7 +65,7 @@ const getMobileModel = () => setDefaults(device.model);
 const getEngineName = () => setDefaults(engine.name);
 const getEngineVersion = () => setDefaults(engine.version);
 const getUseragent = () => setDefaults(ua);
-const getDeviceType = () => setDefaults(device.type, '')
+const getDeviceType = () => setDefaults(device.type, "browser");
 
 export const isSmartTV = isSmartTVType();
 export const isConsole = isConsoleType();
@@ -75,3 +97,7 @@ export const getUA = getUseragent();
 export const isEdge = isEdgeType();
 export const isYandex = isYandexType();
 export const deviceType = getDeviceType();
+export const isIOS13 = getIOS13()
+export const isIPad13 = getIPad13()
+export const isIPhone13 = getIphone13()
+export const isIPod13 = getIPod13()
diff --git a/src/components/helpers/withOrientationChange.js b/src/components/helpers/withOrientationChange.js
@@ -8,36 +8,36 @@ function withOrientationChange(WrappedComponent) {
 
       this.isEventListenerAdded = false;
 
-      this.handleOrientationChange = this.handleOrientationChange.bind(this)
-      this.onOrientationChange = this.onOrientationChange.bind(this)
-      this.onPageLoad = this.onPageLoad.bind(this)
+      this.handleOrientationChange = this.handleOrientationChange.bind(this);
+      this.onOrientationChange = this.onOrientationChange.bind(this);
+      this.onPageLoad = this.onPageLoad.bind(this);
 
       this.state = {
         isLandscape: false,
         isPortrait: false
-      }
+      };
     }
 
     handleOrientationChange() {
       if (!this.isEventListenerAdded) {
-        this.isEventListenerAdded = true
+        this.isEventListenerAdded = true;
       }
 
       let orientation = window.innerWidth > window.innerHeight ? 90 : 0;
 
       this.setState({
-          isPortrait: orientation === 0,
-          isLandscape: orientation === 90
-      })
-    };
+        isPortrait: orientation === 0,
+        isLandscape: orientation === 90
+      });
+    }
 
     onOrientationChange() {
       this.handleOrientationChange();
-    };
+    }
 
     onPageLoad() {
       this.handleOrientationChange();
-    };
+    }
 
     componentDidMount() {
       if (typeof window !== undefined && isMobile) {
@@ -53,12 +53,13 @@ function withOrientationChange(WrappedComponent) {
     }
 
     componentWillUnmount() {
-      window.removeEventListener("resize", this.onOrientationChange, false)
+      window.removeEventListener("resize", this.onOrientationChange, false);
     }
 
     render() {
       return (
         <WrappedComponent
+          {...this.props}
           isLandscape={this.state.isLandscape}
           isPortrait={this.state.isPortrait}
         />
@@ -67,4 +68,4 @@ function withOrientationChange(WrappedComponent) {
   };
 }
 
-export { withOrientationChange }
+export { withOrientationChange };
