@atlaskit/react-ufo 4.10.0 → 4.10.2

package/dist/es2019/vc/vc-observer-new/index.js

@@ -196,6 +196,9 @@ export default class VCObserverNew {
       start,
       stop,
       interactionId,
+      interactionType,
+      interactionAbortReason,
+      isPageVisible,
       include3p,
       excludeSmartAnswersInSearch
     } = param;
@@ -214,9 +217,12 @@ export default class VCObserverNew {
       startTime: start,
       stopTime: stop,
       interactionId,
+      interactionType,
       isPostInteraction: this.isPostInteraction,
       include3p,
-      excludeSmartAnswersInSearch
+      excludeSmartAnswersInSearch,
+      isPageVisible,
+      interactionAbortReason
     });
     if (fy25_03) {
       results.push(fy25_03);
@@ -230,8 +236,11 @@ export default class VCObserverNew {
         startTime: start,
         stopTime: stop,
         interactionId,
+        interactionType,
         isPostInteraction: this.isPostInteraction,
-        include3p
+        include3p,
+        isPageVisible,
+        interactionAbortReason
       });
       if (vcNext) {
         results.push(vcNext);

package/dist/es2019/vc/vc-observer-new/metric-calculator/abstract-base-vc-calculator.js

@@ -1,7 +1,4 @@
 import { fg } from '@atlaskit/platform-feature-flags';
-import getPageVisibilityUpToTTAI from '../../../create-payload/utils/get-page-visibility-up-to-ttai';
-import { getInteractionId } from '../../../interaction-id-context';
-import { interactions } from '../../../interaction-metrics/common/constants';
 import { cssIssueOccurrence } from '../viewport-observer/utils/track-display-content-occurrence';
 import { calculateTTVCPercentilesWithDebugInfo } from './percentile-calc';
 import getViewportHeight from './utils/get-viewport-height';
@@ -55,7 +52,7 @@ export default class AbstractVCCalculatorBase {
     }
     return labelStacks;
   }
-  async calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, allEntries, include3p, excludeSmartAnswersInSearch) {
+  async calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionType, isPageVisible, interactionId, dirtyReason, allEntries, include3p, excludeSmartAnswersInSearch, interactionAbortReason) {
     var _window, _window2, _window6, _window8;
     const percentiles = [25, 50, 75, 80, 85, 90, 95, 98, 99, 100];
     const viewportEntries = this.filterViewportEntries(filteredEntries);
@@ -212,18 +209,13 @@ export default class AbstractVCCalculatorBase {
     let v3RevisionDebugDetails = null;
     if (shouldCalculateDebugDetails) {
       if (fg('platform_ufo_unify_abort_status_in_ttvc_debug_data')) {
-        var _activeInteractionId$;
-        // NOTE: using this instead of directly calling `getActiveInteraction()` to get around circular dependencies
-        const activeInteractionId = getInteractionId();
-        const activeInteraction = interactions.get((_activeInteractionId$ = activeInteractionId.current) !== null && _activeInteractionId$ !== void 0 ? _activeInteractionId$ : '');
-        const pageVisibilityUpToTTAI = activeInteraction ? getPageVisibilityUpToTTAI(activeInteraction) : null;
-        const isBackgrounded = pageVisibilityUpToTTAI !== 'visible';
         v3RevisionDebugDetails = {
           revision: this.revisionNo,
-          isClean: isVCClean && !(activeInteraction !== null && activeInteraction !== void 0 && activeInteraction.abortReason) && !isBackgrounded,
-          abortReason: isBackgrounded ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.abortReason,
+          isClean: isVCClean && !interactionAbortReason && isPageVisible,
+          abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
           vcLogs: enhancedVcLogs,
-          interactionId
+          interactionId,
+          interactionType
         };
       } else {
         v3RevisionDebugDetails = {
@@ -274,7 +266,10 @@ export default class AbstractVCCalculatorBase {
     interactionId,
     isPostInteraction,
     include3p,
-    excludeSmartAnswersInSearch
+    excludeSmartAnswersInSearch,
+    interactionType,
+    isPageVisible,
+    interactionAbortReason
   }) {
     var _vcDetails$90$t, _vcDetails$;
     const filteredEntries = orderedEntries.filter(entry => {
@@ -294,7 +289,7 @@ export default class AbstractVCCalculatorBase {
         abortTimestamp: getVCCleanStatusResult.abortTimestamp
       };
     }
-    const vcDetails = await this.calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, orderedEntries, include3p, excludeSmartAnswersInSearch);
+    const vcDetails = await this.calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionType, isPageVisible, interactionId, dirtyReason, orderedEntries, include3p, excludeSmartAnswersInSearch, interactionAbortReason);
     const result = {
       revision: this.revisionNo,
       clean: true,

package/dist/es2019/vc/vc-observer-new/viewport-observer/index.js

@@ -9,6 +9,7 @@ import createMutationObserver from './mutation-observer';
 import createPerformanceObserver from './performance-observer';
 import checkCssProperty from './utils/check-display-content';
 import checkWithinComponent, { cleanupCaches } from './utils/check-within-component';
+import { getMutatedElements } from './utils/get-mutated-elements';
 import isInVCIgnoreIfNoLayoutShiftMarker from './utils/is-in-vc-ignore-if-no-layout-shift-marker';
 import trackDisplayContentsOccurrence from './utils/track-display-content-occurrence';
 function isElementVisible(element) {
@@ -188,17 +189,17 @@ export default class ViewportObserver {
           continue;
         }
         if (fg('platform_ufo_vcnext_v4_enabled')) {
-          var _window, _window$getComputedSt;
-          if (((_window = window) === null || _window === void 0 ? void 0 : (_window$getComputedSt = _window.getComputedStyle(addedNode)) === null || _window$getComputedSt === void 0 ? void 0 : _window$getComputedSt.display) === 'contents') {
-            for (const child of addedNode.children) {
-              if (child instanceof HTMLElement) {
-                var _this$intersectionObs8;
-                (_this$intersectionObs8 = this.intersectionObserver) === null || _this$intersectionObs8 === void 0 ? void 0 : _this$intersectionObs8.watchAndTag(child, 'mutation:display-contents-children-element');
-              }
+          for (const {
+            isDisplayContentsElementChildren,
+            element
+          } of getMutatedElements(addedNode)) {
+            if (isDisplayContentsElementChildren) {
+              var _this$intersectionObs8;
+              (_this$intersectionObs8 = this.intersectionObserver) === null || _this$intersectionObs8 === void 0 ? void 0 : _this$intersectionObs8.watchAndTag(element, 'mutation:display-contents-children-element');
+            } else {
+              var _this$intersectionObs9;
+              (_this$intersectionObs9 = this.intersectionObserver) === null || _this$intersectionObs9 === void 0 ? void 0 : _this$intersectionObs9.watchAndTag(element, createElementMutationsWatcher(removedNodeRects));
             }
-          } else {
-            var _this$intersectionObs9;
-            (_this$intersectionObs9 = this.intersectionObserver) === null || _this$intersectionObs9 === void 0 ? void 0 : _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
           }
         } else {
           if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
@@ -299,7 +300,6 @@ export default class ViewportObserver {
           }
         };
       });
-      // }
     });
     _defineProperty(this, "handleLayoutShift", ({
       time,

package/dist/es2019/vc/vc-observer-new/viewport-observer/utils/get-mutated-elements.js

@@ -0,0 +1,27 @@
+const MAX_NESTED_LEVELS_OF_DISPLAY_CONTENT_ELEMENTS_HANDLED = 3;
+export function getMutatedElements(element, depthLevel = 0) {
+  var _window, _window$getComputedSt;
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$getComputedSt = _window.getComputedStyle(element)) === null || _window$getComputedSt === void 0 ? void 0 : _window$getComputedSt.display) === 'contents') {
+    const mutatedElements = [];
+    const nestedDisplayContentsElementChildren = [];
+    for (const child of element.children) {
+      var _window2, _window2$getComputedS;
+      if (((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$getComputedS = _window2.getComputedStyle(child)) === null || _window2$getComputedS === void 0 ? void 0 : _window2$getComputedS.display) === 'contents') {
+        nestedDisplayContentsElementChildren.push(child);
+      }
+      mutatedElements.push({
+        element: child,
+        isDisplayContentsElementChildren: true
+      });
+    }
+    if (depthLevel < MAX_NESTED_LEVELS_OF_DISPLAY_CONTENT_ELEMENTS_HANDLED && nestedDisplayContentsElementChildren.length > 0) {
+      return [...mutatedElements, ...nestedDisplayContentsElementChildren.map(element => getMutatedElements(element, depthLevel + 1)).flat()];
+    }
+    return mutatedElements;
+  } else {
+    return [{
+      element,
+      isDisplayContentsElementChildren: false
+    }];
+  }
+}

package/dist/esm/create-experimental-interaction-metrics-payload/index.js

@@ -84,18 +84,19 @@ export function getExperimentalVCMetrics(_x) {
 }
 function _getExperimentalVCMetrics() {
   _getExperimentalVCMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interaction) {
-    var vcObserver, _interaction$apdex, prefix, result, VC, pageVisibilityUpToTTAI;
+    var vcObserver, pageVisibilityUpToTTAI, _interaction$apdex, prefix, result, VC;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           // Use per-interaction VC observer if available, otherwise fall back to global experimentalVC
           vcObserver = interaction.experimentalVCObserver || experimentalVC.vcObserver;
+          pageVisibilityUpToTTAI = getPageVisibilityState(interaction.start, interaction.end);
           if (!vcObserver) {
             _context.next = 13;
             break;
           }
           prefix = 'ufo-experimental';
-          _context.next = 5;
+          _context.next = 6;
           return vcObserver.getVCResult({
             start: interaction.start,
             stop: interaction.end,
@@ -104,18 +105,20 @@ function _getExperimentalVCMetrics() {
             prefix: prefix,
             vc: interaction.vc,
             experienceKey: interaction.ufoName,
-            interactionId: interaction.id
+            interactionId: interaction.id,
+            interactionType: interaction.type,
+            isPageVisible: pageVisibilityUpToTTAI === 'visible',
+            interactionAbortReason: interaction.abortReason
           });
-        case 5:
+        case 6:
           result = _context.sent;
           VC = result === null || result === void 0 ? void 0 : result['metrics:vc'];
           if (!(!VC || !(result !== null && result !== void 0 && result["".concat(prefix, ":vc:clean")]))) {
-            _context.next = 9;
+            _context.next = 10;
             break;
           }
           return _context.abrupt("return", result);
-        case 9:
-          pageVisibilityUpToTTAI = getPageVisibilityState(interaction.start, interaction.end);
+        case 10:
           if (!(interaction.abortReason || pageVisibilityUpToTTAI !== 'visible')) {
             _context.next = 12;
             break;

package/dist/esm/create-payload/utils/get-vc-metrics.js

@@ -19,6 +19,7 @@ function _getVCMetrics() {
       config,
       interactionStatus,
       pageVisibilityUpToTTAI,
+      isPageVisible,
       shouldReportVCMetrics,
       observer,
       isSSREnabled,
@@ -49,14 +50,15 @@ function _getVCMetrics() {
         case 7:
           interactionStatus = getInteractionStatus(interaction);
           pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
-          shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible'; // Use per-interaction VC observer if available, otherwise fall back to global
+          isPageVisible = pageVisibilityUpToTTAI === 'visible';
+          shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && isPageVisible; // Use per-interaction VC observer if available, otherwise fall back to global
           observer = interaction.vcObserver;
           if (observer) {
-            _context.next = 13;
+            _context.next = 14;
             break;
           }
           return _context.abrupt("return", {});
-        case 13:
+        case 14:
           isSSREnabled = interaction.type === 'page_load' && ((config === null || config === void 0 ? void 0 : config.ssr) || (config === null || config === void 0 || (_config$vc$ssrWhiteli = config.vc.ssrWhitelist) === null || _config$vc$ssrWhiteli === void 0 ? void 0 : _config$vc$ssrWhiteli.includes(interaction.ufoName)));
           ssr = interaction.type === 'page_load' && isSSREnabled ? {
             ssr: getSSRDoneTimeValue(config)
@@ -64,7 +66,7 @@ function _getVCMetrics() {
           postInteractionLog.setVCObserverSSRConfig(ssr);
           tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
           prefix = 'ufo';
-          _context.next = 20;
+          _context.next = 21;
           return observer.getVCResult(_objectSpread(_objectSpread({
             start: interaction.start,
             stop: interaction.end,
@@ -78,9 +80,11 @@ function _getVCMetrics() {
             includeSSRRatio: (_config$vc3 = config.vc) === null || _config$vc3 === void 0 ? void 0 : _config$vc3.includeSSRRatio
           }, ssr), {}, {
             include3p: include3p,
-            excludeSmartAnswersInSearch: excludeSmartAnswersInSearch
+            excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
+            interactionType: interaction.type,
+            isPageVisible: isPageVisible
           }));
-        case 20:
+        case 21:
           result = _context.sent;
           observer.stop(interaction.ufoName);
           if (!include3p) {
@@ -93,15 +97,15 @@ function _getVCMetrics() {
             return revision === mostRecentVCRevision;
           });
           if (!(!shouldReportVCMetrics || !(mostRecentVCRevisionPayload !== null && mostRecentVCRevisionPayload !== void 0 && mostRecentVCRevisionPayload.clean))) {
-            _context.next = 27;
+            _context.next = 28;
             break;
           }
           return _context.abrupt("return", result);
-        case 27:
+        case 28:
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': mostRecentVCRevisionPayload['metric:vc90']
           }));
-        case 28:
+        case 29:
         case "end":
           return _context.stop();
       }

package/dist/esm/interaction-metrics/index.js

@@ -542,7 +542,7 @@ export var ModuleLoadingProfiler = {
     removeHoldByID(currentInteractionId, id);
   }
 };
-export function addError(interactionId, name, labelStack, errorType, errorMessage, errorStack, forcedError) {
+export function addError(interactionId, name, labelStack, errorType, errorMessage, errorStack, forcedError, errorHash) {
   var interaction = interactions.get(interactionId);
   if (interaction != null) {
     interaction.errors.push({
@@ -551,18 +551,20 @@ export function addError(interactionId, name, labelStack, errorType, errorMessag
       errorType: errorType,
       errorMessage: errorMessage,
       errorStack: errorStack,
-      forcedError: forcedError
+      forcedError: forcedError,
+      errorHash: errorHash
     });
   }
 }
-export function addErrorToAll(name, labelStack, errorType, errorMessage, errorStack) {
+export function addErrorToAll(name, labelStack, errorType, errorMessage, errorStack, errorHash) {
   interactions.forEach(function (interaction) {
     interaction.errors.push({
       name: name,
       labelStack: labelStack,
       errorType: errorType,
       errorMessage: errorMessage,
-      errorStack: errorStack
+      errorStack: errorStack,
+      errorHash: errorHash
     });
   });
 }

package/dist/esm/interaction-metrics/post-interaction-log.js

@@ -7,6 +7,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig } from '../config';
+import { getPageVisibilityState } from '../hidden-timing';
 import { VCObserverWrapper } from '../vc';
 var POST_INTERACTION_LOG_SEND_DEFAULT_TIMEOUT = 3000;
 var PostInteractionLog = /*#__PURE__*/function () {
@@ -115,7 +116,7 @@ var PostInteractionLog = /*#__PURE__*/function () {
     value: (function () {
       var _sendPostInteractionLog = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _this$vcObserver4, _config$vc, _config$vc2, _this$vcObserver5;
-        var _this$vcObserver3, config, postInteractionFinishVCResult;
+        var _this$vcObserver3, pageVisibilityState, isPageVisible, config, postInteractionFinishVCResult;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -127,9 +128,11 @@ var PostInteractionLog = /*#__PURE__*/function () {
               (_this$vcObserver3 = this.vcObserver) === null || _this$vcObserver3 === void 0 || _this$vcObserver3.stop();
               return _context.abrupt("return");
             case 4:
+              pageVisibilityState = getPageVisibilityState(this.lastInteractionFinish.start, this.lastInteractionFinish.end);
+              isPageVisible = pageVisibilityState === 'visible';
               config = getConfig();
-              _context.next = 7;
-              return (_this$vcObserver4 = this.vcObserver) === null || _this$vcObserver4 === void 0 ? void 0 : _this$vcObserver4.getVCResult(_objectSpread({
+              _context.next = 9;
+              return (_this$vcObserver4 = this.vcObserver) === null || _this$vcObserver4 === void 0 ? void 0 : _this$vcObserver4.getVCResult(_objectSpread(_objectSpread({
                 start: this.lastInteractionFinish.start,
                 stop: performance.now(),
                 tti: -1,
@@ -140,8 +143,12 @@ var PostInteractionLog = /*#__PURE__*/function () {
                 interactionId: this.lastInteractionFinish.id,
                 includeSSRInV3: config === null || config === void 0 || (_config$vc = config.vc) === null || _config$vc === void 0 ? void 0 : _config$vc.includeSSRInV3,
                 includeSSRRatio: config === null || config === void 0 || (_config$vc2 = config.vc) === null || _config$vc2 === void 0 ? void 0 : _config$vc2.includeSSRRatio
-              }, this.vcObserverSSRConfig));
-            case 7:
+              }, this.vcObserverSSRConfig), {}, {
+                interactionType: this.lastInteractionFinish.type,
+                isPageVisible: isPageVisible,
+                interactionAbortReason: this.lastInteractionFinish.abortReason
+              }));
+            case 9:
               postInteractionFinishVCResult = _context.sent;
               (_this$vcObserver5 = this.vcObserver) === null || _this$vcObserver5 === void 0 || _this$vcObserver5.stop();
               this.sinkHandlerFn({
@@ -151,7 +158,7 @@ var PostInteractionLog = /*#__PURE__*/function () {
                 lastInteractionFinishVCResult: this.lastInteractionFinishVCResult
               });
               this.reset();
-            case 11:
+            case 13:
             case "end":
               return _context.stop();
           }

package/dist/esm/vc/index.js

@@ -142,7 +142,10 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
                 interactionId: param.interactionId,
                 ssr: param.includeSSRInV3 ? param.ssr : undefined,
                 include3p: include3p,
-                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch
+                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
+                interactionType: param.interactionType,
+                isPageVisible: param.isPageVisible,
+                interactionAbortReason: param.interactionAbortReason
               });
             case 12:
               _context.t1 = _context.sent;

package/dist/esm/vc/vc-observer-new/index.js

@@ -231,11 +231,11 @@ var VCObserverNew = /*#__PURE__*/function () {
     key: "getVCResult",
     value: function () {
       var _getVCResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
-        var start, stop, interactionId, include3p, excludeSmartAnswersInSearch, results, calculator_fy25_03, orderedEntries, fy25_03, calculator_next, vcNext;
+        var start, stop, interactionId, interactionType, interactionAbortReason, isPageVisible, include3p, excludeSmartAnswersInSearch, results, calculator_fy25_03, orderedEntries, fy25_03, calculator_next, vcNext;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              start = param.start, stop = param.stop, interactionId = param.interactionId, include3p = param.include3p, excludeSmartAnswersInSearch = param.excludeSmartAnswersInSearch;
+              start = param.start, stop = param.stop, interactionId = param.interactionId, interactionType = param.interactionType, interactionAbortReason = param.interactionAbortReason, isPageVisible = param.isPageVisible, include3p = param.include3p, excludeSmartAnswersInSearch = param.excludeSmartAnswersInSearch;
               results = [];
               this.addStartEntry(start);
               calculator_fy25_03 = new VCCalculator_FY25_03();
@@ -252,9 +252,12 @@ var VCObserverNew = /*#__PURE__*/function () {
                 startTime: start,
                 stopTime: stop,
                 interactionId: interactionId,
+                interactionType: interactionType,
                 isPostInteraction: this.isPostInteraction,
                 include3p: include3p,
-                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch
+                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
+                isPageVisible: isPageVisible,
+                interactionAbortReason: interactionAbortReason
               });
             case 8:
               fy25_03 = _context.sent;
@@ -274,8 +277,11 @@ var VCObserverNew = /*#__PURE__*/function () {
                 startTime: start,
                 stopTime: stop,
                 interactionId: interactionId,
+                interactionType: interactionType,
                 isPostInteraction: this.isPostInteraction,
-                include3p: include3p
+                include3p: include3p,
+                isPageVisible: isPageVisible,
+                interactionAbortReason: interactionAbortReason
               });
             case 14:
               vcNext = _context.sent;

package/dist/esm/vc/vc-observer-new/metric-calculator/abstract-base-vc-calculator.js

@@ -11,9 +11,6 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { fg } from '@atlaskit/platform-feature-flags';
-import getPageVisibilityUpToTTAI from '../../../create-payload/utils/get-page-visibility-up-to-ttai';
-import { getInteractionId } from '../../../interaction-id-context';
-import { interactions } from '../../../interaction-metrics/common/constants';
 import { cssIssueOccurrence } from '../viewport-observer/utils/track-display-content-occurrence';
 import { calculateTTVCPercentilesWithDebugInfo } from './percentile-calc';
 import getViewportHeight from './utils/get-viewport-height';
@@ -105,9 +102,9 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
   }, {
     key: "calculateWithDebugInfo",
     value: function () {
-      var _calculateWithDebugInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, allEntries, include3p, excludeSmartAnswersInSearch) {
+      var _calculateWithDebugInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionType, isPageVisible, interactionId, dirtyReason, allEntries, include3p, excludeSmartAnswersInSearch, interactionAbortReason) {
         var _window, _window2, _window6, _window8;
-        var percentiles, viewportEntries, vcLogs, vcDetails, percentileIndex, entryDataBuffer, _iterator4, _step4, _entry3, time, viewportPercentage, entries, elementNames, previousResult, i, percentile, enhancedVcLogs, shouldCalculate3p, shouldCalculateDebugDetails, _window3, _window4, _window5, sortedVcLogs, maxViewportPercentageAtTime, maxSoFar, _iterator5, _step5, log, getBiggestPreviousViewportPercentage, ignoredEntriesByTime, _iterator6, _step6, _entry4, _ignoredEntriesByTime, _viewportData$rect, _viewportData$previou, viewportData, timestamp, additionalVcLogs, _iterator7, _step7, _step7$value, _timestamp, ignoredEntries, _viewportPercentage, v3RevisionDebugDetails, _activeInteractionId$, activeInteractionId, activeInteraction, pageVisibilityUpToTTAI, isBackgrounded, _window7, _window7$__ufo_devtoo, _window9, _window9$__on_ufo_vc_;
+        var percentiles, viewportEntries, vcLogs, vcDetails, percentileIndex, entryDataBuffer, _iterator4, _step4, _entry3, time, viewportPercentage, entries, elementNames, previousResult, i, percentile, enhancedVcLogs, shouldCalculate3p, shouldCalculateDebugDetails, _window3, _window4, _window5, sortedVcLogs, maxViewportPercentageAtTime, maxSoFar, _iterator5, _step5, log, getBiggestPreviousViewportPercentage, ignoredEntriesByTime, _iterator6, _step6, _entry4, _ignoredEntriesByTime, _viewportData$rect, _viewportData$previou, viewportData, timestamp, additionalVcLogs, _iterator7, _step7, _step7$value, _timestamp, ignoredEntries, _viewportPercentage, v3RevisionDebugDetails, _window7, _window7$__ufo_devtoo, _window9, _window9$__on_ufo_vc_;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -308,17 +305,13 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
               v3RevisionDebugDetails = null;
               if (shouldCalculateDebugDetails) {
                 if (fg('platform_ufo_unify_abort_status_in_ttvc_debug_data')) {
-                  // NOTE: using this instead of directly calling `getActiveInteraction()` to get around circular dependencies
-                  activeInteractionId = getInteractionId();
-                  activeInteraction = interactions.get((_activeInteractionId$ = activeInteractionId.current) !== null && _activeInteractionId$ !== void 0 ? _activeInteractionId$ : '');
-                  pageVisibilityUpToTTAI = activeInteraction ? getPageVisibilityUpToTTAI(activeInteraction) : null;
-                  isBackgrounded = pageVisibilityUpToTTAI !== 'visible';
                   v3RevisionDebugDetails = {
                     revision: this.revisionNo,
-                    isClean: isVCClean && !(activeInteraction !== null && activeInteraction !== void 0 && activeInteraction.abortReason) && !isBackgrounded,
-                    abortReason: isBackgrounded ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.abortReason,
+                    isClean: isVCClean && !interactionAbortReason && isPageVisible,
+                    abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
                     vcLogs: enhancedVcLogs,
-                    interactionId: interactionId
+                    interactionId: interactionId,
+                    interactionType: interactionType
                   };
                 } else {
                   v3RevisionDebugDetails = {
@@ -365,7 +358,7 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
           }
         }, _callee, this, [[10, 22, 25, 28]]);
       }));
-      function calculateWithDebugInfo(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x0) {
+      function calculateWithDebugInfo(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x0, _x1, _x10, _x11) {
         return _calculateWithDebugInfo.apply(this, arguments);
       }
       return calculateWithDebugInfo;
@@ -377,11 +370,11 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
         var _this = this,
           _vcDetails$90$t,
           _vcDetails$;
-        var startTime, stopTime, orderedEntries, interactionId, isPostInteraction, include3p, excludeSmartAnswersInSearch, filteredEntries, isVCClean, dirtyReason, getVCCleanStatusResult, vcDetails, result;
+        var startTime, stopTime, orderedEntries, interactionId, isPostInteraction, include3p, excludeSmartAnswersInSearch, interactionType, isPageVisible, interactionAbortReason, filteredEntries, isVCClean, dirtyReason, getVCCleanStatusResult, vcDetails, result;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              startTime = _ref.startTime, stopTime = _ref.stopTime, orderedEntries = _ref.orderedEntries, interactionId = _ref.interactionId, isPostInteraction = _ref.isPostInteraction, include3p = _ref.include3p, excludeSmartAnswersInSearch = _ref.excludeSmartAnswersInSearch;
+              startTime = _ref.startTime, stopTime = _ref.stopTime, orderedEntries = _ref.orderedEntries, interactionId = _ref.interactionId, isPostInteraction = _ref.isPostInteraction, include3p = _ref.include3p, excludeSmartAnswersInSearch = _ref.excludeSmartAnswersInSearch, interactionType = _ref.interactionType, isPageVisible = _ref.isPageVisible, interactionAbortReason = _ref.interactionAbortReason;
               filteredEntries = orderedEntries.filter(function (entry) {
                 return _this.isEntryIncluded(entry, include3p, excludeSmartAnswersInSearch);
               });
@@ -401,7 +394,7 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
               });
             case 7:
               _context2.next = 9;
-              return this.calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, orderedEntries, include3p, excludeSmartAnswersInSearch);
+              return this.calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionType, isPageVisible, interactionId, dirtyReason, orderedEntries, include3p, excludeSmartAnswersInSearch, interactionAbortReason);
             case 9:
               vcDetails = _context2.sent;
               result = {
@@ -424,7 +417,7 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-      function calculate(_x1) {
+      function calculate(_x12) {
         return _calculate.apply(this, arguments);
       }
       return calculate;

package/dist/esm/vc/vc-observer-new/viewport-observer/index.js

@@ -16,6 +16,7 @@ import createMutationObserver from './mutation-observer';
 import createPerformanceObserver from './performance-observer';
 import checkCssProperty from './utils/check-display-content';
 import checkWithinComponent, { cleanupCaches } from './utils/check-within-component';
+import { getMutatedElements } from './utils/get-mutated-elements';
 import isInVCIgnoreIfNoLayoutShiftMarker from './utils/is-in-vc-ignore-if-no-layout-shift-marker';
 import trackDisplayContentsOccurrence from './utils/track-display-content-occurrence';
 function isElementVisible(element) {
@@ -117,7 +118,7 @@ var ViewportObserver = /*#__PURE__*/function () {
               _iterator = _createForOfIteratorHelper(addedNodes);
               _context2.prev = 4;
               _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs5, _this$intersectionObs6, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs7, _window, _iterator2, _step2, child, _this$intersectionObs8, _this$intersectionObs9, validTargets, _iterator3, _step3, _this$intersectionObs0, validTarget, _this$intersectionObs1;
+                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs5, _this$intersectionObs6, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs7, _iterator2, _step2, _step2$value, isDisplayContentsElementChildren, element, _this$intersectionObs8, _this$intersectionObs9, validTargets, _iterator3, _step3, _this$intersectionObs0, validTarget, _this$intersectionObs1;
                 return _regeneratorRuntime.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -230,22 +231,20 @@ var ViewportObserver = /*#__PURE__*/function () {
                       return _context.abrupt("return", 0);
                     case 45:
                       if (fg('platform_ufo_vcnext_v4_enabled')) {
-                        if (((_window = window) === null || _window === void 0 || (_window = _window.getComputedStyle(addedNode)) === null || _window === void 0 ? void 0 : _window.display) === 'contents') {
-                          _iterator2 = _createForOfIteratorHelper(addedNode.children);
-                          try {
-                            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                              child = _step2.value;
-                              if (child instanceof HTMLElement) {
-                                (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(child, 'mutation:display-contents-children-element');
-                              }
+                        _iterator2 = _createForOfIteratorHelper(getMutatedElements(addedNode));
+                        try {
+                          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                            _step2$value = _step2.value, isDisplayContentsElementChildren = _step2$value.isDisplayContentsElementChildren, element = _step2$value.element;
+                            if (isDisplayContentsElementChildren) {
+                              (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(element, 'mutation:display-contents-children-element');
+                            } else {
+                              (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(element, createElementMutationsWatcher(removedNodeRects));
                             }
-                          } catch (err) {
-                            _iterator2.e(err);
-                          } finally {
-                            _iterator2.f();
                           }
-                        } else {
-                          (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
+                        } catch (err) {
+                          _iterator2.e(err);
+                        } finally {
+                          _iterator2.f();
                         }
                       } else {
                         if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
@@ -392,7 +391,6 @@ var ViewportObserver = /*#__PURE__*/function () {
           }
         };
       });
-      // }
     });
     _defineProperty(this, "handleLayoutShift", function (_ref8) {
       var time = _ref8.time,

package/dist/esm/vc/vc-observer-new/viewport-observer/utils/get-mutated-elements.js

@@ -0,0 +1,43 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var MAX_NESTED_LEVELS_OF_DISPLAY_CONTENT_ELEMENTS_HANDLED = 3;
+export function getMutatedElements(element) {
+  var _window;
+  var depthLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  if (((_window = window) === null || _window === void 0 || (_window = _window.getComputedStyle(element)) === null || _window === void 0 ? void 0 : _window.display) === 'contents') {
+    var mutatedElements = [];
+    var nestedDisplayContentsElementChildren = [];
+    var _iterator = _createForOfIteratorHelper(element.children),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _window2;
+        var child = _step.value;
+        if (((_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.getComputedStyle(child)) === null || _window2 === void 0 ? void 0 : _window2.display) === 'contents') {
+          nestedDisplayContentsElementChildren.push(child);
+        }
+        mutatedElements.push({
+          element: child,
+          isDisplayContentsElementChildren: true
+        });
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    if (depthLevel < MAX_NESTED_LEVELS_OF_DISPLAY_CONTENT_ELEMENTS_HANDLED && nestedDisplayContentsElementChildren.length > 0) {
+      return [].concat(mutatedElements, _toConsumableArray(nestedDisplayContentsElementChildren.map(function (element) {
+        return getMutatedElements(element, depthLevel + 1);
+      }).flat()));
+    }
+    return mutatedElements;
+  } else {
+    return [{
+      element: element,
+      isDisplayContentsElementChildren: false
+    }];
+  }
+}

package/dist/types/common/common/types.d.ts

@@ -37,6 +37,7 @@ export interface InteractionError {
     errorMessage: string;
     errorStack?: string;
     forcedError?: boolean;
+    errorHash?: string;
 }
 interface FlushInfo {
     label?: string;