@atlaskit/react-ufo 5.5.0 → 5.5.2

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

@@ -12,7 +12,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _percentileCalc = require("./percentile-calc");
 var _detectLayoutShiftCause = require("./utils/detect-layout-shift-cause");
 var _getViewportHeight = _interopRequireDefault(require("./utils/get-viewport-height"));
@@ -253,7 +252,7 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
                   viewportPercentage: log.viewportPercentage
                 });
               }) : []; // If 3p metric enabled - calculate the debug details
-              shouldCalculate3p = include3p && (0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p'); // Only calculate enhanced debug details if devtool callbacks exist
+              shouldCalculate3p = include3p; // Only calculate enhanced debug details if devtool callbacks exist
               shouldCalculateDebugDetails = !isPostInteraction && (typeof ((_window = window) === null || _window === void 0 ? void 0 : _window.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.__on_ufo_vc_debug_data_ready) === 'function' || typeof ((_window3 = window) === null || _window3 === void 0 ? void 0 : _window3.__ufo_devtool_vc_3p_debug_data) === 'function');
               if (shouldCalculateDebugDetails && allEntries && vcLogs) {
                 // Pre-sort vcLogs by time for efficient lookups

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

@@ -366,22 +366,20 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
             }
           };
         }
-        if ((0, _platformFeatureFlags.fg)('platform_ufo_exclude_3p_attribute_changes')) {
-          var _ref0 = _this.enableThirdPartyTracking ? (0, _checkWithinComponent.default)(target, 'UFOThirdPartySegment', _this.mapIs3pResult) : {
-              isWithin: false
-            },
-            isWithinThirdPartySegment = _ref0.isWithin;
-          if (isWithinThirdPartySegment) {
-            return {
-              type: 'mutation:third-party-attribute',
-              mutationData: {
-                attributeName: attributeName,
-                oldValue: oldValue,
-                newValue: newValue,
-                timestamp: timestamp
-              }
-            };
-          }
+        var _ref0 = _this.enableThirdPartyTracking ? (0, _checkWithinComponent.default)(target, 'UFOThirdPartySegment', _this.mapIs3pResult) : {
+            isWithin: false
+          },
+          isWithinThirdPartySegment = _ref0.isWithin;
+        if (isWithinThirdPartySegment) {
+          return {
+            type: 'mutation:third-party-attribute',
+            mutationData: {
+              attributeName: attributeName,
+              oldValue: oldValue,
+              newValue: newValue,
+              timestamp: timestamp
+            }
+          };
         }
         if (_this.shouldCheckSmartAnswersMutations() && (0, _isContainedWithinSmartAnswers.isContainedWithinSmartAnswers)(target)) {
           return {

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

@@ -316,7 +316,7 @@ function removeHoldCriterion(id) {
   }
   window.__CRITERION__.removeUFOHold(id);
 }
-export function addHold(interactionId, labelStack, name, experimental) {
+export function addHold(interactionId, labelStack, name, _experimental) {
   const interaction = interactions.get(interactionId);
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   const id = createUUID();
@@ -331,37 +331,20 @@ export function addHold(interactionId, labelStack, name, experimental) {
       name,
       start
     };
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      const is3pHold = labelStack.some(l => 'type' in l && l.type === 'third-party');
-      if (is3pHold) {
-        if (!interaction.hold3pActive) {
-          interaction.hold3pActive = new Map();
-        }
-        interaction.hold3pActive.set(id, {
-          ...holdActive,
-          start
-        });
-      } else {
-        interaction.holdActive.set(id, {
-          ...holdActive,
-          start
-        });
-        addHoldCriterion(id, labelStack, name, start);
+    const is3pHold = labelStack.some(l => 'type' in l && l.type === 'third-party');
+    if (is3pHold) {
+      if (!interaction.hold3pActive) {
+        interaction.hold3pActive = new Map();
       }
+      interaction.hold3pActive.set(id, {
+        ...holdActive,
+        start
+      });
     } else {
-      var _getConfig2, _getConfig2$experimen;
-      if ((_getConfig2 = getConfig()) !== null && _getConfig2 !== void 0 && (_getConfig2$experimen = _getConfig2.experimentalInteractionMetrics) !== null && _getConfig2$experimen !== void 0 && _getConfig2$experimen.enabled && experimental) {
-        interaction.holdExpActive.set(id, {
-          ...holdActive,
-          start
-        });
-      }
-      if (!experimental) {
-        interaction.holdActive.set(id, {
-          ...holdActive,
-          start
-        });
-      }
+      interaction.holdActive.set(id, {
+        ...holdActive,
+        start
+      });
       addHoldCriterion(id, labelStack, name, start);
     }
     return () => {
@@ -402,19 +385,17 @@ export function addHold(interactionId, labelStack, name, experimental) {
           });
           interaction.holdExpActive.delete(id);
         }
-        if (fg('platform_ufo_enable_ttai_with_3p')) {
-          if (interaction.hold3pActive) {
-            const current3pHold = interaction.hold3pActive.get(id);
-            if (current3pHold != null) {
-              if (!currentInteraction.hold3pInfo) {
-                currentInteraction.hold3pInfo = [];
-              }
-              currentInteraction.hold3pInfo.push({
-                ...current3pHold,
-                end
-              });
-              interaction.hold3pActive.delete(id);
+        if (interaction.hold3pActive) {
+          const current3pHold = interaction.hold3pActive.get(id);
+          if (current3pHold != null) {
+            if (!currentInteraction.hold3pInfo) {
+              currentInteraction.hold3pInfo = [];
             }
+            currentInteraction.hold3pInfo.push({
+              ...current3pHold,
+              end
+            });
+            interaction.hold3pActive.delete(id);
           }
         }
       }
@@ -426,27 +407,17 @@ export function addHoldByID(interactionId, labelStack, name, id, ignoreOnSubmit)
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
     const start = performance.now();
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      const is3pHold = labelStack.some(l => 'type' in l && l.type === 'third-party');
-      if (is3pHold) {
-        if (!interaction.hold3pActive) {
-          interaction.hold3pActive = new Map();
-        }
-        interaction.hold3pActive.set(id, {
-          labelStack,
-          name,
-          start,
-          ignoreOnSubmit
-        });
-      } else {
-        interaction.holdActive.set(id, {
-          labelStack,
-          name,
-          start,
-          ignoreOnSubmit
-        });
-        addHoldCriterion(id, labelStack, name, start);
+    const is3pHold = labelStack.some(l => 'type' in l && l.type === 'third-party');
+    if (is3pHold) {
+      if (!interaction.hold3pActive) {
+        interaction.hold3pActive = new Map();
       }
+      interaction.hold3pActive.set(id, {
+        labelStack,
+        name,
+        start,
+        ignoreOnSubmit
+      });
     } else {
       interaction.holdActive.set(id, {
         labelStack,
@@ -473,19 +444,17 @@ export function removeHoldByID(interactionId, id) {
       interaction.holdActive.delete(id);
       removeHoldCriterion(id);
     }
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      if (interaction.hold3pActive) {
-        const current3pHold = interaction.hold3pActive.get(id);
-        if (currentInteraction != null && current3pHold != null) {
-          if (!currentInteraction.hold3pInfo) {
-            currentInteraction.hold3pInfo = [];
-          }
-          currentInteraction.hold3pInfo.push({
-            ...current3pHold,
-            end
-          });
-          interaction.hold3pActive.delete(id);
+    if (interaction.hold3pActive) {
+      const current3pHold = interaction.hold3pActive.get(id);
+      if (currentInteraction != null && current3pHold != null) {
+        if (!currentInteraction.hold3pInfo) {
+          currentInteraction.hold3pInfo = [];
         }
+        currentInteraction.hold3pInfo.push({
+          ...current3pHold,
+          end
+        });
+        interaction.hold3pActive.delete(id);
       }
     }
   }
@@ -561,7 +530,7 @@ export function addErrorToAll(name, labelStack, errorType, errorMessage, errorSt
   });
 }
 export function addProfilerTimings(interactionId, labelStack, type, actualDuration, baseDuration, startTime, commitTime) {
-  var _getConfig3, _getConfig3$postInter;
+  var _getConfig2, _getConfig2$postInter;
   if (isPerformanceTracingEnabled()) {
     try {
       // for Firefox 102 and older
@@ -589,7 +558,7 @@ export function addProfilerTimings(interactionId, labelStack, type, actualDurati
       startTime,
       commitTime
     });
-  } else if ((_getConfig3 = getConfig()) !== null && _getConfig3 !== void 0 && (_getConfig3$postInter = _getConfig3.postInteractionLog) !== null && _getConfig3$postInter !== void 0 && _getConfig3$postInter.enabled) {
+  } else if ((_getConfig2 = getConfig()) !== null && _getConfig2 !== void 0 && (_getConfig2$postInter = _getConfig2.postInteractionLog) !== null && _getConfig2$postInter !== void 0 && _getConfig2$postInter.enabled) {
     postInteractionLog.addProfilerTimings(labelStack, type, actualDuration, baseDuration, startTime, commitTime);
   }
 }
@@ -606,7 +575,7 @@ function callCleanUpCallbacks(interaction) {
   });
 }
 function finishInteraction(id, data, endTime = performance.now()) {
-  var _getConfig4, _getConfig4$vc;
+  var _getConfig3, _getConfig3$vc;
   data.end = endTime;
   try {
     // for Firefox 102 and older
@@ -638,7 +607,7 @@ function finishInteraction(id, data, endTime = performance.now()) {
   clearActiveTrace();
   callCleanUpCallbacks(data);
   flushSsrRenderProfilerTraces();
-  if ((_getConfig4 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4$vc = _getConfig4.vc) !== null && _getConfig4$vc !== void 0 && _getConfig4$vc.stopVCAtInteractionFinish) {
+  if ((_getConfig3 = getConfig()) !== null && _getConfig3 !== void 0 && (_getConfig3$vc = _getConfig3.vc) !== null && _getConfig3$vc !== void 0 && _getConfig3$vc.stopVCAtInteractionFinish) {
     // Use per-interaction VC observer if available, otherwise fall back to global
     const observer = data.vcObserver;
     if (observer) {
@@ -654,19 +623,11 @@ function finishInteraction(id, data, endTime = performance.now()) {
   if (!coinflip(getPostInteractionRate(sanitisedUfoName, data.type))) {
     postInteractionLog.stopVCObserver();
   }
-  if (fg('platform_ufo_enable_ttai_with_3p')) {
-    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);
-      }
-    }
-  } else {
-    var _getConfig6, _getConfig6$experimen;
-    if (!((_getConfig6 = getConfig()) !== null && _getConfig6 !== void 0 && (_getConfig6$experimen = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6$experimen !== void 0 && _getConfig6$experimen.enabled)) {
+  if (!coinflip(getExtraInteractionRate(sanitisedUfoName, data.type))) {
+    interactionExtraMetrics.stopAll(id);
+  } else if (!data.hold3pActive || data.hold3pActive.size === 0) {
+    var _getConfig4, _getConfig4$experimen;
+    if (!((_getConfig4 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4$experimen = _getConfig4.experimentalInteractionMetrics) !== null && _getConfig4$experimen !== void 0 && _getConfig4$experimen.enabled)) {
       remove(id);
     }
   }
@@ -678,13 +639,9 @@ function finishInteraction(id, data, endTime = performance.now()) {
   PreviousInteractionLog.name = data.ufoName || 'unknown';
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      var _interactionExtraMetr;
-      if (((_interactionExtraMetr = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr === void 0 ? void 0 : _interactionExtraMetr.id) !== id) {
-        // If this same interaction was not already handled, handle it
-        handleInteraction(id, data);
-      }
-    } else {
+    var _interactionExtraMetr;
+    if (((_interactionExtraMetr = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr === void 0 ? void 0 : _interactionExtraMetr.id) !== id) {
+      // If this same interaction was not already handled, handle it
       handleInteraction(id, data);
     }
   }
@@ -751,16 +708,17 @@ let activeSubmitted = false;
 export function tryComplete(interactionId, endTime) {
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
+    var _interaction$hold3pAc;
     const noMoreActiveHolds = interaction.holdActive.size === 0;
     const noMoreExpHolds = interaction.holdExpActive.size === 0;
     const shouldUseRawDataThirdParty = shouldUseRawDataThirdPartyBehavior(interaction.ufoName, interaction.type);
     const postInteraction = async () => {
-      var _getConfig7, _getConfig7$postInter;
-      if ((_getConfig7 = getConfig()) !== null && _getConfig7 !== void 0 && (_getConfig7$postInter = _getConfig7.postInteractionLog) !== null && _getConfig7$postInter !== void 0 && _getConfig7$postInter.enabled) {
-        var _getConfig8, _getConfig8$experimen;
+      var _getConfig5, _getConfig5$postInter, _interactionExtraMetr2;
+      if ((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5$postInter = _getConfig5.postInteractionLog) !== null && _getConfig5$postInter !== void 0 && _getConfig5$postInter.enabled) {
+        var _getConfig6, _getConfig6$experimen;
         let experimentalVC90;
         let experimentalTTAI;
-        if ((_getConfig8 = getConfig()) !== null && _getConfig8 !== void 0 && (_getConfig8$experimen = _getConfig8.experimentalInteractionMetrics) !== null && _getConfig8$experimen !== void 0 && _getConfig8$experimen.enabled) {
+        if ((_getConfig6 = getConfig()) !== null && _getConfig6 !== void 0 && (_getConfig6$experimen = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6$experimen !== void 0 && _getConfig6$experimen.enabled) {
           var _await$getExperimenta;
           experimentalVC90 = (_await$getExperimenta = await getExperimentalVCMetrics(interaction)) === null || _await$getExperimenta === void 0 ? void 0 : _await$getExperimenta['metric:experimental:vc90'];
           const {
@@ -775,122 +733,93 @@ export function tryComplete(interactionId, endTime) {
           experimentalVC90
         });
       }
-      if (fg('platform_ufo_enable_ttai_with_3p')) {
-        var _interactionExtraMetr2;
-        if (((_interactionExtraMetr2 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr2 === void 0 ? void 0 : _interactionExtraMetr2.id) !== interactionId) {
-          var _getConfig9, _getConfig9$experimen;
-          // If interactionExtraMetrics is not waiting for measuring this interaction
-          if ((_getConfig9 = getConfig()) !== null && _getConfig9 !== void 0 && (_getConfig9$experimen = _getConfig9.experimentalInteractionMetrics) !== null && _getConfig9$experimen !== void 0 && _getConfig9$experimen.enabled) {
-            remove(interactionId);
-          }
-        }
-      } else {
-        var _getConfig0, _getConfig0$experimen;
-        if ((_getConfig0 = getConfig()) !== null && _getConfig0 !== void 0 && (_getConfig0$experimen = _getConfig0.experimentalInteractionMetrics) !== null && _getConfig0$experimen !== void 0 && _getConfig0$experimen.enabled) {
+      if (((_interactionExtraMetr2 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr2 === void 0 ? void 0 : _interactionExtraMetr2.id) !== interactionId) {
+        var _getConfig7, _getConfig7$experimen;
+        // If interactionExtraMetrics is not waiting for measuring this interaction
+        if ((_getConfig7 = getConfig()) !== null && _getConfig7 !== void 0 && (_getConfig7$experimen = _getConfig7.experimentalInteractionMetrics) !== null && _getConfig7$experimen !== void 0 && _getConfig7$experimen.enabled) {
           remove(interactionId);
         }
       }
       activeSubmitted = false;
     };
-    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;
+    const noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
 
-      // If using raw data third party behavior, wait for 3p holds to clear
-      if (shouldUseRawDataThirdParty) {
-        // If there are no non-3p holds active, mark the interaction as successful
-        // but don't finish until 3p holds are cleared
-        if (noMoreActiveHolds && !noMoreActive3pHolds) {
-          // Mark interaction as successful by setting endTime, but don't finish yet
-          if (endTime !== undefined && interaction.end === 0) {
-            interaction.end = endTime;
-          }
-          // Wait for 3p holds to clear before finishing
-          return;
+    // If using raw data third party behavior, wait for 3p holds to clear
+    if (shouldUseRawDataThirdParty) {
+      // If there are no non-3p holds active, mark the interaction as successful
+      // but don't finish until 3p holds are cleared
+      if (noMoreActiveHolds && !noMoreActive3pHolds) {
+        // Mark interaction as successful by setting endTime, but don't finish yet
+        if (endTime !== undefined && interaction.end === 0) {
+          interaction.end = endTime;
         }
+        // Wait for 3p holds to clear before finishing
+        return;
+      }
 
-        // If all holds (including 3p) are cleared, finish the interaction
-        if (noMoreActiveHolds && noMoreActive3pHolds) {
-          if (!activeSubmitted) {
-            var _getConfig1, _getConfig1$extraInte, _getConfig10, _getConfig10$extraSea, _getConfig11, _getConfig11$extraSea;
-            // Set end3p to current time when 3p holds cleared, but ensure it's at least interaction.end
-            const currentTime = endTime !== null && endTime !== void 0 ? endTime : performance.now();
-            interaction.end3p = interaction.end !== 0 && currentTime < interaction.end ? interaction.end : currentTime;
-            finishInteraction(interactionId, interaction, interaction.end !== 0 ? interaction.end : endTime);
-            if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1$extraInte = _getConfig1.extraInteractionMetrics) !== null && _getConfig1$extraInte !== void 0 && _getConfig1$extraInte.enabled) {
-              interactionExtraMetrics.updateFinishedInteraction(interaction);
-            }
-            if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10$extraSea = _getConfig10.extraSearchPageInteraction) !== null && _getConfig10$extraSea !== void 0 && _getConfig10$extraSea.enabled && interaction.ufoName === ((_getConfig11 = getConfig()) === null || _getConfig11 === void 0 ? void 0 : (_getConfig11$extraSea = _getConfig11.extraSearchPageInteraction) === null || _getConfig11$extraSea === void 0 ? void 0 : _getConfig11$extraSea.searchPageMetricName)) {
-              onSearchPageInteractionComplete(interactionId, interaction);
-            }
-            activeSubmitted = true;
+      // If all holds (including 3p) are cleared, finish the interaction
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        if (!activeSubmitted) {
+          var _getConfig8, _getConfig8$extraInte, _getConfig9, _getConfig9$extraSear, _getConfig0, _getConfig0$extraSear;
+          // Set end3p to current time when 3p holds cleared, but ensure it's at least interaction.end
+          const currentTime = endTime !== null && endTime !== void 0 ? endTime : performance.now();
+          interaction.end3p = interaction.end !== 0 && currentTime < interaction.end ? interaction.end : currentTime;
+          finishInteraction(interactionId, interaction, interaction.end !== 0 ? interaction.end : endTime);
+          if ((_getConfig8 = getConfig()) !== null && _getConfig8 !== void 0 && (_getConfig8$extraInte = _getConfig8.extraInteractionMetrics) !== null && _getConfig8$extraInte !== void 0 && _getConfig8$extraInte.enabled) {
+            interactionExtraMetrics.updateFinishedInteraction(interaction);
           }
-          if (noMoreExpHolds) {
-            var _getConfig12, _getConfig12$experime;
-            if ((_getConfig12 = getConfig()) !== null && _getConfig12 !== void 0 && (_getConfig12$experime = _getConfig12.experimentalInteractionMetrics) !== null && _getConfig12$experime !== void 0 && _getConfig12$experime.enabled) {
-              onExperimentalInteractionComplete(interactionId, interaction, endTime || interaction.end);
-            }
-            postInteraction();
+          if ((_getConfig9 = getConfig()) !== null && _getConfig9 !== void 0 && (_getConfig9$extraSear = _getConfig9.extraSearchPageInteraction) !== null && _getConfig9$extraSear !== void 0 && _getConfig9$extraSear.enabled && interaction.ufoName === ((_getConfig0 = getConfig()) === null || _getConfig0 === void 0 ? void 0 : (_getConfig0$extraSear = _getConfig0.extraSearchPageInteraction) === null || _getConfig0$extraSear === void 0 ? void 0 : _getConfig0$extraSear.searchPageMetricName)) {
+            onSearchPageInteractionComplete(interactionId, interaction);
           }
+          activeSubmitted = true;
         }
-        // Send separated third-party event even when feature flag is active
-        if (noMoreActiveHolds && noMoreActive3pHolds) {
-          const data = {
-            ...interaction,
-            end: endTime || interaction.end
-          };
-          interactionExtraMetrics.onInteractionComplete(interactionId, data);
-        }
-      } else {
-        var _interactionExtraMetr3;
-        // Original behavior when feature flag is not active
-        if (noMoreActiveHolds && ((_interactionExtraMetr3 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr3 === void 0 ? void 0 : _interactionExtraMetr3.id) !== interactionId) {
-          // If it's not waiting for extra metrics to complete, finish the interaction as normal
-          if (!activeSubmitted) {
-            var _getConfig13, _getConfig13$extraInt, _getConfig14, _getConfig14$extraSea, _getConfig15, _getConfig15$extraSea;
-            finishInteraction(interactionId, interaction, endTime);
-            if ((_getConfig13 = getConfig()) !== null && _getConfig13 !== void 0 && (_getConfig13$extraInt = _getConfig13.extraInteractionMetrics) !== null && _getConfig13$extraInt !== void 0 && _getConfig13$extraInt.enabled) {
-              interactionExtraMetrics.updateFinishedInteraction(interaction);
-            }
-            if ((_getConfig14 = getConfig()) !== null && _getConfig14 !== void 0 && (_getConfig14$extraSea = _getConfig14.extraSearchPageInteraction) !== null && _getConfig14$extraSea !== void 0 && _getConfig14$extraSea.enabled && interaction.ufoName === ((_getConfig15 = getConfig()) === null || _getConfig15 === void 0 ? void 0 : (_getConfig15$extraSea = _getConfig15.extraSearchPageInteraction) === null || _getConfig15$extraSea === void 0 ? void 0 : _getConfig15$extraSea.searchPageMetricName)) {
-              onSearchPageInteractionComplete(interactionId, interaction);
-            }
-            activeSubmitted = true;
-          }
-          if (noMoreExpHolds) {
-            var _getConfig16, _getConfig16$experime;
-            if ((_getConfig16 = getConfig()) !== null && _getConfig16 !== void 0 && (_getConfig16$experime = _getConfig16.experimentalInteractionMetrics) !== null && _getConfig16$experime !== void 0 && _getConfig16$experime.enabled) {
-              onExperimentalInteractionComplete(interactionId, interaction, endTime);
-            }
-            postInteraction();
+        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) {
+            onExperimentalInteractionComplete(interactionId, interaction, endTime || interaction.end);
           }
+          postInteraction();
         }
-        if (noMoreActiveHolds && noMoreActive3pHolds) {
-          const data = {
-            ...interaction,
-            end: endTime
-          };
-          interactionExtraMetrics.onInteractionComplete(interactionId, data);
-        }
+      }
+      // Send separated third-party event even when feature flag is active
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        const data = {
+          ...interaction,
+          end: endTime || interaction.end
+        };
+        interactionExtraMetrics.onInteractionComplete(interactionId, data);
       }
     } else {
-      if (noMoreActiveHolds) {
+      var _interactionExtraMetr3;
+      // Original behavior when feature flag is not active
+      if (noMoreActiveHolds && ((_interactionExtraMetr3 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr3 === void 0 ? void 0 : _interactionExtraMetr3.id) !== interactionId) {
+        // If it's not waiting for extra metrics to complete, finish the interaction as normal
         if (!activeSubmitted) {
-          var _getConfig17, _getConfig17$extraSea, _getConfig18, _getConfig18$extraSea;
+          var _getConfig10, _getConfig10$extraInt, _getConfig11, _getConfig11$extraSea, _getConfig12, _getConfig12$extraSea;
           finishInteraction(interactionId, interaction, endTime);
-          if ((_getConfig17 = getConfig()) !== null && _getConfig17 !== void 0 && (_getConfig17$extraSea = _getConfig17.extraSearchPageInteraction) !== null && _getConfig17$extraSea !== void 0 && _getConfig17$extraSea.enabled && interaction.ufoName === ((_getConfig18 = getConfig()) === null || _getConfig18 === void 0 ? void 0 : (_getConfig18$extraSea = _getConfig18.extraSearchPageInteraction) === null || _getConfig18$extraSea === void 0 ? void 0 : _getConfig18$extraSea.searchPageMetricName)) {
+          if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10$extraInt = _getConfig10.extraInteractionMetrics) !== null && _getConfig10$extraInt !== void 0 && _getConfig10$extraInt.enabled) {
+            interactionExtraMetrics.updateFinishedInteraction(interaction);
+          }
+          if ((_getConfig11 = getConfig()) !== null && _getConfig11 !== void 0 && (_getConfig11$extraSea = _getConfig11.extraSearchPageInteraction) !== null && _getConfig11$extraSea !== void 0 && _getConfig11$extraSea.enabled && interaction.ufoName === ((_getConfig12 = getConfig()) === null || _getConfig12 === void 0 ? void 0 : (_getConfig12$extraSea = _getConfig12.extraSearchPageInteraction) === null || _getConfig12$extraSea === void 0 ? void 0 : _getConfig12$extraSea.searchPageMetricName)) {
             onSearchPageInteractionComplete(interactionId, interaction);
           }
           activeSubmitted = true;
         }
         if (noMoreExpHolds) {
-          var _getConfig19, _getConfig19$experime;
-          if ((_getConfig19 = getConfig()) !== null && _getConfig19 !== void 0 && (_getConfig19$experime = _getConfig19.experimentalInteractionMetrics) !== null && _getConfig19$experime !== void 0 && _getConfig19$experime.enabled) {
+          var _getConfig13, _getConfig13$experime;
+          if ((_getConfig13 = getConfig()) !== null && _getConfig13 !== void 0 && (_getConfig13$experime = _getConfig13.experimentalInteractionMetrics) !== null && _getConfig13$experime !== void 0 && _getConfig13$experime.enabled) {
             onExperimentalInteractionComplete(interactionId, interaction, endTime);
           }
           postInteraction();
         }
       }
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        const data = {
+          ...interaction,
+          end: endTime
+        };
+        interactionExtraMetrics.onInteractionComplete(interactionId, data);
+      }
     }
   }
 }
@@ -913,9 +842,7 @@ export function abort(interactionId, abortReason) {
       finishInteraction(interactionId, interaction, endTime);
       postInteractionLog.reset();
       postInteractionLog.stopVCObserver();
-      if (fg('platform_ufo_enable_ttai_with_3p')) {
-        interactionExtraMetrics.stopAll(interactionId);
-      }
+      interactionExtraMetrics.stopAll(interactionId);
       if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
         onExperimentalInteractionComplete(interactionId, interaction, endTime);
         remove(interactionId);
@@ -927,9 +854,7 @@ export function abort(interactionId, abortReason) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopAll(interactionId);
-    }
+    interactionExtraMetrics.stopAll(interactionId);
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
@@ -951,9 +876,7 @@ export function abortByNewInteraction(interactionId, interactionName) {
       finishInteraction(interactionId, interaction, endTime);
       postInteractionLog.reset();
       postInteractionLog.stopVCObserver();
-      if (fg('platform_ufo_enable_ttai_with_3p')) {
-        interactionExtraMetrics.stopAll(interactionId);
-      }
+      interactionExtraMetrics.stopAll(interactionId);
       if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
         onExperimentalInteractionComplete(interactionId, interaction, endTime);
         remove(interactionId);
@@ -966,9 +889,7 @@ export function abortByNewInteraction(interactionId, interactionName) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopAll(interactionId);
-    }
+    interactionExtraMetrics.stopAll(interactionId);
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
@@ -987,7 +908,7 @@ export function abortAll(abortReason, abortedByInteractionName) {
   interactions.forEach((interaction, interactionId) => {
     const isActiveInteraction = activeInteraction === interaction;
     let hasFinished = interaction.holdActive.size === 0;
-    if (isActiveInteraction && abortReason === 'transition' && interaction.type === 'press' && finishInteractions !== null && finishInteractions !== void 0 && finishInteractions.includes(interaction.ufoName) && fg('platform_ufo_enable_finish_interaction_transition')) {
+    if (isActiveInteraction && abortReason === 'transition' && interaction.type === 'press' && finishInteractions !== null && finishInteractions !== void 0 && finishInteractions.includes(interaction.ufoName)) {
       hasFinished = true;
     }
     const shouldUseRawDataThirdParty = shouldUseRawDataThirdPartyBehavior(interaction.ufoName, interaction.type);
@@ -1001,9 +922,7 @@ export function abortAll(abortReason, abortedByInteractionName) {
       finishInteraction(interactionId, interaction, endTime);
       postInteractionLog.reset();
       postInteractionLog.stopVCObserver();
-      if (fg('platform_ufo_enable_ttai_with_3p')) {
-        interactionExtraMetrics.stopAll(interactionId);
-      }
+      interactionExtraMetrics.stopAll(interactionId);
       if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
         onExperimentalInteractionComplete(interactionId, interaction, endTime);
         remove(interactionId);
@@ -1020,9 +939,7 @@ export function abortAll(abortReason, abortedByInteractionName) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
-    if (fg('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopAll(interactionId);
-    }
+    interactionExtraMetrics.stopAll(interactionId);
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
@@ -1152,7 +1069,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     addHoldByID(interactionId, [], ufoName, ufoName, true);
   }
   if (type === 'transition' || type === 'page_load') {
-    var _getConfig20, _getConfig20$postInte, _config$extraInteract;
+    var _getConfig14, _getConfig14$postInte, _config$extraInteract;
     // Use per-interaction VC observer if available, otherwise fall back to global
     const observer = vcObserver;
     if (observer) {
@@ -1163,7 +1080,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 ((_getConfig20 = getConfig()) !== null && _getConfig20 !== void 0 && (_getConfig20$postInte = _getConfig20.postInteractionLog) !== null && _getConfig20$postInte !== void 0 && _getConfig20$postInte.enabled) {
+    if ((_getConfig14 = getConfig()) !== null && _getConfig14 !== void 0 && (_getConfig14$postInte = _getConfig14.postInteractionLog) !== null && _getConfig14$postInte !== void 0 && _getConfig14$postInte.enabled) {
       postInteractionLog.startVCObserver({
         startTime
       });
@@ -1173,7 +1090,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
         startTime
       });
     }
-    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')) {
+    if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled) {
       interactionExtraMetrics.startVCObserver({
         startTime
       }, interactionId);

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

@@ -170,7 +170,7 @@ export function init(analyticsWebClientAsync, config) {
         if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
           sinkPostInteractionLog(instance, createPostInteractionLogPayloadPackage.default);
         }
-        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')) {
+        if (config !== null && config !== void 0 && (_config$extraInteract2 = config.extraInteractionMetrics) !== null && _config$extraInteract2 !== void 0 && _config$extraInteract2.enabled) {
           sinkInteractionExtraMetrics(instance, createInteractionExtraMetricsPayloadPackage.default);
         }
         if (config !== null && config !== void 0 && (_config$extraSearchPa = config.extraSearchPageInteraction) !== null && _config$extraSearchPa !== void 0 && _config$extraSearchPa.enabled) {
@@ -189,7 +189,7 @@ export function init(analyticsWebClientAsync, config) {
       if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }
-      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')) {
+      if (config !== null && config !== void 0 && (_config$extraInteract3 = config.extraInteractionMetrics) !== null && _config$extraInteract3 !== void 0 && _config$extraInteract3.enabled) {
         sinkInteractionExtraMetrics(awc, createInteractionExtraMetricsPayloadPackage.default);
       }
       if (config !== null && config !== void 0 && (_config$extraSearchPa2 = config.extraSearchPageInteraction) !== null && _config$extraSearchPa2 !== void 0 && _config$extraSearchPa2.enabled) {