@adobe/alloy 2.14.0-alpha.11 → 2.14.0-alpha.12

package/libEs5/components/Context/injectDevice.js

@@ -36,12 +36,14 @@ var getScreenOrientationViaProperty = function getScreenOrientationViaProperty(w
 };
 
 var getScreenOrientationViaMediaQuery = function getScreenOrientationViaMediaQuery(window) {
-  if (window.matchMedia("(orientation: portrait)").matches) {
-    return "portrait";
-  }
+  if ((0, _utils.isFunction)(window.matchMedia)) {
+    if (window.matchMedia("(orientation: portrait)").matches) {
+      return "portrait";
+    }
 
-  if (window.matchMedia("(orientation: landscape)").matches) {
-    return "landscape";
+    if (window.matchMedia("(orientation: landscape)").matches) {
+      return "landscape";
+    }
   }
 
   return null;
@@ -52,19 +54,30 @@ var _default = function _default(window) {
     var _window$screen = window.screen,
         width = _window$screen.width,
         height = _window$screen.height;
-    var device = {
-      screenHeight: height,
-      screenWidth: width
-    };
+    var device = {};
+    var screenHeight = (0, _utils.toInteger)(height);
+
+    if (screenHeight >= 0) {
+      device.screenHeight = screenHeight;
+    }
+
+    var screenWidth = (0, _utils.toInteger)(width);
+
+    if (screenWidth >= 0) {
+      device.screenWidth = screenWidth;
+    }
+
     var orientation = getScreenOrientationViaProperty(window) || getScreenOrientationViaMediaQuery(window);
 
     if (orientation) {
       device.screenOrientation = orientation;
     }
 
-    (0, _utils.deepAssign)(xdm, {
-      device: device
-    });
+    if (Object.keys(device).length > 0) {
+      (0, _utils.deepAssign)(xdm, {
+        device: device
+      });
+    }
   };
 };
 

package/libEs5/components/Context/injectEnvironment.js

@@ -24,14 +24,21 @@ var _default = function _default(window) {
     var environment = {
       type: "browser"
     };
+    var viewportWidth = (0, _utils.toInteger)(clientWidth);
 
-    if ((0, _utils.isNumber)(clientWidth) && clientWidth >= 0 && (0, _utils.isNumber)(clientHeight) && clientHeight >= 0) {
+    if (viewportWidth >= 0) {
       environment.browserDetails = {
-        viewportWidth: Math.round(clientWidth),
-        viewportHeight: Math.round(clientHeight)
+        viewportWidth: viewportWidth
       };
     }
 
+    var viewportHeight = (0, _utils.toInteger)(clientHeight);
+
+    if (viewportHeight >= 0) {
+      environment.browserDetails = environment.browserDetails || {};
+      environment.browserDetails.viewportHeight = viewportHeight;
+    }
+
     (0, _utils.deepAssign)(xdm, {
       environment: environment
     });

package/libEs5/components/Identity/visitorService/injectGetEcidFromVisitor.js

@@ -19,8 +19,9 @@ var _default = function _default(_ref) {
   var logger = _ref.logger,
       orgId = _ref.orgId,
       awaitVisitorOptIn = _ref.awaitVisitorOptIn;
-  var Visitor = (0, _getVisitor.default)(window);
   return function () {
+    var Visitor = (0, _getVisitor.default)(window);
+
     if (Visitor) {
       // Need to explicitly wait for optIn because visitor will call callback
       // with invalid values prior to optIn being approved

package/libEs5/constants/libraryVersion.js

@@ -15,5 +15,5 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-var _default = "2.14.0-alpha.11";
+var _default = "2.14.0-alpha.12";
 exports.default = _default;

package/libEs5/utils/toInteger.js

@@ -2,6 +2,10 @@
 
 exports.default = void 0;
 
+var _isNumber = require("./isNumber");
+
+var _isString = require("./isString");
+
 /*
 Copyright 2022 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -16,11 +20,19 @@ governing permissions and limitations under the License.
 
 /*
  * coerce `value` to a number or return `defaultValue` if it cannot be.
+ *
+ * The coersion is attempted if value is a number or string.
  */
 var _default = function _default(value, defaultValue) {
-  var n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+  if ((0, _isNumber.default)(value) || (0, _isString.default)(value)) {
+    var n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+
+    if (!isNaN(n)) {
+      return n;
+    }
+  }
 
-  return isNaN(n) ? defaultValue : n;
+  return defaultValue;
 };
 
 exports.default = _default;

package/libEs6/components/Context/injectDevice.js

@@ -9,7 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-import { deepAssign } from "../../utils";
+import { deepAssign, isFunction, toInteger } from "../../utils";
 
 const getScreenOrientationViaProperty = window => {
   const {
@@ -36,12 +36,14 @@ const getScreenOrientationViaProperty = window => {
 };
 
 const getScreenOrientationViaMediaQuery = window => {
-  if (window.matchMedia("(orientation: portrait)").matches) {
-    return "portrait";
-  }
+  if (isFunction(window.matchMedia)) {
+    if (window.matchMedia("(orientation: portrait)").matches) {
+      return "portrait";
+    }
 
-  if (window.matchMedia("(orientation: landscape)").matches) {
-    return "landscape";
+    if (window.matchMedia("(orientation: landscape)").matches) {
+      return "landscape";
+    }
   }
 
   return null;
@@ -55,18 +57,29 @@ export default (window => {
         height
       }
     } = window;
-    const device = {
-      screenHeight: height,
-      screenWidth: width
-    };
+    const device = {};
+    const screenHeight = toInteger(height);
+
+    if (screenHeight >= 0) {
+      device.screenHeight = screenHeight;
+    }
+
+    const screenWidth = toInteger(width);
+
+    if (screenWidth >= 0) {
+      device.screenWidth = screenWidth;
+    }
+
     const orientation = getScreenOrientationViaProperty(window) || getScreenOrientationViaMediaQuery(window);
 
     if (orientation) {
       device.screenOrientation = orientation;
     }
 
-    deepAssign(xdm, {
-      device
-    });
+    if (Object.keys(device).length > 0) {
+      deepAssign(xdm, {
+        device
+      });
+    }
   };
 });

package/libEs6/components/Context/injectEnvironment.js

@@ -9,7 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-import { deepAssign, isNumber } from "../../utils";
+import { deepAssign, toInteger } from "../../utils";
 export default (window => {
   return xdm => {
     const {
@@ -23,14 +23,21 @@ export default (window => {
     const environment = {
       type: "browser"
     };
+    const viewportWidth = toInteger(clientWidth);
 
-    if (isNumber(clientWidth) && clientWidth >= 0 && isNumber(clientHeight) && clientHeight >= 0) {
+    if (viewportWidth >= 0) {
       environment.browserDetails = {
-        viewportWidth: Math.round(clientWidth),
-        viewportHeight: Math.round(clientHeight)
+        viewportWidth
       };
     }
 
+    const viewportHeight = toInteger(clientHeight);
+
+    if (viewportHeight >= 0) {
+      environment.browserDetails = environment.browserDetails || {};
+      environment.browserDetails.viewportHeight = viewportHeight;
+    }
+
     deepAssign(xdm, {
       environment
     });

package/libEs6/components/Identity/visitorService/injectGetEcidFromVisitor.js

@@ -15,8 +15,9 @@ export default (({
   orgId,
   awaitVisitorOptIn
 }) => {
-  const Visitor = getVisitor(window);
   return () => {
+    const Visitor = getVisitor(window);
+
     if (Visitor) {
       // Need to explicitly wait for optIn because visitor will call callback
       // with invalid values prior to optIn being approved

package/libEs6/constants/libraryVersion.js

@@ -11,4 +11,4 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-export default "2.14.0-alpha.11";
+export default "2.14.0-alpha.12";

package/libEs6/utils/toInteger.js

@@ -9,12 +9,22 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-
+import isNumber from "./isNumber";
+import isString from "./isString";
 /*
  * coerce `value` to a number or return `defaultValue` if it cannot be.
+ *
+ * The coersion is attempted if value is a number or string.
  */
+
 export default ((value, defaultValue) => {
-  const n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+  if (isNumber(value) || isString(value)) {
+    const n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+
+    if (!isNaN(n)) {
+      return n;
+    }
+  }
 
-  return isNaN(n) ? defaultValue : n;
+  return defaultValue;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.14.0-alpha.11",
+  "version": "2.14.0-alpha.12",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",
@@ -64,7 +64,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.14.0-alpha.10",
+    "@adobe/alloy": "^2.14.0-alpha.11",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",