@atlaskit/react-ufo 4.4.6 → 4.5.1

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

@@ -622,15 +622,14 @@ function finishInteraction(id, data, endTime = performance.now()) {
     postInteractionLog.stopVCObserver();
   }
   if (fg('platform_ufo_enable_ttai_with_3p')) {
-    if (!data.hold3pActive || data.hold3pActive.size === 0) {
+    const sanitisedUfoName = sanitizeUfoName(data.ufoName);
+    if (!coinflip(getExtraInteractionRate(sanitisedUfoName, data.type))) {
+      interactionExtraMetrics.stopAll(id);
+    } else if (!data.hold3pActive || data.hold3pActive.size === 0) {
       var _getConfig5, _getConfig5$experimen;
       if (!((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5$experimen = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5$experimen !== void 0 && _getConfig5$experimen.enabled)) {
         remove(id);
       }
-      const sanitisedUfoName = sanitizeUfoName(data.ufoName);
-      if (!coinflip(getExtraInteractionRate(sanitisedUfoName, data.type))) {
-        interactionExtraMetrics.stopVCObserver();
-      }
     }
   } else {
     var _getConfig6, _getConfig6$experimen;
@@ -755,26 +754,30 @@ export function tryComplete(interactionId, endTime) {
     if (fg('platform_ufo_enable_ttai_with_3p')) {
       var _interaction$hold3pAc;
       const noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
-      if (noMoreActiveHolds) {
+      if (noMoreActiveHolds && interactionExtraMetrics.finishedInteractionId !== interactionId) {
+        // If it's not waiting for extra metrics to complete, finish the interaction as normal
         if (!activeSubmitted) {
+          var _getConfig1, _getConfig1$extraInte;
           finishInteraction(interactionId, interaction, endTime);
-          interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+          if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1$extraInte = _getConfig1.extraInteractionMetrics) !== null && _getConfig1$extraInte !== void 0 && _getConfig1$extraInte.enabled) {
+            interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+          }
           activeSubmitted = true;
         }
         if (noMoreExpHolds) {
-          var _getConfig1, _getConfig1$experimen;
-          if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1$experimen = _getConfig1.experimentalInteractionMetrics) !== null && _getConfig1$experimen !== void 0 && _getConfig1$experimen.enabled) {
+          var _getConfig10, _getConfig10$experime;
+          if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10$experime = _getConfig10.experimentalInteractionMetrics) !== null && _getConfig10$experime !== void 0 && _getConfig10$experime.enabled) {
             onExperimentalInteractionComplete(interactionId, interaction, endTime);
           }
           postInteraction();
         }
-        if (noMoreActive3pHolds) {
-          const data = {
-            ...interaction,
-            end: endTime
-          };
-          interactionExtraMetrics.onInteractionComplete(interactionId, data);
-        }
+      }
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        const data = {
+          ...interaction,
+          end: endTime
+        };
+        interactionExtraMetrics.onInteractionComplete(interactionId, data);
       }
     } else {
       if (noMoreActiveHolds) {
@@ -783,8 +786,8 @@ export function tryComplete(interactionId, endTime) {
           activeSubmitted = true;
         }
         if (noMoreExpHolds) {
-          var _getConfig10, _getConfig10$experime;
-          if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10$experime = _getConfig10.experimentalInteractionMetrics) !== null && _getConfig10$experime !== void 0 && _getConfig10$experime.enabled) {
+          var _getConfig11, _getConfig11$experime;
+          if ((_getConfig11 = getConfig()) !== null && _getConfig11 !== void 0 && (_getConfig11$experime = _getConfig11.experimentalInteractionMetrics) !== null && _getConfig11$experime !== void 0 && _getConfig11$experime.enabled) {
             onExperimentalInteractionComplete(interactionId, interaction, endTime);
           }
           postInteraction();
@@ -817,9 +820,7 @@ export function abort(interactionId, abortReason) {
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopVCObserver();
-      interactionExtraMetrics.reset();
-      remove(interactionId);
+      interactionExtraMetrics.stopAll(interactionId);
     }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
@@ -847,9 +848,7 @@ export function abortByNewInteraction(interactionId, interactionName) {
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopVCObserver();
-      interactionExtraMetrics.reset();
-      remove(interactionId);
+      interactionExtraMetrics.stopAll(interactionId);
     }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
@@ -881,9 +880,7 @@ export function abortAll(abortReason, abortedByInteractionName) {
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopVCObserver();
-      interactionExtraMetrics.reset();
-      remove(interactionId);
+      interactionExtraMetrics.stopAll(interactionId);
     }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
@@ -1007,7 +1004,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     addHoldByID(interactionId, [], ufoName, ufoName, true);
   }
   if (type === 'transition' || type === 'page_load') {
-    var _getConfig11, _getConfig11$postInte;
+    var _getConfig12, _getConfig12$postInte, _config$extraInteract;
     // Use per-interaction VC observer if available, otherwise fall back to global
     const observer = vcObserver;
     if (observer) {
@@ -1018,7 +1015,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     }
     // Start post interaction observer for all if config is enabled
     // in case ufoName is updated at later time
-    if ((_getConfig11 = getConfig()) !== null && _getConfig11 !== void 0 && (_getConfig11$postInte = _getConfig11.postInteractionLog) !== null && _getConfig11$postInte !== void 0 && _getConfig11$postInte.enabled) {
+    if ((_getConfig12 = getConfig()) !== null && _getConfig12 !== void 0 && (_getConfig12$postInte = _getConfig12.postInteractionLog) !== null && _getConfig12$postInte !== void 0 && _getConfig12$postInte.enabled) {
       postInteractionLog.startVCObserver({
         startTime
       });
@@ -1028,13 +1025,10 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
         startTime
       });
     }
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      var _config$extraInteract;
-      if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled) {
-        interactionExtraMetrics.startVCObserver({
-          startTime
-        }, interactionId);
-      }
+    if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.startVCObserver({
+        startTime
+      }, interactionId);
     }
   }
   if (type === 'press' && fg('platform_ufo_enable_vc_press_interactions')) {

package/dist/es2019/interaction-metrics/interaction-extra-metrics.js

@@ -60,4 +60,9 @@ export default class InteractionExtraMetrics {
   reset() {
     this.finishedInteractionId = null;
   }
+  stopAll(id) {
+    this.stopVCObserver();
+    remove(id);
+    this.reset();
+  }
 }

package/dist/es2019/interaction-metrics-init/index.js

@@ -97,7 +97,7 @@ export function init(analyticsWebClientAsync, config) {
   initialiseMemoryObserver();
   setUFOConfig(config);
   if ((_config$vc = config.vc) !== null && _config$vc !== void 0 && _config$vc.enabled) {
-    var _config$experimentalI;
+    var _config$experimentalI, _config$extraInteract;
     const vcOptions = {
       heatmapSize: config.vc.heatmapSize,
       oldDomUpdates: config.vc.oldDomUpdates,
@@ -111,11 +111,8 @@ export function init(analyticsWebClientAsync, config) {
         startTime: 0
       });
     }
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      var _config$extraInteract;
-      if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled) {
-        interactionExtraMetrics.initializeVCObserver(vcOptions);
-      }
+    if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.initializeVCObserver(vcOptions);
     }
   }
   setupHiddenTimingCapture();
@@ -132,7 +129,7 @@ export function init(analyticsWebClientAsync, config) {
   Promise.all([analyticsWebClientAsync, import( /* webpackChunkName: "create-payloads" */'../create-payload'), import( /* webpackChunkName: "create-post-interaction-log-payload" */'../create-post-interaction-log-payload'), import( /* webpackChunkName: "create-interaction-extra-metrics-payload" */'../create-interaction-extra-metrics-payload')]).then(([awc, payloadPackage, createPostInteractionLogPayloadPackage, createInteractionExtraMetricsPayloadPackage]) => {
     if (awc.getAnalyticsWebClientPromise) {
       awc.getAnalyticsWebClientPromise().then(client => {
-        var _config$experimentalI2, _config$postInteracti;
+        var _config$experimentalI2, _config$postInteracti, _config$extraInteract2;
         const instance = client.getInstance();
         sinkInteraction(instance, payloadPackage);
         if (config !== null && config !== void 0 && (_config$experimentalI2 = config.experimentalInteractionMetrics) !== null && _config$experimentalI2 !== void 0 && _config$experimentalI2.enabled) {
@@ -141,12 +138,12 @@ export function init(analyticsWebClientAsync, config) {
         if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
           sinkPostInteractionLog(instance, createPostInteractionLogPayloadPackage.default);
         }
-        if (fg('platform_ufo_enable_ttai_with_3p')) {
+        if (config !== null && config !== void 0 && (_config$extraInteract2 = config.extraInteractionMetrics) !== null && _config$extraInteract2 !== void 0 && _config$extraInteract2.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
           sinkInteractionExtraMetrics(instance, createInteractionExtraMetricsPayloadPackage.default);
         }
       });
     } else if (awc.sendOperationalEvent) {
-      var _config$experimentalI3, _config$postInteracti2;
+      var _config$experimentalI3, _config$postInteracti2, _config$extraInteract3;
       sinkInteraction(awc, payloadPackage);
       if (config !== null && config !== void 0 && (_config$experimentalI3 = config.experimentalInteractionMetrics) !== null && _config$experimentalI3 !== void 0 && _config$experimentalI3.enabled) {
         sinkExperimentalInteractionMetrics(awc, payloadPackage);
@@ -154,7 +151,7 @@ export function init(analyticsWebClientAsync, config) {
       if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }
-      if (fg('platform_ufo_enable_ttai_with_3p')) {
+      if (config !== null && config !== void 0 && (_config$extraInteract3 = config.extraInteractionMetrics) !== null && _config$extraInteract3 !== void 0 && _config$extraInteract3.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
         sinkInteractionExtraMetrics(awc, createInteractionExtraMetricsPayloadPackage.default);
       }
     }

package/dist/es2019/vc/vc-observer-new/metric-calculator/fy25_03/index.js

@@ -24,6 +24,11 @@ export const KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS = ['data-drop-ta
 
 // Common aria attributes that don't cause visual layout shifts
 export const NON_VISUAL_ARIA_ATTRIBUTES = ['aria-label', 'aria-labelledby', 'aria-describedby', 'aria-hidden', 'aria-expanded', 'aria-controls', 'aria-selected', 'aria-checked', 'aria-disabled', 'aria-required', 'aria-current', 'aria-haspopup', 'aria-pressed', 'aria-atomic', 'aria-live'];
+
+// Common third party browser extension attributes
+export const THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES = ['bis_skin_checked', 'cz-shortcut-listen', 'monica-version', 'data-gr-ext-installed', 'data-dashlane-rid', 'sapling-installed', 'data-gptw',
+// grammarly extensions
+'data-new-gr-c-s-loaded', 'data-gr-aaa-notch-connection-id', 'data-gr-aaa-loaded'];
 export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
   constructor() {
     super(REVISION_NO);
@@ -38,7 +43,7 @@ export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
       if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
         return false;
       }
-      if (attributeName.startsWith('data-test') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck' || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || attributeName === 'data-new-gr-c-c-s-loaded' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
+      if (attributeName.startsWith('data-test') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck' || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName) || THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES.includes(attributeName) && fg('platform_ufo_exclude_3p_extensions_from_ttvc')) {
         return false;
       }
       return true;

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

@@ -1,9 +1,13 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+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 coinflip from '../coinflip';
 import { getConfig, getExtraInteractionRate } from '../config';
-import { getMoreAccuratePageVisibilityUpToTTAI } from '../create-payload';
-import { sanitizeUfoName } from '../create-payload/common/utils';
+import { getMoreAccuratePageVisibilityUpToTTAI, optimizeHoldInfo } from '../create-payload';
+import { buildSegmentTree, getOldSegmentsLabelStack, sanitizeUfoName } from '../create-payload/common/utils';
 import getPageVisibilityUpToTTAI from '../create-payload/utils/get-page-visibility-up-to-ttai';
 import getPayloadSize from '../create-payload/utils/get-payload-size';
 import { getReactUFOPayloadVersion } from '../create-payload/utils/get-react-ufo-payload-version';
@@ -14,8 +18,8 @@ function createInteractionExtraLogPayload(_x, _x2) {
 }
 function _createInteractionExtraLogPayload() {
   _createInteractionExtraLogPayload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interactionId, interaction) {
-    var _getTTAI, _finalVCMetrics$ufoV, _window$location;
-    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, finalVCMetrics, ttvc, payload;
+    var _getTTAI, _interaction$hold3pIn, _window$location;
+    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, finalVCMetrics, holdInfo, segments3p, segmentTree, payload;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -26,41 +30,40 @@ function _createInteractionExtraLogPayload() {
           }
           throw Error('UFO Configuration not provided');
         case 3:
-          end = interaction.end, start = interaction.start, ufoName = interaction.ufoName, rate = interaction.rate, type = interaction.type, abortReason = interaction.abortReason, routeName = interaction.routeName, previousInteractionName = interaction.previousInteractionName, isPreviousInteractionAborted = interaction.isPreviousInteractionAborted, abortedByInteractionName = interaction.abortedByInteractionName;
-          configRate = getExtraInteractionRate(ufoName, type);
+          end = interaction.end, start = interaction.start, ufoName = interaction.ufoName, rate = interaction.rate, type = interaction.type, abortReason = interaction.abortReason, routeName = interaction.routeName, previousInteractionName = interaction.previousInteractionName, isPreviousInteractionAborted = interaction.isPreviousInteractionAborted, abortedByInteractionName = interaction.abortedByInteractionName, knownSegments = interaction.knownSegments;
+          sanitisedUfoName = sanitizeUfoName(ufoName);
+          configRate = getExtraInteractionRate(sanitisedUfoName, type);
           if (coinflip(configRate)) {
-            _context.next = 7;
+            _context.next = 8;
             break;
           }
           return _context.abrupt("return", null);
-        case 7:
+        case 8:
           pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
           isPageLoad = type === 'page_load' || type === 'transition';
           if (isPageLoad) {
-            _context.next = 11;
+            _context.next = 12;
             break;
           }
           return _context.abrupt("return", null);
-        case 11:
+        case 12:
           calculatePageVisibilityFromTheStartOfPageLoad = config.enableBetterPageVisibilityApi && isPageLoad;
           moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
           extraTTAI = (_getTTAI = getTTAI(interaction)) !== null && _getTTAI !== void 0 ? _getTTAI : undefined;
           newUFOName = sanitizeUfoName(ufoName);
-          _context.next = 17;
+          _context.next = 18;
           return getVCMetrics(interaction, true);
-        case 17:
+        case 18:
           finalVCMetrics = _context.sent;
-          ttvc = (_finalVCMetrics$ufoV = finalVCMetrics['ufo:vc:rev']) === null || _finalVCMetrics$ufoV === void 0 ? void 0 : _finalVCMetrics$ufoV.map(function (revision) {
-            if (revision['metric:vc90'] === null || revision.clean !== true) {
-              return null;
-            }
-            return {
-              revision: revision.revision,
-              vc90: revision['metric:vc90']
-            };
-          }).filter(function (revision) {
-            return revision != null;
+          holdInfo = optimizeHoldInfo((_interaction$hold3pIn = interaction.hold3pInfo) !== null && _interaction$hold3pIn !== void 0 ? _interaction$hold3pIn : [], start, getReactUFOPayloadVersion(interaction.type));
+          segments3p = !fg('platform_ufo_remove_deprecated_config_fields') && config.killswitchNestedSegments ? [] : knownSegments.filter(function (knownSegment) {
+            return knownSegment.labelStack.some(function (entry) {
+              return 'type' in entry && entry.type === 'third-party';
+            });
           });
+          segmentTree = getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments3p.map(function (segment) {
+            return segment.labelStack;
+          })) : {};
           payload = {
             actionSubject: 'experience',
             action: 'measured',
@@ -81,7 +84,7 @@ function _createInteractionExtraLogPayload() {
                 'event:region': config.region || 'unknown',
                 'experience:key': 'custom.interaction-extra-metrics',
                 'experience:name': newUFOName,
-                interactionMetrics: {
+                interactionMetrics: _objectSpread(_objectSpread({
                   namePrefix: config.namePrefix || '',
                   segmentPrefix: config.segmentPrefix || '',
                   interactionId: interactionId,
@@ -98,15 +101,17 @@ function _createInteractionExtraLogPayload() {
                   // performance
                   end: Math.round(end),
                   start: Math.round(start),
-                  'metric:ttai:3p': extraTTAI,
-                  ttvc: ttvc !== null && ttvc !== void 0 ? ttvc : undefined
-                }
+                  'metric:ttai:3p': extraTTAI
+                }, finalVCMetrics), {}, {
+                  holdInfo: holdInfo,
+                  segments: getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? segmentTree : getOldSegmentsLabelStack(segments3p, interaction.type)
+                })
               }
             }
           };
           payload.attributes.properties['event:sizeInKb'] = getPayloadSize(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 22:
+        case 25:
         case "end":
           return _context.stop();
       }

package/dist/esm/create-payload/index.js

@@ -355,7 +355,7 @@ function optimizeRedirects(redirects, interactionStart) {
   }, []);
   return updatedRedirects;
 }
-function optimizeHoldInfo(holdInfo, interactionStart, reactUFOVersion) {
+export function optimizeHoldInfo(holdInfo, interactionStart, reactUFOVersion) {
   var holdInfoMap = holdInfo.reduce(function (result, hold) {
     var labelStack = hold.labelStack,
       name = hold.name,

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

@@ -101,7 +101,10 @@ function _getVCMetrics() {
         case 27:
           result = _context.sent;
           observer.stop(interaction.ufoName);
-          postInteractionLog.setLastInteractionFinishVCResult(result);
+          if (!include3p) {
+            // For Post Interaction, last interaction should be without 3p
+            postInteractionLog.setLastInteractionFinishVCResult(result);
+          }
           mostRecentVCRevision = getMostRecentVCRevision(interaction.ufoName);
           mostRecentVCRevisionPayload = result === null || result === void 0 || (_result$ufoVcRev = result['ufo:vc:rev']) === null || _result$ufoVcRev === void 0 ? void 0 : _result$ufoVcRev.find(function (_ref) {
             var revision = _ref.revision;

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

@@ -658,15 +658,14 @@ function finishInteraction(id, data) {
     postInteractionLog.stopVCObserver();
   }
   if (fg('platform_ufo_enable_ttai_with_3p')) {
-    if (!data.hold3pActive || data.hold3pActive.size === 0) {
+    var _sanitisedUfoName = sanitizeUfoName(data.ufoName);
+    if (!coinflip(getExtraInteractionRate(_sanitisedUfoName, data.type))) {
+      interactionExtraMetrics.stopAll(id);
+    } else if (!data.hold3pActive || data.hold3pActive.size === 0) {
       var _getConfig5;
       if (!((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5 !== void 0 && _getConfig5.enabled)) {
         remove(id);
       }
-      var _sanitisedUfoName = sanitizeUfoName(data.ufoName);
-      if (!coinflip(getExtraInteractionRate(_sanitisedUfoName, data.type))) {
-        interactionExtraMetrics.stopVCObserver();
-      }
     }
   } else {
     var _getConfig6;
@@ -831,25 +830,29 @@ export function tryComplete(interactionId, endTime) {
     if (fg('platform_ufo_enable_ttai_with_3p')) {
       var _interaction$hold3pAc;
       var noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
-      if (noMoreActiveHolds) {
+      if (noMoreActiveHolds && interactionExtraMetrics.finishedInteractionId !== interactionId) {
+        // If it's not waiting for extra metrics to complete, finish the interaction as normal
         if (!activeSubmitted) {
+          var _getConfig1;
           finishInteraction(interactionId, interaction, endTime);
-          interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+          if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1 = _getConfig1.extraInteractionMetrics) !== null && _getConfig1 !== void 0 && _getConfig1.enabled) {
+            interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+          }
           activeSubmitted = true;
         }
         if (noMoreExpHolds) {
-          var _getConfig1;
-          if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1 = _getConfig1.experimentalInteractionMetrics) !== null && _getConfig1 !== void 0 && _getConfig1.enabled) {
+          var _getConfig10;
+          if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10 = _getConfig10.experimentalInteractionMetrics) !== null && _getConfig10 !== void 0 && _getConfig10.enabled) {
             onExperimentalInteractionComplete(interactionId, interaction, endTime);
           }
           postInteraction();
         }
-        if (noMoreActive3pHolds) {
-          var data = _objectSpread(_objectSpread({}, interaction), {}, {
-            end: endTime
-          });
-          interactionExtraMetrics.onInteractionComplete(interactionId, data);
-        }
+      }
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        var data = _objectSpread(_objectSpread({}, interaction), {}, {
+          end: endTime
+        });
+        interactionExtraMetrics.onInteractionComplete(interactionId, data);
       }
     } else {
       if (noMoreActiveHolds) {
@@ -858,8 +861,8 @@ export function tryComplete(interactionId, endTime) {
           activeSubmitted = true;
         }
         if (noMoreExpHolds) {
-          var _getConfig10;
-          if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10 = _getConfig10.experimentalInteractionMetrics) !== null && _getConfig10 !== void 0 && _getConfig10.enabled) {
+          var _getConfig11;
+          if ((_getConfig11 = getConfig()) !== null && _getConfig11 !== void 0 && (_getConfig11 = _getConfig11.experimentalInteractionMetrics) !== null && _getConfig11 !== void 0 && _getConfig11.enabled) {
             onExperimentalInteractionComplete(interactionId, interaction, endTime);
           }
           postInteraction();
@@ -892,9 +895,7 @@ export function abort(interactionId, abortReason) {
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopVCObserver();
-      interactionExtraMetrics.reset();
-      remove(interactionId);
+      interactionExtraMetrics.stopAll(interactionId);
     }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
@@ -922,9 +923,7 @@ export function abortByNewInteraction(interactionId, interactionName) {
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopVCObserver();
-      interactionExtraMetrics.reset();
-      remove(interactionId);
+      interactionExtraMetrics.stopAll(interactionId);
     }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
@@ -956,9 +955,7 @@ export function abortAll(abortReason, abortedByInteractionName) {
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopVCObserver();
-      interactionExtraMetrics.reset();
-      remove(interactionId);
+      interactionExtraMetrics.stopAll(interactionId);
     }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
@@ -1083,7 +1080,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     addHoldByID(interactionId, [], ufoName, ufoName, true);
   }
   if (type === 'transition' || type === 'page_load') {
-    var _getConfig11;
+    var _getConfig12, _config$extraInteract;
     // Use per-interaction VC observer if available, otherwise fall back to global
     var observer = vcObserver;
     if (observer) {
@@ -1094,7 +1091,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     }
     // Start post interaction observer for all if config is enabled
     // in case ufoName is updated at later time
-    if ((_getConfig11 = getConfig()) !== null && _getConfig11 !== void 0 && (_getConfig11 = _getConfig11.postInteractionLog) !== null && _getConfig11 !== void 0 && _getConfig11.enabled) {
+    if ((_getConfig12 = getConfig()) !== null && _getConfig12 !== void 0 && (_getConfig12 = _getConfig12.postInteractionLog) !== null && _getConfig12 !== void 0 && _getConfig12.enabled) {
       postInteractionLog.startVCObserver({
         startTime: startTime
       });
@@ -1104,13 +1101,10 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
         startTime: startTime
       });
     }
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      var _config$extraInteract;
-      if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled) {
-        interactionExtraMetrics.startVCObserver({
-          startTime: startTime
-        }, interactionId);
-      }
+    if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.startVCObserver({
+        startTime: startTime
+      }, interactionId);
     }
   }
   if (type === 'press' && fg('platform_ufo_enable_vc_press_interactions')) {

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

@@ -78,6 +78,13 @@ var InteractionExtraMetrics = /*#__PURE__*/function () {
     value: function reset() {
       this.finishedInteractionId = null;
     }
+  }, {
+    key: "stopAll",
+    value: function stopAll(id) {
+      this.stopVCObserver();
+      remove(id);
+      this.reset();
+    }
   }]);
 }();
 export { InteractionExtraMetrics as default };

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

@@ -112,7 +112,7 @@ export function init(analyticsWebClientAsync, config) {
   initialiseMemoryObserver();
   setUFOConfig(config);
   if ((_config$vc = config.vc) !== null && _config$vc !== void 0 && _config$vc.enabled) {
-    var _config$experimentalI;
+    var _config$experimentalI, _config$extraInteract;
     var vcOptions = {
       heatmapSize: config.vc.heatmapSize,
       oldDomUpdates: config.vc.oldDomUpdates,
@@ -126,11 +126,8 @@ export function init(analyticsWebClientAsync, config) {
         startTime: 0
       });
     }
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      var _config$extraInteract;
-      if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled) {
-        interactionExtraMetrics.initializeVCObserver(vcOptions);
-      }
+    if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.initializeVCObserver(vcOptions);
     }
   }
   setupHiddenTimingCapture();
@@ -152,7 +149,7 @@ export function init(analyticsWebClientAsync, config) {
       createInteractionExtraMetricsPayloadPackage = _ref3[3];
     if (awc.getAnalyticsWebClientPromise) {
       awc.getAnalyticsWebClientPromise().then(function (client) {
-        var _config$experimentalI2, _config$postInteracti;
+        var _config$experimentalI2, _config$postInteracti, _config$extraInteract2;
         var instance = client.getInstance();
         sinkInteraction(instance, payloadPackage);
         if (config !== null && config !== void 0 && (_config$experimentalI2 = config.experimentalInteractionMetrics) !== null && _config$experimentalI2 !== void 0 && _config$experimentalI2.enabled) {
@@ -161,12 +158,12 @@ export function init(analyticsWebClientAsync, config) {
         if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
           sinkPostInteractionLog(instance, createPostInteractionLogPayloadPackage.default);
         }
-        if (fg('platform_ufo_enable_ttai_with_3p')) {
+        if (config !== null && config !== void 0 && (_config$extraInteract2 = config.extraInteractionMetrics) !== null && _config$extraInteract2 !== void 0 && _config$extraInteract2.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
           sinkInteractionExtraMetrics(instance, createInteractionExtraMetricsPayloadPackage.default);
         }
       });
     } else if (awc.sendOperationalEvent) {
-      var _config$experimentalI3, _config$postInteracti2;
+      var _config$experimentalI3, _config$postInteracti2, _config$extraInteract3;
       sinkInteraction(awc, payloadPackage);
       if (config !== null && config !== void 0 && (_config$experimentalI3 = config.experimentalInteractionMetrics) !== null && _config$experimentalI3 !== void 0 && _config$experimentalI3.enabled) {
         sinkExperimentalInteractionMetrics(awc, payloadPackage);
@@ -174,7 +171,7 @@ export function init(analyticsWebClientAsync, config) {
       if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }
-      if (fg('platform_ufo_enable_ttai_with_3p')) {
+      if (config !== null && config !== void 0 && (_config$extraInteract3 = config.extraInteractionMetrics) !== null && _config$extraInteract3 !== void 0 && _config$extraInteract3.enabled && fg('platform_ufo_enable_ttai_with_3p')) {
         sinkInteractionExtraMetrics(awc, createInteractionExtraMetricsPayloadPackage.default);
       }
     }

package/dist/esm/vc/vc-observer-new/metric-calculator/fy25_03/index.js

@@ -34,6 +34,11 @@ export var KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS = ['data-drop-targ
 
 // Common aria attributes that don't cause visual layout shifts
 export var NON_VISUAL_ARIA_ATTRIBUTES = ['aria-label', 'aria-labelledby', 'aria-describedby', 'aria-hidden', 'aria-expanded', 'aria-controls', 'aria-selected', 'aria-checked', 'aria-disabled', 'aria-required', 'aria-current', 'aria-haspopup', 'aria-pressed', 'aria-atomic', 'aria-live'];
+
+// Common third party browser extension attributes
+export var THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES = ['bis_skin_checked', 'cz-shortcut-listen', 'monica-version', 'data-gr-ext-installed', 'data-dashlane-rid', 'sapling-installed', 'data-gptw',
+// grammarly extensions
+'data-new-gr-c-s-loaded', 'data-gr-aaa-notch-connection-id', 'data-gr-aaa-loaded'];
 var VCCalculator_FY25_03 = /*#__PURE__*/function (_AbstractVCCalculator) {
   function VCCalculator_FY25_03() {
     _classCallCheck(this, VCCalculator_FY25_03);
@@ -52,7 +57,7 @@ var VCCalculator_FY25_03 = /*#__PURE__*/function (_AbstractVCCalculator) {
         if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
           return false;
         }
-        if (attributeName.startsWith('data-test') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck' || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || attributeName === 'data-new-gr-c-c-s-loaded' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
+        if (attributeName.startsWith('data-test') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck' || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName) || THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES.includes(attributeName) && fg('platform_ufo_exclude_3p_extensions_from_ttvc')) {
           return false;
         }
         return true;

package/dist/types/create-interaction-extra-metrics-payload/index.d.ts

@@ -19,6 +19,9 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
             'experience:key': string;
             'experience:name': string;
             interactionMetrics: {
+                holdInfo: any[];
+                segments: {};
+                'metric:vc90'?: number | null;
                 namePrefix: string;
                 segmentPrefix: string;
                 interactionId: string;
@@ -34,10 +37,6 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
                 end: number;
                 start: number;
                 'metric:ttai:3p': number | undefined;
-                ttvc: {
-                    revision: string;
-                    vc90: number;
-                }[];
             };
         };
     };