@atlaskit/react-ufo 4.11.6 → 4.11.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.11.8
+
+### Patch Changes
+
+- [`29629e6bfc4be`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/29629e6bfc4be) -
+  FG cleanup - platform_ufo_vcnext_v4_enabled
+- [`0e2fae38334fe`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0e2fae38334fe) -
+  FG cleanup - platform_ufo_enable_timeout_config
+
+## 4.11.7
+
+### Patch Changes
+
+- [`273616f4575b7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/273616f4575b7) -
+  FG cleanup - platform_ufo_enable_minor_interactions
+
 ## 4.11.6
 
 ### Patch Changes

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

@@ -557,7 +557,7 @@ function _createInteractionMetricsPayload() {
                 'ufo:multipayload': true,
                 'ufo:criticalPayloadCount': criticalPayloadCount
               } : {}), (0, _getBrowserMetadata.getBrowserMetadataToLegacyFormat)()), getSSRProperties(type)), getAssetsMetrics(interaction, pageLoadInteractionMetrics === null || pageLoadInteractionMetrics === void 0 ? void 0 : pageLoadInteractionMetrics.SSRDoneTime)), getPPSMetrics(interaction)), paintMetrics), (0, _getNavigationMetrics.getNavigationMetricsToLegacyFormat)(type)), finalVCMetrics), experimentalMetrics), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), getReactHydrationStats()), {}, {
-                interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+                interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                   namePrefix: config.namePrefix || '',
                   segmentPrefix: config.segmentPrefix || '',
                   interactionId: interactionId,
@@ -581,7 +581,8 @@ function _createInteractionMetricsPayload() {
                   segments: (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type) === '2.0.0' ? segmentTree : (0, _utils.getOldSegmentsLabelStack)(segments, interaction.type),
                   marks: (0, _optimizeMarks.optimizeMarks)(interaction.marks, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
                   customData: optimizeCustomData(interaction),
-                  reactProfilerTimings: (0, _optimizeReactProfilerTimings.optimizeReactProfilerTimings)(interaction.reactProfilerTimings, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type))
+                  reactProfilerTimings: (0, _optimizeReactProfilerTimings.optimizeReactProfilerTimings)(interaction.reactProfilerTimings, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
+                  minorInteractions: interaction.minorInteractions
                 }, responsiveness ? {
                   responsiveness: responsiveness
                 } : {}), labelStack), pageLoadInteractionMetrics), getDetailedInteractionMetrics(resourceTimings)), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
@@ -591,8 +592,6 @@ function _createInteractionMetricsPayload() {
                   unknownElementName: unknownElementName
                 } : {}), unknownElementHierarchy ? {
                   unknownElementHierarchy: unknownElementHierarchy
-                } : {}), (0, _platformFeatureFlags.fg)('platform_ufo_enable_minor_interactions') ? {
-                  minorInteractions: interaction.minorInteractions
                 } : {}),
                 'ufo:payloadTime': (0, _roundNumber.roundEpsilon)(performance.now() - interactionPayloadStart)
               })

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

@@ -77,7 +77,7 @@ var interactionExtraMetrics = exports.interactionExtraMetrics = new _interaction
 var interactionQueue = [];
 var segmentCache = new Map();
 var segmentUnmountCache = exports.segmentUnmountCache = new Map(); // Temporarily store segment unmount counts
-var CLEANUP_TIMEOUT = 60 * 1000;
+
 var segmentObservers = [];
 function getActiveInteraction() {
   var interactionId = (0, _interactionIdContext.getInteractionId)();
@@ -1013,7 +1013,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
   postInteractionLog.reset();
   var vcObserver;
   var previousTime = startTime;
-  var timeoutTime = (0, _platformFeatureFlags.fg)('platform_ufo_enable_timeout_config') ? (0, _config.getInteractionTimeout)(ufoName) : CLEANUP_TIMEOUT;
+  var timeoutTime = (0, _config.getInteractionTimeout)(ufoName);
   var timerID = setTimeout(function () {
     abort(interactionId, 'timeout');
   }, timeoutTime);

package/dist/cjs/segment/segment.js

@@ -11,7 +11,6 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = _interopRequireWildcard(require("react"));
 var _scheduler = require("scheduler");
 var _uuid = require("uuid");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _coinflip = _interopRequireDefault(require("../coinflip"));
 var _config = require("../config");
 var _experienceTraceIdContext = require("../experience-trace-id-context");
@@ -160,26 +159,20 @@ function UFOSegment(_ref) {
         this._internalHoldByID(labelStack, id, name, true);
       },
       tracePress: function tracePress() {
+        var _getDoNotAbortActiveP, _getMinorInteractions;
         var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'unknown';
         var timestamp = arguments.length > 1 ? arguments[1] : undefined;
-        if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_minor_interactions')) {
-          var _getDoNotAbortActiveP, _getMinorInteractions;
-          var minorInteractions = [].concat((0, _toConsumableArray2.default)((_getDoNotAbortActiveP = (0, _config.getDoNotAbortActivePressInteraction)()) !== null && _getDoNotAbortActiveP !== void 0 ? _getDoNotAbortActiveP : []), (0, _toConsumableArray2.default)((_getMinorInteractions = (0, _config.getMinorInteractions)()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []));
-          if (minorInteractions.includes(name)) {
-            var _activeInteraction$mi;
-            var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
-            activeInteraction === null || activeInteraction === void 0 || (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 || _activeInteraction$mi.push({
-              name: name,
-              startTime: timestamp !== null && timestamp !== void 0 ? timestamp : performance.now()
-            });
-            return;
-          } else if (interactionId.current != null) {
-            (0, _interactionMetrics.abortByNewInteraction)(interactionId.current, name);
-          }
-        } else {
-          if (interactionId.current != null) {
-            (0, _interactionMetrics.abortByNewInteraction)(interactionId.current, name);
-          }
+        var minorInteractions = [].concat((0, _toConsumableArray2.default)((_getDoNotAbortActiveP = (0, _config.getDoNotAbortActivePressInteraction)()) !== null && _getDoNotAbortActiveP !== void 0 ? _getDoNotAbortActiveP : []), (0, _toConsumableArray2.default)((_getMinorInteractions = (0, _config.getMinorInteractions)()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []));
+        if (minorInteractions.includes(name)) {
+          var _activeInteraction$mi;
+          var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
+          activeInteraction === null || activeInteraction === void 0 || (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 || _activeInteraction$mi.push({
+            name: name,
+            startTime: timestamp !== null && timestamp !== void 0 ? timestamp : performance.now()
+          });
+          return;
+        } else if (interactionId.current != null) {
+          (0, _interactionMetrics.abortByNewInteraction)(interactionId.current, name);
         }
         var rate = (0, _config.getInteractionRate)(name, 'press');
         if ((0, _coinflip.default)(rate)) {

package/dist/cjs/trace-interaction/internal/trace-ufo-interaction.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _uuid = require("uuid");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _coinflip = _interopRequireDefault(require("../../coinflip"));
 var _config = require("../../config");
 var _experienceTraceIdContext = require("../../experience-trace-id-context");
@@ -14,33 +13,20 @@ var _interactionIdContext = require("../../interaction-id-context");
 var _interactionMetrics = require("../../interaction-metrics");
 var _routeNameContext = _interopRequireDefault(require("../../route-name-context"));
 function traceUFOInteraction(name, interactionType, startTime) {
+  var _getMinorInteractions;
   var rate = (0, _config.getInteractionRate)(name, interactionType);
   var pressInteractionsList = (0, _config.getDoNotAbortActivePressInteraction)();
-  if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_minor_interactions')) {
-    var _getMinorInteractions;
-    var minorInteractions = (pressInteractionsList !== null && pressInteractionsList !== void 0 ? pressInteractionsList : []).concat((_getMinorInteractions = (0, _config.getMinorInteractions)()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []);
-    if (minorInteractions.includes(name)) {
-      var _activeInteraction$mi;
-      var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
-      activeInteraction === null || activeInteraction === void 0 || (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 || _activeInteraction$mi.push({
-        name: name,
-        startTime: startTime !== null && startTime !== void 0 ? startTime : performance.now()
-      });
-      return;
-    } else {
-      (0, _interactionMetrics.abortAll)('new_interaction', name);
-    }
+  var minorInteractions = (pressInteractionsList !== null && pressInteractionsList !== void 0 ? pressInteractionsList : []).concat((_getMinorInteractions = (0, _config.getMinorInteractions)()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []);
+  if (minorInteractions.includes(name)) {
+    var _activeInteraction$mi;
+    var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
+    activeInteraction === null || activeInteraction === void 0 || (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 || _activeInteraction$mi.push({
+      name: name,
+      startTime: startTime !== null && startTime !== void 0 ? startTime : performance.now()
+    });
+    return;
   } else {
-    if (pressInteractionsList !== null && pressInteractionsList !== void 0 && pressInteractionsList.includes(name)) {
-      var interaction = (0, _interactionMetrics.getActiveInteraction)();
-      if ((interaction === null || interaction === void 0 ? void 0 : interaction.ufoName) !== 'unknown' && (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'press') {
-        return;
-      }
-    } else {
-      // Abort any existing interaction regardless of the coinflip outcome
-      // Ensures measurements are not carried over between distinct interactions
-      (0, _interactionMetrics.abortAll)('new_interaction', name);
-    }
+    (0, _interactionMetrics.abortAll)('new_interaction', name);
   }
   if ((0, _coinflip.default)(rate)) {
     var startTimestamp = startTime !== null && startTime !== void 0 ? startTime : performance.now();

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

@@ -274,12 +274,8 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
               }
 
               // TODO on cleanup: put behind `enabledVCRevisions` config
-              if (!(0, _platformFeatureFlags.fg)('platform_ufo_vcnext_v4_enabled')) {
-                _context.next = 16;
-                break;
-              }
               calculator_next = new _vcnext.default();
-              _context.next = 14;
+              _context.next = 13;
               return calculator_next.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -292,14 +288,13 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 14:
+            case 13:
               vcNext = _context.sent;
               if (vcNext) {
                 results.push(vcNext);
               }
-            case 16:
               return _context.abrupt("return", results);
-            case 17:
+            case 16:
             case "end":
               return _context.stop();
           }

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

@@ -99,7 +99,7 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
               _iterator = _createForOfIteratorHelper(addedNodes);
               _context2.prev = 4;
               _loop = /*#__PURE__*/_regenerator.default.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, _iterator2, _step2, _step2$value, isDisplayContentsElementChildren, element, _this$intersectionObs8, _this$intersectionObs9, _this$intersectionObs0;
+                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;
                 return _regenerator.default.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -211,26 +211,22 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                       (_this$intersectionObs7 = _this.intersectionObserver) === null || _this$intersectionObs7 === void 0 || _this$intersectionObs7.watchAndTag(addedNode, 'mutation:third-party-element');
                       return _context.abrupt("return", 0);
                     case 45:
-                      if ((0, _platformFeatureFlags.fg)('platform_ufo_vcnext_v4_enabled')) {
-                        _iterator2 = _createForOfIteratorHelper((0, _getMutatedElements.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));
-                            }
+                      _iterator2 = _createForOfIteratorHelper((0, _getMutatedElements.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$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
+                      } catch (err) {
+                        _iterator2.e(err);
+                      } finally {
+                        _iterator2.f();
                       }
-                    case 46:
+                    case 47:
                     case "end":
                       return _context.stop();
                   }
@@ -275,12 +271,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
       };
     }());
     (0, _defineProperty2.default)(this, "handleAttributeMutation", function (_ref6) {
-      var _this$intersectionObs1;
+      var _this$intersectionObs0;
       var target = _ref6.target,
         attributeName = _ref6.attributeName,
         oldValue = _ref6.oldValue,
         newValue = _ref6.newValue;
-      (_this$intersectionObs1 = _this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.watchAndTag(target, function (_ref7) {
+      (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(target, function (_ref7) {
         var target = _ref7.target,
           rect = _ref7.rect;
         if ((0, _vcUtils.isContainedWithinMediaWrapper)(target)) {
@@ -446,12 +442,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this$mutationObserve2, _this$intersectionObs10, _this$performanceObse2;
+      var _this$mutationObserve2, _this$intersectionObs1, _this$performanceObse2;
       if (!this.isStarted) {
         return;
       }
       (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 || _this$mutationObserve2.disconnect();
-      (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.disconnect();
+      (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.disconnect();
       (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 || _this$performanceObse2.disconnect();
       this.isStarted = false;
       // Clean up caches when stopping

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

@@ -577,6 +577,7 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
           marks: optimizeMarks(interaction.marks, getReactUFOPayloadVersion(interaction.type)),
           customData: optimizeCustomData(interaction),
           reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type)),
+          minorInteractions: interaction.minorInteractions,
           ...(responsiveness ? {
             responsiveness
           } : {}),
@@ -592,9 +593,6 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
           } : {}),
           ...(unknownElementHierarchy ? {
             unknownElementHierarchy
-          } : {}),
-          ...(fg('platform_ufo_enable_minor_interactions') ? {
-            minorInteractions: interaction.minorInteractions
           } : {})
         },
         'ufo:payloadTime': roundEpsilon(performance.now() - interactionPayloadStart)

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

@@ -21,7 +21,7 @@ export const interactionExtraMetrics = new InteractionExtraMetrics();
 const interactionQueue = [];
 const segmentCache = new Map();
 export const segmentUnmountCache = new Map(); // Temporarily store segment unmount counts
-const CLEANUP_TIMEOUT = 60 * 1000;
+
 const segmentObservers = [];
 export function getActiveInteraction() {
   const interactionId = getInteractionId();
@@ -892,7 +892,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
   postInteractionLog.reset();
   let vcObserver;
   let previousTime = startTime;
-  let timeoutTime = fg('platform_ufo_enable_timeout_config') ? getInteractionTimeout(ufoName) : CLEANUP_TIMEOUT;
+  let timeoutTime = getInteractionTimeout(ufoName);
   const timerID = setTimeout(() => {
     abort(interactionId, 'timeout');
   }, timeoutTime);

package/dist/es2019/segment/segment.js

@@ -1,7 +1,6 @@
 import React, { Profiler, useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 import { unstable_NormalPriority as NormalPriority, unstable_scheduleCallback as scheduleCallback } from 'scheduler';
 import { v4 as createUUID } from 'uuid';
-import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../coinflip';
 import { getConfig, getDoNotAbortActivePressInteraction, getInteractionRate, getMinorInteractions } from '../config';
 import { getActiveTrace, setInteractionActiveTrace } from '../experience-trace-id-context';
@@ -141,24 +140,18 @@ export default function UFOSegment({
         this._internalHoldByID(labelStack, id, name, true);
       },
       tracePress(name = 'unknown', timestamp) {
-        if (fg('platform_ufo_enable_minor_interactions')) {
-          var _getDoNotAbortActiveP, _getMinorInteractions;
-          const minorInteractions = [...((_getDoNotAbortActiveP = getDoNotAbortActivePressInteraction()) !== null && _getDoNotAbortActiveP !== void 0 ? _getDoNotAbortActiveP : []), ...((_getMinorInteractions = getMinorInteractions()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : [])];
-          if (minorInteractions.includes(name)) {
-            var _activeInteraction$mi;
-            const activeInteraction = getActiveInteraction();
-            activeInteraction === null || activeInteraction === void 0 ? void 0 : (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 ? void 0 : _activeInteraction$mi.push({
-              name,
-              startTime: timestamp !== null && timestamp !== void 0 ? timestamp : performance.now()
-            });
-            return;
-          } else if (interactionId.current != null) {
-            abortByNewInteraction(interactionId.current, name);
-          }
-        } else {
-          if (interactionId.current != null) {
-            abortByNewInteraction(interactionId.current, name);
-          }
+        var _getDoNotAbortActiveP, _getMinorInteractions;
+        const minorInteractions = [...((_getDoNotAbortActiveP = getDoNotAbortActivePressInteraction()) !== null && _getDoNotAbortActiveP !== void 0 ? _getDoNotAbortActiveP : []), ...((_getMinorInteractions = getMinorInteractions()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : [])];
+        if (minorInteractions.includes(name)) {
+          var _activeInteraction$mi;
+          const activeInteraction = getActiveInteraction();
+          activeInteraction === null || activeInteraction === void 0 ? void 0 : (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 ? void 0 : _activeInteraction$mi.push({
+            name,
+            startTime: timestamp !== null && timestamp !== void 0 ? timestamp : performance.now()
+          });
+          return;
+        } else if (interactionId.current != null) {
+          abortByNewInteraction(interactionId.current, name);
         }
         const rate = getInteractionRate(name, 'press');
         if (coinflip(rate)) {

package/dist/es2019/trace-interaction/internal/trace-ufo-interaction.js

@@ -1,5 +1,4 @@
 import { v4 as createUUID } from 'uuid';
-import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../../coinflip';
 import { getDoNotAbortActivePressInteraction, getInteractionRate, getMinorInteractions } from '../../config';
 import { getActiveTrace, setInteractionActiveTrace } from '../../experience-trace-id-context';
@@ -7,33 +6,20 @@ import { DefaultInteractionID } from '../../interaction-id-context';
 import { abortAll, addNewInteraction, getActiveInteraction } from '../../interaction-metrics';
 import UFORouteName from '../../route-name-context';
 function traceUFOInteraction(name, interactionType, startTime) {
+  var _getMinorInteractions;
   const rate = getInteractionRate(name, interactionType);
   const pressInteractionsList = getDoNotAbortActivePressInteraction();
-  if (fg('platform_ufo_enable_minor_interactions')) {
-    var _getMinorInteractions;
-    const minorInteractions = (pressInteractionsList !== null && pressInteractionsList !== void 0 ? pressInteractionsList : []).concat((_getMinorInteractions = getMinorInteractions()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []);
-    if (minorInteractions.includes(name)) {
-      var _activeInteraction$mi;
-      const activeInteraction = getActiveInteraction();
-      activeInteraction === null || activeInteraction === void 0 ? void 0 : (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 ? void 0 : _activeInteraction$mi.push({
-        name,
-        startTime: startTime !== null && startTime !== void 0 ? startTime : performance.now()
-      });
-      return;
-    } else {
-      abortAll('new_interaction', name);
-    }
+  const minorInteractions = (pressInteractionsList !== null && pressInteractionsList !== void 0 ? pressInteractionsList : []).concat((_getMinorInteractions = getMinorInteractions()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []);
+  if (minorInteractions.includes(name)) {
+    var _activeInteraction$mi;
+    const activeInteraction = getActiveInteraction();
+    activeInteraction === null || activeInteraction === void 0 ? void 0 : (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 ? void 0 : _activeInteraction$mi.push({
+      name,
+      startTime: startTime !== null && startTime !== void 0 ? startTime : performance.now()
+    });
+    return;
   } else {
-    if (pressInteractionsList !== null && pressInteractionsList !== void 0 && pressInteractionsList.includes(name)) {
-      const interaction = getActiveInteraction();
-      if ((interaction === null || interaction === void 0 ? void 0 : interaction.ufoName) !== 'unknown' && (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'press') {
-        return;
-      }
-    } else {
-      // Abort any existing interaction regardless of the coinflip outcome
-      // Ensures measurements are not carried over between distinct interactions
-      abortAll('new_interaction', name);
-    }
+    abortAll('new_interaction', name);
   }
   if (coinflip(rate)) {
     const startTimestamp = startTime !== null && startTime !== void 0 ? startTime : performance.now();

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

@@ -231,23 +231,21 @@ export default class VCObserverNew {
     }
 
     // TODO on cleanup: put behind `enabledVCRevisions` config
-    if (fg('platform_ufo_vcnext_v4_enabled')) {
-      const calculator_next = new VCNextCalculator();
-      const vcNext = await calculator_next.calculate({
-        orderedEntries,
-        startTime: start,
-        stopTime: stop,
-        interactionId,
-        interactionType,
-        isPostInteraction: this.isPostInteraction,
-        include3p,
-        includeSSRRatio,
-        isPageVisible,
-        interactionAbortReason
-      });
-      if (vcNext) {
-        results.push(vcNext);
-      }
+    const calculator_next = new VCNextCalculator();
+    const vcNext = await calculator_next.calculate({
+      orderedEntries,
+      startTime: start,
+      stopTime: stop,
+      interactionId,
+      interactionType,
+      isPostInteraction: this.isPostInteraction,
+      include3p,
+      includeSSRRatio,
+      isPageVisible,
+      interactionAbortReason
+    });
+    if (vcNext) {
+      results.push(vcNext);
     }
     return results;
   }

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

@@ -160,22 +160,17 @@ export default class ViewportObserver {
           (_this$intersectionObs7 = this.intersectionObserver) === null || _this$intersectionObs7 === void 0 ? void 0 : _this$intersectionObs7.watchAndTag(addedNode, 'mutation:third-party-element');
           continue;
         }
-        if (fg('platform_ufo_vcnext_v4_enabled')) {
-          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));
-            }
+        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$intersectionObs0;
-          (_this$intersectionObs0 = this.intersectionObserver) === null || _this$intersectionObs0 === void 0 ? void 0 : _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
         }
       }
     });
@@ -185,8 +180,8 @@ export default class ViewportObserver {
       oldValue,
       newValue
     }) => {
-      var _this$intersectionObs1;
-      (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 ? void 0 : _this$intersectionObs1.watchAndTag(target, ({
+      var _this$intersectionObs0;
+      (_this$intersectionObs0 = this.intersectionObserver) === null || _this$intersectionObs0 === void 0 ? void 0 : _this$intersectionObs0.watchAndTag(target, ({
         target,
         rect
       }) => {
@@ -339,12 +334,12 @@ export default class ViewportObserver {
     this.isStarted = true;
   }
   stop() {
-    var _this$mutationObserve2, _this$intersectionObs10, _this$performanceObse2;
+    var _this$mutationObserve2, _this$intersectionObs1, _this$performanceObse2;
     if (!this.isStarted) {
       return;
     }
     (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 ? void 0 : _this$mutationObserve2.disconnect();
-    (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 ? void 0 : _this$intersectionObs10.disconnect();
+    (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 ? void 0 : _this$intersectionObs1.disconnect();
     (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 ? void 0 : _this$performanceObse2.disconnect();
     this.isStarted = false;
     // Clean up caches when stopping

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

@@ -549,7 +549,7 @@ function _createInteractionMetricsPayload() {
                 'ufo:multipayload': true,
                 'ufo:criticalPayloadCount': criticalPayloadCount
               } : {}), getBrowserMetadataToLegacyFormat()), getSSRProperties(type)), getAssetsMetrics(interaction, pageLoadInteractionMetrics === null || pageLoadInteractionMetrics === void 0 ? void 0 : pageLoadInteractionMetrics.SSRDoneTime)), getPPSMetrics(interaction)), paintMetrics), getNavigationMetricsToLegacyFormat(type)), finalVCMetrics), experimentalMetrics), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), getReactHydrationStats()), {}, {
-                interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+                interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                   namePrefix: config.namePrefix || '',
                   segmentPrefix: config.segmentPrefix || '',
                   interactionId: interactionId,
@@ -573,7 +573,8 @@ function _createInteractionMetricsPayload() {
                   segments: getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? segmentTree : getOldSegmentsLabelStack(segments, interaction.type),
                   marks: optimizeMarks(interaction.marks, getReactUFOPayloadVersion(interaction.type)),
                   customData: optimizeCustomData(interaction),
-                  reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type))
+                  reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type)),
+                  minorInteractions: interaction.minorInteractions
                 }, responsiveness ? {
                   responsiveness: responsiveness
                 } : {}), labelStack), pageLoadInteractionMetrics), getDetailedInteractionMetrics(resourceTimings)), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
@@ -583,8 +584,6 @@ function _createInteractionMetricsPayload() {
                   unknownElementName: unknownElementName
                 } : {}), unknownElementHierarchy ? {
                   unknownElementHierarchy: unknownElementHierarchy
-                } : {}), fg('platform_ufo_enable_minor_interactions') ? {
-                  minorInteractions: interaction.minorInteractions
                 } : {}),
                 'ufo:payloadTime': roundEpsilon(performance.now() - interactionPayloadStart)
               })

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

@@ -31,7 +31,7 @@ export var interactionExtraMetrics = new InteractionExtraMetrics();
 var interactionQueue = [];
 var segmentCache = new Map();
 export var segmentUnmountCache = new Map(); // Temporarily store segment unmount counts
-var CLEANUP_TIMEOUT = 60 * 1000;
+
 var segmentObservers = [];
 export function getActiveInteraction() {
   var interactionId = getInteractionId();
@@ -967,7 +967,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
   postInteractionLog.reset();
   var vcObserver;
   var previousTime = startTime;
-  var timeoutTime = fg('platform_ufo_enable_timeout_config') ? getInteractionTimeout(ufoName) : CLEANUP_TIMEOUT;
+  var timeoutTime = getInteractionTimeout(ufoName);
   var timerID = setTimeout(function () {
     abort(interactionId, 'timeout');
   }, timeoutTime);

package/dist/esm/segment/segment.js

@@ -5,7 +5,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { Profiler, useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 import { unstable_NormalPriority as NormalPriority, unstable_scheduleCallback as scheduleCallback } from 'scheduler';
 import { v4 as createUUID } from 'uuid';
-import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../coinflip';
 import { getConfig, getDoNotAbortActivePressInteraction, getInteractionRate, getMinorInteractions } from '../config';
 import { getActiveTrace, setInteractionActiveTrace } from '../experience-trace-id-context';
@@ -151,26 +150,20 @@ export default function UFOSegment(_ref) {
         this._internalHoldByID(labelStack, id, name, true);
       },
       tracePress: function tracePress() {
+        var _getDoNotAbortActiveP, _getMinorInteractions;
         var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'unknown';
         var timestamp = arguments.length > 1 ? arguments[1] : undefined;
-        if (fg('platform_ufo_enable_minor_interactions')) {
-          var _getDoNotAbortActiveP, _getMinorInteractions;
-          var minorInteractions = [].concat(_toConsumableArray((_getDoNotAbortActiveP = getDoNotAbortActivePressInteraction()) !== null && _getDoNotAbortActiveP !== void 0 ? _getDoNotAbortActiveP : []), _toConsumableArray((_getMinorInteractions = getMinorInteractions()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []));
-          if (minorInteractions.includes(name)) {
-            var _activeInteraction$mi;
-            var activeInteraction = getActiveInteraction();
-            activeInteraction === null || activeInteraction === void 0 || (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 || _activeInteraction$mi.push({
-              name: name,
-              startTime: timestamp !== null && timestamp !== void 0 ? timestamp : performance.now()
-            });
-            return;
-          } else if (interactionId.current != null) {
-            abortByNewInteraction(interactionId.current, name);
-          }
-        } else {
-          if (interactionId.current != null) {
-            abortByNewInteraction(interactionId.current, name);
-          }
+        var minorInteractions = [].concat(_toConsumableArray((_getDoNotAbortActiveP = getDoNotAbortActivePressInteraction()) !== null && _getDoNotAbortActiveP !== void 0 ? _getDoNotAbortActiveP : []), _toConsumableArray((_getMinorInteractions = getMinorInteractions()) !== null && _getMinorInteractions !== void 0 ? _getMinorInteractions : []));
+        if (minorInteractions.includes(name)) {
+          var _activeInteraction$mi;
+          var activeInteraction = getActiveInteraction();
+          activeInteraction === null || activeInteraction === void 0 || (_activeInteraction$mi = activeInteraction.minorInteractions) === null || _activeInteraction$mi === void 0 || _activeInteraction$mi.push({
+            name: name,
+            startTime: timestamp !== null && timestamp !== void 0 ? timestamp : performance.now()
+          });
+          return;
+        } else if (interactionId.current != null) {
+          abortByNewInteraction(interactionId.current, name);
         }
         var rate = getInteractionRate(name, 'press');
         if (coinflip(rate)) {