@adobe/alloy 2.19.0-beta.1 → 2.19.0-beta.11

package/libEs5/components/Personalization/handlers/createProcessDomAction.js

@@ -1,6 +1,9 @@
 "use strict";
 
 exports.default = void 0;
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 /*
 Copyright 2023 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -22,16 +25,25 @@ var _default = function _default(_ref) {
       selector = _ref2.selector;
     if (!type) {
       logger.warn("Invalid DOM action data: missing type.", item.getData());
-      return {};
+      return {
+        setRenderAttempted: false,
+        includeInNotification: false
+      };
     }
     if (type === "click") {
       if (!selector) {
         logger.warn("Invalid DOM action data: missing selector.", item.getData());
-        return {};
+        return {
+          setRenderAttempted: false,
+          includeInNotification: false
+        };
       }
       storeClickMetrics({
         selector: selector,
-        meta: item.getMeta()
+        meta: _objectSpread(_objectSpread({}, item.getProposition().getNotification()), {}, {
+          trackingLabel: item.getTrackingLabel(),
+          scopeType: item.getProposition().getScopeType()
+        })
       });
       return {
         setRenderAttempted: true,
@@ -40,7 +52,10 @@ var _default = function _default(_ref) {
     }
     if (!modules[type]) {
       logger.warn("Invalid DOM action data: unknown type.", item.getData());
-      return {};
+      return {
+        setRenderAttempted: false,
+        includeInNotification: false
+      };
     }
     return {
       render: function render() {

package/libEs5/components/Personalization/handlers/createProcessHtmlContent.js

@@ -20,11 +20,17 @@ var _default = function _default(_ref) {
       type = _ref2.type,
       selector = _ref2.selector;
     if (!selector || !type) {
-      return {};
+      return {
+        setRenderAttempted: false,
+        includeInNotification: false
+      };
     }
     if (!modules[type]) {
       logger.warn("Invalid HTML content data", item.getData());
-      return {};
+      return {
+        setRenderAttempted: false,
+        includeInNotification: false
+      };
     }
     return {
       render: function render() {

package/libEs5/components/Personalization/handlers/createProcessPropositions.js

@@ -32,8 +32,8 @@ var _default = function _default(_ref) {
         if (logger.enabled) {
           var message = error.message,
             stack = error.stack;
-          var errorMessage = "Failed to execute action " + item.toString() + ". " + message + " " + stack;
-          logger.error(errorMessage);
+          var warning = "Failed to execute action " + item.toString() + ". " + message + " " + stack;
+          logger.warn(warning);
         }
         return false;
       });

package/libEs5/components/Personalization/handlers/createProcessRedirect.js

@@ -25,10 +25,14 @@ var _default = function _default(_ref) {
     }
     var render = function render() {
       return collect({
-        decisionsMeta: [item.getMeta()]
+        decisionsMeta: [item.getProposition().getNotification()],
+        documentMayUnload: true
       }).then(function () {
-        executeRedirect(content);
-        // We've already sent the display notification, so don't return anything
+        return executeRedirect(content);
+        // Execute redirect will never resolve. If there are bottom of page events that are waiting
+        // for display notifications from this request, they will never run because this promise will
+        // not resolve. This is intentional because we don't want to run bottom of page events if
+        // there is a redirect.
       });
     };
 

package/libEs5/components/Personalization/handlers/injectCreateProposition.js

@@ -2,6 +2,7 @@
 
 exports.default = void 0;
 var _pageWideScope = require("../../../constants/pageWideScope");
+var _scopeType = require("../constants/scopeType");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } /*
@@ -18,16 +19,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var _default = function _default(_ref) {
   var preprocess = _ref.preprocess,
     isPageWideSurface = _ref.isPageWideSurface;
-  var createItem = function createItem(item, meta) {
+  var createItem = function createItem(item, proposition) {
     var schema = item.schema,
       data = item.data,
       _item$characteristics = item.characteristics;
     _item$characteristics = _item$characteristics === void 0 ? {} : _item$characteristics;
     var trackingLabel = _item$characteristics.trackingLabel;
     var processedData = preprocess(data);
-    if (trackingLabel) {
-      meta.trackingLabel = trackingLabel;
-    }
     return {
       getSchema: function getSchema() {
         return schema;
@@ -35,8 +33,11 @@ var _default = function _default(_ref) {
       getData: function getData() {
         return processedData;
       },
-      getMeta: function getMeta() {
-        return meta;
+      getProposition: function getProposition() {
+        return proposition;
+      },
+      getTrackingLabel: function getTrackingLabel() {
+        return trackingLabel;
       },
       getOriginalItem: function getOriginalItem() {
         return item;
@@ -69,20 +70,17 @@ var _default = function _default(_ref) {
       },
       getScopeType: function getScopeType() {
         if (scope === _pageWideScope.default || isPageWideSurface(scope)) {
-          return "page";
+          return _scopeType.PAGE_SCOPE_TYPE;
         }
-        if (scopeType === "view") {
-          return "view";
+        if (scopeType === _scopeType.VIEW_SCOPE_TYPE) {
+          return _scopeType.VIEW_SCOPE_TYPE;
         }
-        return "proposition";
+        return _scopeType.PROPOSITION_SCOPE_TYPE;
       },
       getItems: function getItems() {
+        var _this = this;
         return items.map(function (item) {
-          return createItem(item, {
-            id: id,
-            scope: scope,
-            scopeDetails: scopeDetails
-          });
+          return createItem(item, _this);
         });
       },
       getNotification: function getNotification() {

package/libEs5/components/Personalization/index.js

@@ -22,7 +22,6 @@ var _remapHeadOffers = require("./dom-actions/remapHeadOffers");
 var _createPreprocess = require("./dom-actions/createPreprocess");
 var _injectCreateProposition = require("./handlers/injectCreateProposition");
 var _createAsyncArray = require("./utils/createAsyncArray");
-var _createPendingNotificationsHandler = require("./createPendingNotificationsHandler");
 var schema = require("./constants/schema");
 var _processDefaultContent = require("./handlers/processDefaultContent");
 var _surfaceUtils = require("./utils/surfaceUtils");
@@ -30,6 +29,7 @@ var _createProcessDomAction = require("./handlers/createProcessDomAction");
 var _createProcessHtmlContent = require("./handlers/createProcessHtmlContent");
 var _createProcessRedirect = require("./handlers/createProcessRedirect");
 var _createProcessPropositions = require("./handlers/createProcessPropositions");
+var _createRedirect = require("./dom-actions/createRedirect");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } /*
                                                                                                                                                                                                                   Copyright 2019 Adobe. All rights reserved.
                                                                                                                                                                                                                   This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -68,6 +68,7 @@ var createPersonalization = function createPersonalization(_ref) {
   var viewCache = (0, _createViewCacheManager.default)({
     createProposition: createProposition
   });
+  var executeRedirect = (0, _createRedirect.default)(window);
   var schemaProcessors = (_schemaProcessors = {}, _defineProperty(_schemaProcessors, schema.DEFAULT_CONTENT_ITEM, _processDefaultContent.default), _defineProperty(_schemaProcessors, schema.DOM_ACTION, (0, _createProcessDomAction.default)({
     modules: modules,
     logger: logger,
@@ -77,20 +78,14 @@ var createPersonalization = function createPersonalization(_ref) {
     logger: logger
   })), _defineProperty(_schemaProcessors, schema.REDIRECT_ITEM, (0, _createProcessRedirect.default)({
     logger: logger,
-    executeRedirect: function executeRedirect(url) {
-      return window.location.replace(url);
-    },
+    executeRedirect: executeRedirect,
     collect: collect
   })), _schemaProcessors);
   var processPropositions = (0, _createProcessPropositions.default)({
     schemaProcessors: schemaProcessors,
     logger: logger
   });
-  var pendingDisplayNotifications = (0, _createAsyncArray.default)();
-  var pendingNotificationsHandler = (0, _createPendingNotificationsHandler.default)({
-    pendingDisplayNotifications: pendingDisplayNotifications,
-    mergeDecisionsMeta: _event.mergeDecisionsMeta
-  });
+  var renderedPropositions = (0, _createAsyncArray.default)();
   var fetchDataHandler = (0, _createFetchDataHandler.default)({
     prehidingStyle: prehidingStyle,
     showContainers: _flicker.showContainers,
@@ -99,7 +94,7 @@ var createPersonalization = function createPersonalization(_ref) {
     collect: collect,
     processPropositions: processPropositions,
     createProposition: createProposition,
-    pendingDisplayNotifications: pendingDisplayNotifications
+    renderedPropositions: renderedPropositions
   });
   var onClickHandler = (0, _createOnClickHandler.default)({
     mergeDecisionsMeta: _event.mergeDecisionsMeta,
@@ -108,14 +103,13 @@ var createPersonalization = function createPersonalization(_ref) {
     getClickMetasBySelector: getClickMetasBySelector
   });
   var viewChangeHandler = (0, _createViewChangeHandler.default)({
-    mergeDecisionsMeta: _event.mergeDecisionsMeta,
     processPropositions: processPropositions,
     viewCache: viewCache
   });
   var applyPropositions = (0, _createApplyPropositions.default)({
     processPropositions: processPropositions,
     createProposition: createProposition,
-    pendingDisplayNotifications: pendingDisplayNotifications,
+    renderedPropositions: renderedPropositions,
     viewCache: viewCache
   });
   var setTargetMigration = (0, _createSetTargetMigration.default)({
@@ -133,7 +127,8 @@ var createPersonalization = function createPersonalization(_ref) {
     showContainers: _flicker.showContainers,
     applyPropositions: applyPropositions,
     setTargetMigration: setTargetMigration,
-    pendingNotificationsHandler: pendingNotificationsHandler
+    mergeDecisionsMeta: _event.mergeDecisionsMeta,
+    renderedPropositions: renderedPropositions
   });
 };
 createPersonalization.namespace = "Personalization";

package/libEs5/constants/libraryVersion.js

@@ -14,5 +14,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.19.0-beta.1";
+var _default = "2.19.0-beta.11";
 exports.default = _default;

package/libEs5/core/createEvent.js

@@ -129,7 +129,7 @@ var _default = function _default() {
       return shouldSendEvent;
     },
     getViewName: function getViewName() {
-      if (!userXdm || !userXdm.web || !userXdm.web.webPageDetails || !userXdm.web.webPageDetails.viewName) {
+      if (!userXdm || !userXdm.web || !userXdm.web.webPageDetails) {
         return undefined;
       }
       return userXdm.web.webPageDetails.viewName;

package/libEs5/core/createEventManager.js

@@ -4,6 +4,7 @@ exports.default = void 0;
 var _pageWideScope = require("../constants/pageWideScope");
 var _utils = require("../utils");
 var _request = require("../utils/request");
+var _excluded = ["edgeConfigOverrides"];
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -15,7 +16,11 @@ 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.
 */
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var EVENT_CANCELLATION_MESSAGE = "Event was canceled because the onBeforeEventSend callback returned false.";
 var _default = function _default(_ref) {
   var config = _ref.config,
@@ -32,19 +37,13 @@ var _default = function _default(_ref) {
   return {
     createEvent: createEvent,
     /**
-     * Sends an event. This includes running the event and payload through
-     * the appropriate lifecycle hooks, sending the request to the server,
-     * and handling the response.
-     * @param {Object} event This will be JSON stringified and used inside
-     * the request payload.
-     * @param {Object} [options]
-     * @param {boolean} [options.renderDecisions=false]
-     * @param {Array} [options.decisionScopes] Note: this option will soon
-     * be deprecated, please use *personalization.decisionScopes* instead
-     * @param {Object} [options.personalization]
-     * @param {Object} [options.serverState]
-     * This will be passed to components
-     * so they can take appropriate action.
+     * Sends an event. This includes running the event and payload through the
+     * appropriate lifecycle hooks, sending the request to the server, and
+     * handling the response.
+     * @param {Object} event This will be JSON stringified and used inside the
+     * request payload.
+     * @param {Object} [options] Options to pass on to the onBeforeEvent
+     * lifecycle method
      * @param {Object} [options.edgeConfigOverrides] Settings that take
      * precedence over the global datastream configuration, including which
      * datastream to use.
@@ -52,11 +51,8 @@ var _default = function _default(_ref) {
      */
     sendEvent: function sendEvent(event) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var _options$renderDecisi = options.renderDecisions,
-        renderDecisions = _options$renderDecisi === void 0 ? false : _options$renderDecisi,
-        decisionScopes = options.decisionScopes,
-        localConfigOverrides = options.edgeConfigOverrides,
-        personalization = options.personalization;
+      var localConfigOverrides = options.edgeConfigOverrides,
+        otherOptions = _objectWithoutProperties(options, _excluded);
       var requestParams = (0, _request.createRequestParams)({
         payload: createDataCollectionRequestPayload(),
         localConfigOverrides: localConfigOverrides,
@@ -65,14 +61,11 @@ var _default = function _default(_ref) {
       var request = createDataCollectionRequest(requestParams);
       var onResponseCallbackAggregator = (0, _utils.createCallbackAggregator)();
       var onRequestFailureCallbackAggregator = (0, _utils.createCallbackAggregator)();
-      return lifecycle.onBeforeEvent({
+      return lifecycle.onBeforeEvent(_objectSpread(_objectSpread({}, otherOptions), {}, {
         event: event,
-        renderDecisions: renderDecisions,
-        decisionScopes: decisionScopes,
-        personalization: personalization,
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: onRequestFailureCallbackAggregator.add
-      }).then(function () {
+      })).then(function () {
         requestParams.payload.addEvent(event);
         return consent.awaitConsent();
       }).then(function () {
@@ -110,8 +103,8 @@ var _default = function _default(_ref) {
     },
     applyResponse: function applyResponse(event) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var _options$renderDecisi2 = options.renderDecisions,
-        renderDecisions = _options$renderDecisi2 === void 0 ? false : _options$renderDecisi2,
+      var _options$renderDecisi = options.renderDecisions,
+        renderDecisions = _options$renderDecisi === void 0 ? false : _options$renderDecisi,
         _options$responseHead = options.responseHeaders,
         responseHeaders = _options$responseHead === void 0 ? {} : _options$responseHead,
         _options$responseBody = options.responseBody,

package/libEs5/utils/dom/selectNodesWithShadow.js

@@ -20,7 +20,7 @@ var splitWithShadow = function splitWithShadow(selector) {
   return selector.split(_shadowSeparator.default);
 };
 var transformPrefix = function transformPrefix(parent, selector) {
-  var result = selector.trim();
+  var result = selector;
   var hasChildCombinatorPrefix = (0, _startsWith.default)(result, ">");
   if (!hasChildCombinatorPrefix) {
     return result;
@@ -48,8 +48,15 @@ var _default = function _default(context, selector) {
   // find each subselector element based on the previously selected node's shadowRoot
   var parent = context;
   for (var i = 0; i < parts.length; i += 1) {
-    var part = transformPrefix(parent, parts[i]);
-    var partNode = (0, _querySelectorAll.default)(parent, part);
+    var part = parts[i].trim();
+    // if part is empty, it means there's a chained :eq:shadow selector
+    if (part === "" && parent.shadowRoot) {
+      parent = parent.shadowRoot;
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+    var prefixed = transformPrefix(parent, part);
+    var partNode = (0, _querySelectorAll.default)(parent, prefixed);
     if (partNode.length === 0 || !partNode[0] || !partNode[0].shadowRoot) {
       return partNode;
     }

package/libEs6/components/DataCollector/index.js

@@ -30,15 +30,12 @@ const createDataCollector = ({
           const {
             xdm,
             data,
-            documentUnloading = false,
+            documentUnloading,
             type,
             mergeId,
-            renderDecisions = false,
-            decisionScopes = [],
-            // Note: this option will soon be deprecated, please use personalization.decisionScopes instead
-            personalization = {},
             datasetId,
-            edgeConfigOverrides
+            edgeConfigOverrides,
+            ...eventManagerOptions
           } = options;
           const event = eventManager.createEvent();
           if (documentUnloading) {
@@ -56,18 +53,13 @@ const createDataCollector = ({
               eventMergeId: mergeId
             });
           }
-          const sendEventOptions = {
-            renderDecisions,
-            decisionScopes,
-            personalization
-          };
           if (edgeConfigOverrides) {
-            sendEventOptions.edgeConfigOverrides = edgeConfigOverrides;
+            eventManagerOptions.edgeConfigOverrides = edgeConfigOverrides;
           }
           if (datasetId) {
             logger.warn("The 'datasetId' option has been deprecated. Please use 'edgeConfigOverrides.com_adobe_experience_platform.datasets.event.datasetId' instead.");
-            sendEventOptions.edgeConfigOverrides = edgeConfigOverrides || {};
-            deepAssign(sendEventOptions.edgeConfigOverrides, {
+            eventManagerOptions.edgeConfigOverrides = edgeConfigOverrides || {};
+            deepAssign(eventManagerOptions.edgeConfigOverrides, {
               com_adobe_experience_platform: {
                 datasets: {
                   event: {
@@ -77,7 +69,7 @@ const createDataCollector = ({
               }
             });
           }
-          return eventManager.sendEvent(event, sendEventOptions);
+          return eventManager.sendEvent(event, eventManagerOptions);
         }
       },
       applyResponse: {

package/libEs6/components/DataCollector/validateApplyResponse.js

@@ -23,9 +23,9 @@ export default (({
       })).required()
     }).required(),
     personalization: objectOf({
-      sendDisplayNotifications: boolean().default(true)
+      sendDisplayEvent: boolean().default(true)
     }).default({
-      sendDisplayNotifications: true
+      sendDisplayEvent: true
     })
   }).noUnknownFields();
   return validator(options);

package/libEs6/components/DataCollector/validateUserEventOptions.js

@@ -33,14 +33,16 @@ export default (({
     personalization: objectOf({
       decisionScopes: arrayOf(string()).uniqueItems(),
       surfaces: arrayOf(string()).uniqueItems(),
-      sendDisplayNotifications: boolean().default(true),
-      includePendingDisplayNotifications: boolean().default(false)
+      sendDisplayEvent: boolean().default(true),
+      includeRenderedPropositions: boolean().default(false),
+      requestPersonalization: boolean()
     }).default({
-      sendDisplayNotifications: true
+      sendDisplayEvent: true
     }),
     datasetId: string(),
     mergeId: string(),
-    edgeConfigOverrides: validateConfigOverride
+    edgeConfigOverrides: validateConfigOverride,
+    initializePersonalization: boolean()
   }).required().noUnknownFields();
   return eventOptionsValidator(options);
 });

package/libEs6/components/Personalization/constants/scopeType.js

@@ -10,4 +10,6 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-export const VIEW_SCOPE_TYPE = "view";
+export const VIEW_SCOPE_TYPE = "view";
+export const PAGE_SCOPE_TYPE = "page";
+export const PROPOSITION_SCOPE_TYPE = "proposition";

package/libEs6/components/Personalization/createApplyPropositions.js

@@ -10,14 +10,14 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { isNonEmptyArray, isObject } from "../../utils";
+import { isNonEmptyArray, isObject, defer } from "../../utils";
 import { DOM_ACTION, HTML_CONTENT_ITEM } from "./constants/schema";
 import PAGE_WIDE_SCOPE from "../../constants/pageWideScope";
 const SUPPORTED_SCHEMAS = [DOM_ACTION, HTML_CONTENT_ITEM];
 export default (({
   processPropositions,
   createProposition,
-  pendingDisplayNotifications,
+  renderedPropositions,
   viewCache
 }) => {
   const filterItemsPredicate = item => SUPPORTED_SCHEMAS.indexOf(item.schema) > -1;
@@ -76,6 +76,10 @@ export default (({
     metadata = {},
     viewName
   }) => {
+    // We need to immediately call concat so that subsequent sendEvent
+    // calls will wait for applyPropositions to complete before executing.
+    const renderedPropositionsDeferred = defer();
+    renderedPropositions.concat(renderedPropositionsDeferred.promise);
     const propositionsToExecute = preparePropositions({
       propositions,
       metadata
@@ -90,7 +94,7 @@ export default (({
         render,
         returnedPropositions
       } = processPropositions([...propositionsToExecute, ...additionalPropositions]);
-      pendingDisplayNotifications.concat(render());
+      render().then(renderedPropositionsDeferred.resolve);
       return {
         propositions: returnedPropositions
       };

package/libEs6/components/Personalization/createClickStorage.js

@@ -14,22 +14,30 @@ const metasToArray = metas => {
   return Object.keys(metas).map(key => {
     return {
       id: key,
-      scope: metas[key].scope,
-      scopeDetails: metas[key].scopeDetails,
-      trackingLabel: metas[key].trackingLabel
+      ...metas[key]
     };
   });
 };
 export default (() => {
   const clickStorage = {};
-  const storeClickMetrics = value => {
-    if (!clickStorage[value.selector]) {
-      clickStorage[value.selector] = {};
+  const storeClickMetrics = ({
+    selector,
+    meta: {
+      id,
+      scope,
+      scopeDetails,
+      trackingLabel,
+      scopeType
     }
-    clickStorage[value.selector][value.meta.id] = {
-      scope: value.meta.scope,
-      scopeDetails: value.meta.scopeDetails,
-      trackingLabel: value.meta.trackingLabel
+  }) => {
+    if (!clickStorage[selector]) {
+      clickStorage[selector] = {};
+    }
+    clickStorage[selector][id] = {
+      scope,
+      scopeDetails,
+      trackingLabel,
+      scopeType
     };
   };
   const getClickSelectors = () => {

package/libEs6/components/Personalization/createComponent.js

@@ -10,10 +10,11 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { noop } from "../../utils";
+import { noop, flatMap, isNonEmptyArray } from "../../utils";
 import createPersonalizationDetails from "./createPersonalizationDetails";
 import { AUTHORING_ENABLED } from "./constants/loggerMessage";
 import validateApplyPropositionsOptions from "./validateApplyPropositionsOptions";
+import { PropositionEventType } from "./constants/propositionEventType";
 export default (({
   getPageLocation,
   logger,
@@ -26,7 +27,8 @@ export default (({
   showContainers,
   applyPropositions,
   setTargetMigration,
-  pendingNotificationsHandler
+  mergeDecisionsMeta,
+  renderedPropositions
 }) => {
   return {
     lifecycle: {
@@ -67,11 +69,9 @@ export default (({
           isCacheInitialized: viewCache.isInitialized(),
           logger
         });
-        const handlerPromises = [];
-        if (personalizationDetails.shouldAddPendingDisplayNotifications()) {
-          handlerPromises.push(pendingNotificationsHandler({
-            event
-          }));
+        const decisionsMetaPromises = [];
+        if (personalizationDetails.shouldIncludeRenderedPropositions()) {
+          decisionsMetaPromises.push(renderedPropositions.clear());
         }
         if (personalizationDetails.shouldFetchData()) {
           const cacheUpdate = viewCache.createCacheUpdate(personalizationDetails.getViewName());
@@ -84,16 +84,25 @@ export default (({
           });
         } else if (personalizationDetails.shouldUseCachedData()) {
           // eslint-disable-next-line consistent-return
-          handlerPromises.push(viewChangeHandler({
+          decisionsMetaPromises.push(viewChangeHandler({
             personalizationDetails,
             event,
             onResponse,
             onRequestFailure
           }));
         }
-        // We can wait for personalization to be applied and for
-        // the fetch data request to complete in parallel.
-        return Promise.all(handlerPromises);
+
+        // This promise.all waits for both the pending display notifications to be resolved
+        // (i.e. the top of page call to finish rendering) and the view change handler to
+        // finish rendering anything for this view.
+        return Promise.all(decisionsMetaPromises).then(decisionsMetas => {
+          // We only want to call mergeDecisionsMeta once, but we can get the propositions
+          // from two places: the pending display notifications and the view change handler.
+          const decisionsMeta = flatMap(decisionsMetas, dms => dms);
+          if (isNonEmptyArray(decisionsMeta)) {
+            mergeDecisionsMeta(event, decisionsMeta, PropositionEventType.DISPLAY);
+          }
+        });
       },
       onClick({
         event,