@atlaskit/react-ufo 4.7.2 → 4.7.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.7.4
+
+### Patch Changes
+
+- [`5c0461336c286`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c0461336c286) -
+  Add config to set finish on transition
+
+## 4.7.3
+
+### Patch Changes
+
+- [`0a9ee11a008bd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0a9ee11a008bd) -
+  FG cleanup - platform_ufo_abort_timestamp_by_revision
+- [`8127ae8dc5d5b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8127ae8dc5d5b) -
+  FG cleanup - ufo_disable_aborted_new_interaction_on_confluence
+- [`53e3c6f5e41ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/53e3c6f5e41ac) -
+  Check vc clean before sending custom.interaction-extra-metrics
+
 ## 4.7.2
 
 ### Patch Changes

package/dist/cjs/config/index.js

@@ -13,6 +13,7 @@ exports.getDoNotAbortActivePressInteractionOnTransition = getDoNotAbortActivePre
 exports.getEnabledVCRevisions = getEnabledVCRevisions;
 exports.getExperimentalInteractionRate = getExperimentalInteractionRate;
 exports.getExtraInteractionRate = getExtraInteractionRate;
+exports.getFinishInteractionOnTransition = getFinishInteractionOnTransition;
 exports.getInteractionRate = getInteractionRate;
 exports.getInteractionTimeout = getInteractionTimeout;
 exports.getMinorInteractions = getMinorInteractions;
@@ -340,14 +341,28 @@ function getDoNotAbortActivePressInteractionOnTransition() {
     return undefined;
   }
 }
+
+// Contains the list of interactions that do not abort on transitions
+function getFinishInteractionOnTransition() {
+  try {
+    if (!config) {
+      return undefined;
+    }
+    var _config1 = config,
+      finishInteractionOnTransition = _config1.finishInteractionOnTransition;
+    return finishInteractionOnTransition;
+  } catch (e) {
+    return undefined;
+  }
+}
 var CLEANUP_TIMEOUT = exports.CLEANUP_TIMEOUT = 60 * 1000;
 function getInteractionTimeout(ufoName) {
   try {
     if (!config) {
       return CLEANUP_TIMEOUT;
     }
-    var _config1 = config,
-      interactionTimeout = _config1.interactionTimeout;
+    var _config10 = config,
+      interactionTimeout = _config10.interactionTimeout;
     if (interactionTimeout != null && interactionTimeout[ufoName] != null) {
       return interactionTimeout[ufoName];
     }

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

@@ -36,8 +36,8 @@ function createInteractionExtraLogPayload(_x, _x2) {
 }
 function _createInteractionExtraLogPayload() {
   _createInteractionExtraLogPayload = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(interactionId, interaction) {
-    var _getTTAI, _getMostRecentVCRevis, _window$location;
-    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, mostRecentVCRevision, finalVCMetrics, isThirdParty, filteredData, getDetailedInteractionMetrics, segments3p, segmentTree, payload;
+    var _getTTAI, _window$location;
+    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, finalVCMetrics, vcRevisionPayload, effectiveVCRevisionPayload, isThirdParty, filteredData, getDetailedInteractionMetrics, segments3p, segmentTree, payload;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -69,11 +69,22 @@ function _createInteractionExtraLogPayload() {
           moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? (0, _getMoreAccuratePageVisibilityUpToTtai.getMoreAccuratePageVisibilityUpToTTAI)(interaction) : null;
           extraTTAI = (_getTTAI = (0, _getTtai.default)(interaction)) !== null && _getTTAI !== void 0 ? _getTTAI : undefined;
           newUFOName = (0, _utils.sanitizeUfoName)(ufoName);
-          mostRecentVCRevision = (_getMostRecentVCRevis = (0, _config.getMostRecentVCRevision)(newUFOName)) !== null && _getMostRecentVCRevis !== void 0 ? _getMostRecentVCRevis : _config.DEFAULT_TTVC_REVISION;
-          _context.next = 19;
+          _context.next = 18;
           return (0, _getVcMetrics.default)(interaction, true);
-        case 19:
+        case 18:
           finalVCMetrics = _context.sent;
+          // Check if VC is clean and has valid metric
+          vcRevisionPayload = finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev'];
+          effectiveVCRevisionPayload = vcRevisionPayload === null || vcRevisionPayload === void 0 ? void 0 : vcRevisionPayload.find(function (_ref) {
+            var revision = _ref.revision;
+            return revision === _config.DEFAULT_TTVC_REVISION;
+          });
+          if (!(!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined)) {
+            _context.next = 23;
+            break;
+          }
+          return _context.abrupt("return", null);
+        case 23:
           // Helper function to check if labelStack contains third-party type
           isThirdParty = function isThirdParty(labelStack) {
             var _labelStack$some;
@@ -116,9 +127,9 @@ function _createInteractionExtraLogPayload() {
           getDetailedInteractionMetrics = function getDetailedInteractionMetrics() {
             var _interaction$hold3pIn;
             return {
-              errors: filteredData.errors.map(function (_ref) {
-                var labelStack = _ref.labelStack,
-                  others = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+              errors: filteredData.errors.map(function (_ref2) {
+                var labelStack = _ref2.labelStack,
+                  others = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
                 return _objectSpread(_objectSpread({}, others), {}, {
                   labelStack: labelStack && (0, _utils.optimizeLabelStack)(labelStack, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type))
                 });
@@ -179,13 +190,13 @@ function _createInteractionExtraLogPayload() {
                   reactProfilerTimings: (0, _optimizeReactProfilerTimings.optimizeReactProfilerTimings)(filteredData.reactProfilerTimings, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
                   customData: filteredData.customData
                 }, getDetailedInteractionMetrics()),
-                'vc:effective:revision': mostRecentVCRevision
+                'vc:effective:revision': _config.DEFAULT_TTVC_REVISION
               }
             }
           };
           payload.attributes.properties['event:sizeInKb'] = (0, _getPayloadSize.default)(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 29:
+        case 32:
         case "end":
           return _context.stop();
       }

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

@@ -50,7 +50,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _uuid = require("uuid");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _coinflip = _interopRequireDefault(require("../coinflip"));
 var _config = require("../config");
@@ -926,16 +925,6 @@ function callCancelCallbacks(interaction) {
   });
 }
 function abort(interactionId, abortReason) {
-  var _FeatureGates$getExpe;
-  var activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  abortReason === 'new_interaction' && (0, _platformFeatureFlags.fg)('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe = _featureGateJsClient.default.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe !== void 0 && _FeatureGates$getExpe.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
   var interaction = _constants.interactions.get(interactionId);
   if (interaction != null) {
     callCancelCallbacks(interaction);
@@ -953,16 +942,6 @@ function abort(interactionId, abortReason) {
   }
 }
 function abortByNewInteraction(interactionId, interactionName) {
-  var _FeatureGates$getExpe2;
-  var activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  (0, _platformFeatureFlags.fg)('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe2 = _featureGateJsClient.default.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe2 !== void 0 && _FeatureGates$getExpe2.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
   var interaction = _constants.interactions.get(interactionId);
   if (interaction != null) {
     callCancelCallbacks(interaction);
@@ -981,19 +960,15 @@ function abortByNewInteraction(interactionId, interactionName) {
   }
 }
 function abortAll(abortReason, abortedByInteractionName) {
-  var _FeatureGates$getExpe3;
   var activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  abortReason === 'new_interaction' && (0, _platformFeatureFlags.fg)('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe3 = _featureGateJsClient.default.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe3 !== void 0 && _FeatureGates$getExpe3.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
+  var finishInteractions = (0, _config.getFinishInteractionOnTransition)();
   _constants.interactions.forEach(function (interaction, interactionId) {
-    var noMoreHolds = interaction.holdActive.size === 0;
-    if (!noMoreHolds) {
+    var isActiveInteraction = activeInteraction === interaction;
+    var hasFinished = interaction.holdActive.size === 0;
+    if (isActiveInteraction && abortReason === 'transition' && interaction.type === 'press' && finishInteractions !== null && finishInteractions !== void 0 && finishInteractions.includes(interaction.ufoName) && (0, _platformFeatureFlags.fg)('platform_ufo_enable_finish_interaction_transition')) {
+      hasFinished = true;
+    }
+    if (!hasFinished) {
       callCancelCallbacks(interaction);
       interaction.abortReason = abortReason;
       if (abortedByInteractionName != null) {

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

@@ -13,7 +13,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../../config");
 var _interactionMetrics = require("../../interaction-metrics");
 var _attachAbortListeners = require("./attachAbortListeners");
@@ -103,7 +102,7 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
     });
     (0, _defineProperty2.default)(this, "getVCResult", /*#__PURE__*/function () {
       var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref3) {
-        var start, stop, tti, prefix, ssr, vc, isEventAborted, experienceKey, interactionId, includeSSRRatio, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, isTTVCv1Disabled, vcAbortedResultWithRevisions, _vcAbortedResultWithRevisions, ttvcV1Result, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, ttvcV1DevToolInfo, ttvcV2DevToolInfo, shouldCreateDebugDetails, v1RevisionDebugDetails, v2RevisionDebugDetails, _window$__ufo_devtool2, _window2, _window$__ufo_devtool, _window, _window$__on_ufo_vc_d2, _window4, _window$__on_ufo_vc_d, _window3, isVCClean, revisionsData, speedIndex, SSRRatio, SSRRatioNext, SSRRatioPayload, isTTVCv3Enabled;
+        var start, stop, tti, prefix, ssr, vc, isEventAborted, experienceKey, interactionId, includeSSRRatio, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, isTTVCv1Disabled, vcAbortedResultWithRevisions, ttvcV1Result, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, ttvcV1DevToolInfo, ttvcV2DevToolInfo, shouldCreateDebugDetails, v1RevisionDebugDetails, v2RevisionDebugDetails, _window$__ufo_devtool2, _window2, _window$__ufo_devtool, _window, _window$__on_ufo_vc_d2, _window4, _window$__on_ufo_vc_d, _window3, isVCClean, revisionsData, speedIndex, SSRRatio, SSRRatioNext, SSRRatioPayload, isTTVCv3Enabled;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -120,7 +119,7 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
               abortReason = rawData.abortReason, abortReasonInfo = rawData.abortReasonInfo, heatmap = rawData.heatmap, heatmapNext = rawData.heatmapNext, outOfBoundaryInfo = rawData.outOfBoundaryInfo, totalTime = rawData.totalTime, componentsLog = rawData.componentsLog, viewport = rawData.viewport, devToolsEnabled = rawData.devToolsEnabled, ratios = rawData.ratios;
               isTTVCv1Disabled = !(0, _config.isVCRevisionEnabled)('fy25.01', experienceKey);
               if (!(abortReasonInfo !== null)) {
-                _context.next = 19;
+                _context.next = 13;
                 break;
               }
               // exposing data to devtools
@@ -129,10 +128,6 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
                   window.__vcNotAvailableReason = abortReasonInfo;
                 }
               } catch (e) {}
-              if (!(0, _platformFeatureFlags.fg)('platform_ufo_abort_timestamp_by_revision')) {
-                _context.next = 16;
-                break;
-              }
               vcAbortedResultWithRevisions = (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), [{
                 revision: 'fy25.02',
                 clean: false,
@@ -150,23 +145,7 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
                 });
               }
               return _context.abrupt("return", vcAbortedResultWithRevisions);
-            case 16:
-              _vcAbortedResultWithRevisions = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:state"), false), "".concat(fullPrefix, "vc:abort:reason"), abortReason.reason), "".concat(fullPrefix, "vc:abort:timestamp"), abortReason.timestamp), "".concat(fullPrefix, "vc:rev"), [{
-                revision: 'fy25.02',
-                clean: false,
-                'metric:vc90': null,
-                abortReason: abortReason.reason
-              }]);
-              if (!isTTVCv1Disabled) {
-                _vcAbortedResultWithRevisions["".concat(fullPrefix, "vc:rev")].push({
-                  revision: 'fy25.01',
-                  clean: false,
-                  'metric:vc90': null,
-                  abortReason: abortReason.reason
-                });
-              }
-              return _context.abrupt("return", _vcAbortedResultWithRevisions);
-            case 19:
+            case 13:
               ttvcV1Result = isTTVCv1Disabled ? {
                 VC: {},
                 VCBox: {},
@@ -324,16 +303,16 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
               SSRRatioNext = VCObserver.getSSRRatio(vcNext.VCEntries.rel, ssr);
               SSRRatioPayload = includeSSRRatio ? (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:ssrRatio"), isTTVCv1Disabled ? SSRRatioNext : SSRRatio), "".concat(fullPrefix, "vc:next:ssrRatio"), SSRRatioNext) : {};
               if (!isTTVCv1Disabled) {
-                _context.next = 35;
+                _context.next = 29;
                 break;
               }
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:size"), viewport), "".concat(fullPrefix, "vc:time"), Math.round(totalTime + (stopTime - startTime))), "".concat(fullPrefix, "vc:ratios"), ratios), outOfBoundary), {}, (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), SSRRatioPayload), {}, (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:ssrRatio"), SSRRatioNext), revisionsData), speedIndex));
-            case 35:
+            case 29:
               isTTVCv3Enabled = (0, _config.isVCRevisionEnabled)('fy25.03', experienceKey);
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
                 'metrics:vc': VC
               }, "".concat(fullPrefix, "vc:state"), true), "".concat(fullPrefix, "vc:clean"), isVCClean), "".concat(fullPrefix, "vc:dom"), VCBox), "".concat(fullPrefix, "vc:updates"), isTTVCv3Enabled ? undefined : VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:size"), viewport), "".concat(fullPrefix, "vc:time"), Math.round(totalTime + (stopTime - startTime))), "".concat(fullPrefix, "vc:total"), totalPainted), "".concat(fullPrefix, "vc:ratios"), ratios), "".concat(fullPrefix, "vc:ssrRatio"), SSRRatio), outOfBoundary), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:next"), vcNext.VC), "".concat(fullPrefix, "vc:next:updates"), isTTVCv3Enabled ? undefined : vcNext.VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:next:dom"), vcNext.VCBox), SSRRatioPayload), {}, (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), speedIndex));
-            case 37:
+            case 31:
             case "end":
               return _context.stop();
           }

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

@@ -395,14 +395,13 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
                 _context2.next = 7;
                 break;
               }
-              return _context2.abrupt("return", _objectSpread({
+              return _context2.abrupt("return", {
                 revision: this.revisionNo,
                 'metric:vc90': null,
                 clean: false,
-                abortReason: dirtyReason
-              }, (0, _platformFeatureFlags.fg)('platform_ufo_abort_timestamp_by_revision') ? {
+                abortReason: dirtyReason,
                 abortTimestamp: getVCCleanStatusResult.abortTimestamp
-              } : {}));
+              });
             case 7:
               _context2.next = 9;
               return this.calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, orderedEntries, include3p);

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES = exports.NON_VISUAL_ARIA_ATTRIBUTES = exports.KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -14,8 +13,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _abstractBaseVcCalculator = _interopRequireDefault(require("../abstract-base-vc-calculator"));
 var _isViewportEntryData = _interopRequireDefault(require("../utils/is-viewport-entry-data"));
-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) { (0, _defineProperty2.default)(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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var ABORTING_WINDOW_EVENT = ['wheel', 'scroll', 'keydown', 'resize'];
@@ -84,21 +81,18 @@ var VCCalculator_FY25_03 = exports.default = /*#__PURE__*/function (_AbstractVCC
           var data = entry.data;
           if (ABORTING_WINDOW_EVENT.includes(data.eventType)) {
             dirtyReason = data.eventType === 'keydown' ? 'keypress' : data.eventType;
-            if ((0, _platformFeatureFlags.fg)('platform_ufo_abort_timestamp_by_revision')) {
-              abortTimestamp = Math.round(entry.time);
-            }
+            abortTimestamp = Math.round(entry.time);
             return true;
           }
         }
         return false;
       });
       if (hasAbortEvent && dirtyReason) {
-        return _objectSpread({
+        return {
           isVCClean: false,
-          dirtyReason: dirtyReason
-        }, (0, _platformFeatureFlags.fg)('platform_ufo_abort_timestamp_by_revision') ? {
+          dirtyReason: dirtyReason,
           abortTimestamp: abortTimestamp
-        } : {});
+        };
       }
       return {
         isVCClean: true

package/dist/es2019/config/index.js

@@ -323,6 +323,21 @@ export function getDoNotAbortActivePressInteractionOnTransition() {
     return undefined;
   }
 }
+
+// Contains the list of interactions that do not abort on transitions
+export function getFinishInteractionOnTransition() {
+  try {
+    if (!config) {
+      return undefined;
+    }
+    const {
+      finishInteractionOnTransition
+    } = config;
+    return finishInteractionOnTransition;
+  } catch (e) {
+    return undefined;
+  }
+}
 export const CLEANUP_TIMEOUT = 60 * 1000;
 export function getInteractionTimeout(ufoName) {
   try {

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

@@ -1,6 +1,6 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../coinflip';
-import { DEFAULT_TTVC_REVISION, getConfig, getExtraInteractionRate, getMostRecentVCRevision } from '../config';
+import { DEFAULT_TTVC_REVISION, getConfig, getExtraInteractionRate } from '../config';
 import { buildSegmentTree, getOldSegmentsLabelStack, optimizeLabelStack, sanitizeUfoName } from '../create-payload/common/utils';
 import { getMoreAccuratePageVisibilityUpToTTAI } from '../create-payload/utils/get-more-accurate-page-visibility-up-to-ttai';
 import getPageVisibilityUpToTTAI from '../create-payload/utils/get-page-visibility-up-to-ttai';
@@ -17,7 +17,7 @@ import { optimizeRequestInfo } from '../create-payload/utils/optimize-request-in
 import { optimizeSpans } from '../create-payload/utils/optimize-spans';
 import { interactionSpans as atlaskitInteractionSpans } from '../interaction-metrics';
 async function createInteractionExtraLogPayload(interactionId, interaction) {
-  var _getTTAI, _getMostRecentVCRevis, _window$location;
+  var _getTTAI, _window$location;
   const config = getConfig();
   if (!config) {
     throw Error('UFO Configuration not provided');
@@ -50,9 +50,17 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
   const moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
   const extraTTAI = (_getTTAI = getTTAI(interaction)) !== null && _getTTAI !== void 0 ? _getTTAI : undefined;
   const newUFOName = sanitizeUfoName(ufoName);
-  const mostRecentVCRevision = (_getMostRecentVCRevis = getMostRecentVCRevision(newUFOName)) !== null && _getMostRecentVCRevis !== void 0 ? _getMostRecentVCRevis : DEFAULT_TTVC_REVISION;
   const finalVCMetrics = await getVCMetrics(interaction, true);
 
+  // Check if VC is clean and has valid metric
+  const vcRevisionPayload = finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev'];
+  const effectiveVCRevisionPayload = vcRevisionPayload === null || vcRevisionPayload === void 0 ? void 0 : vcRevisionPayload.find(({
+    revision
+  }) => revision === DEFAULT_TTVC_REVISION);
+  if (!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined) {
+    return null;
+  }
+
   // Helper function to check if labelStack contains third-party type
   const isThirdParty = labelStack => {
     var _labelStack$some;
@@ -140,7 +148,7 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
           customData: filteredData.customData,
           ...getDetailedInteractionMetrics()
         },
-        'vc:effective:revision': mostRecentVCRevision
+        'vc:effective:revision': DEFAULT_TTVC_REVISION
       }
     }
   };

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

@@ -1,8 +1,7 @@
 import { v4 as createUUID } from 'uuid';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../coinflip';
-import { getAwaitBM3TTIList, getCapabilityRate, getConfig, getExperimentalInteractionRate, getExtraInteractionRate, getInteractionTimeout, getPostInteractionRate, getReactHydrationStats } from '../config';
+import { getAwaitBM3TTIList, getCapabilityRate, getConfig, getExperimentalInteractionRate, getExtraInteractionRate, getFinishInteractionOnTransition, getInteractionTimeout, getPostInteractionRate, getReactHydrationStats } from '../config';
 import { experimentalVC, getExperimentalVCMetrics, onExperimentalInteractionComplete } from '../create-experimental-interaction-metrics-payload';
 import { sanitizeUfoName, stringifyLabelStackFully } from '../create-payload/common/utils';
 import { clearActiveTrace } from '../experience-trace-id-context';
@@ -805,16 +804,6 @@ function callCancelCallbacks(interaction) {
   });
 }
 export function abort(interactionId, abortReason) {
-  var _FeatureGates$getExpe;
-  const activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  abortReason === 'new_interaction' && fg('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe = FeatureGates.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe !== void 0 && _FeatureGates$getExpe.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
     callCancelCallbacks(interaction);
@@ -832,16 +821,6 @@ export function abort(interactionId, abortReason) {
   }
 }
 export function abortByNewInteraction(interactionId, interactionName) {
-  var _FeatureGates$getExpe2;
-  const activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe2 = FeatureGates.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe2 !== void 0 && _FeatureGates$getExpe2.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
     callCancelCallbacks(interaction);
@@ -860,19 +839,15 @@ export function abortByNewInteraction(interactionId, interactionName) {
   }
 }
 export function abortAll(abortReason, abortedByInteractionName) {
-  var _FeatureGates$getExpe3;
   const activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  abortReason === 'new_interaction' && fg('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe3 = FeatureGates.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe3 !== void 0 && _FeatureGates$getExpe3.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
+  const finishInteractions = getFinishInteractionOnTransition();
   interactions.forEach((interaction, interactionId) => {
-    const noMoreHolds = interaction.holdActive.size === 0;
-    if (!noMoreHolds) {
+    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')) {
+      hasFinished = true;
+    }
+    if (!hasFinished) {
       callCancelCallbacks(interaction);
       interaction.abortReason = abortReason;
       if (abortedByInteractionName != null) {

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

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { fg } from '@atlaskit/platform-feature-flags';
 import { isVCRevisionEnabled } from '../../config';
 import { getActiveInteraction } from '../../interaction-metrics';
 import { attachAbortListeners } from './attachAbortListeners';
@@ -124,48 +123,25 @@ export class VCObserver {
             window.__vcNotAvailableReason = abortReasonInfo;
           }
         } catch (e) {}
-        if (fg('platform_ufo_abort_timestamp_by_revision')) {
-          const vcAbortedResultWithRevisions = {
-            [`${fullPrefix}vc:rev`]: [{
-              revision: 'fy25.02',
-              clean: false,
-              'metric:vc90': null,
-              abortReason: abortReason.reason,
-              abortTimestamp: Math.round(abortReason.timestamp)
-            }]
-          };
-          if (!isTTVCv1Disabled) {
-            vcAbortedResultWithRevisions[`${fullPrefix}vc:rev`].push({
-              revision: 'fy25.01',
-              clean: false,
-              'metric:vc90': null,
-              abortReason: abortReason.reason,
-              abortTimestamp: Math.round(abortReason.timestamp)
-            });
-          }
-          return vcAbortedResultWithRevisions;
-        } else {
-          const vcAbortedResultWithRevisions = {
-            [`${fullPrefix}vc:state`]: false,
-            [`${fullPrefix}vc:abort:reason`]: abortReason.reason,
-            [`${fullPrefix}vc:abort:timestamp`]: abortReason.timestamp,
-            [`${fullPrefix}vc:rev`]: [{
-              revision: 'fy25.02',
-              clean: false,
-              'metric:vc90': null,
-              abortReason: abortReason.reason
-            }]
-          };
-          if (!isTTVCv1Disabled) {
-            vcAbortedResultWithRevisions[`${fullPrefix}vc:rev`].push({
-              revision: 'fy25.01',
-              clean: false,
-              'metric:vc90': null,
-              abortReason: abortReason.reason
-            });
-          }
-          return vcAbortedResultWithRevisions;
+        const vcAbortedResultWithRevisions = {
+          [`${fullPrefix}vc:rev`]: [{
+            revision: 'fy25.02',
+            clean: false,
+            'metric:vc90': null,
+            abortReason: abortReason.reason,
+            abortTimestamp: Math.round(abortReason.timestamp)
+          }]
+        };
+        if (!isTTVCv1Disabled) {
+          vcAbortedResultWithRevisions[`${fullPrefix}vc:rev`].push({
+            revision: 'fy25.01',
+            clean: false,
+            'metric:vc90': null,
+            abortReason: abortReason.reason,
+            abortTimestamp: Math.round(abortReason.timestamp)
+          });
         }
+        return vcAbortedResultWithRevisions;
       }
       const ttvcV1Result = isTTVCv1Disabled ? {
         VC: {},

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

@@ -286,9 +286,7 @@ export default class AbstractVCCalculatorBase {
         'metric:vc90': null,
         clean: false,
         abortReason: dirtyReason,
-        ...(fg('platform_ufo_abort_timestamp_by_revision') ? {
-          abortTimestamp: getVCCleanStatusResult.abortTimestamp
-        } : {})
+        abortTimestamp: getVCCleanStatusResult.abortTimestamp
       };
     }
     const vcDetails = await this.calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, orderedEntries, include3p);

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

@@ -61,9 +61,7 @@ export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
         const data = entry.data;
         if (ABORTING_WINDOW_EVENT.includes(data.eventType)) {
           dirtyReason = data.eventType === 'keydown' ? 'keypress' : data.eventType;
-          if (fg('platform_ufo_abort_timestamp_by_revision')) {
-            abortTimestamp = Math.round(entry.time);
-          }
+          abortTimestamp = Math.round(entry.time);
           return true;
         }
       }
@@ -73,9 +71,7 @@ export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
       return {
         isVCClean: false,
         dirtyReason,
-        ...(fg('platform_ufo_abort_timestamp_by_revision') ? {
-          abortTimestamp
-        } : {})
+        abortTimestamp
       };
     }
     return {

package/dist/esm/config/index.js

@@ -315,14 +315,28 @@ export function getDoNotAbortActivePressInteractionOnTransition() {
     return undefined;
   }
 }
+
+// Contains the list of interactions that do not abort on transitions
+export function getFinishInteractionOnTransition() {
+  try {
+    if (!config) {
+      return undefined;
+    }
+    var _config1 = config,
+      finishInteractionOnTransition = _config1.finishInteractionOnTransition;
+    return finishInteractionOnTransition;
+  } catch (e) {
+    return undefined;
+  }
+}
 export var CLEANUP_TIMEOUT = 60 * 1000;
 export function getInteractionTimeout(ufoName) {
   try {
     if (!config) {
       return CLEANUP_TIMEOUT;
     }
-    var _config1 = config,
-      interactionTimeout = _config1.interactionTimeout;
+    var _config10 = config,
+      interactionTimeout = _config10.interactionTimeout;
     if (interactionTimeout != null && interactionTimeout[ufoName] != null) {
       return interactionTimeout[ufoName];
     }

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

@@ -8,7 +8,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../coinflip';
-import { DEFAULT_TTVC_REVISION, getConfig, getExtraInteractionRate, getMostRecentVCRevision } from '../config';
+import { DEFAULT_TTVC_REVISION, getConfig, getExtraInteractionRate } from '../config';
 import { buildSegmentTree, getOldSegmentsLabelStack, optimizeLabelStack, sanitizeUfoName } from '../create-payload/common/utils';
 import { getMoreAccuratePageVisibilityUpToTTAI } from '../create-payload/utils/get-more-accurate-page-visibility-up-to-ttai';
 import getPageVisibilityUpToTTAI from '../create-payload/utils/get-page-visibility-up-to-ttai';
@@ -29,8 +29,8 @@ function createInteractionExtraLogPayload(_x, _x2) {
 }
 function _createInteractionExtraLogPayload() {
   _createInteractionExtraLogPayload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interactionId, interaction) {
-    var _getTTAI, _getMostRecentVCRevis, _window$location;
-    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, mostRecentVCRevision, finalVCMetrics, isThirdParty, filteredData, getDetailedInteractionMetrics, segments3p, segmentTree, payload;
+    var _getTTAI, _window$location;
+    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, finalVCMetrics, vcRevisionPayload, effectiveVCRevisionPayload, isThirdParty, filteredData, getDetailedInteractionMetrics, segments3p, segmentTree, payload;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -62,11 +62,22 @@ function _createInteractionExtraLogPayload() {
           moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
           extraTTAI = (_getTTAI = getTTAI(interaction)) !== null && _getTTAI !== void 0 ? _getTTAI : undefined;
           newUFOName = sanitizeUfoName(ufoName);
-          mostRecentVCRevision = (_getMostRecentVCRevis = getMostRecentVCRevision(newUFOName)) !== null && _getMostRecentVCRevis !== void 0 ? _getMostRecentVCRevis : DEFAULT_TTVC_REVISION;
-          _context.next = 19;
+          _context.next = 18;
           return getVCMetrics(interaction, true);
-        case 19:
+        case 18:
           finalVCMetrics = _context.sent;
+          // Check if VC is clean and has valid metric
+          vcRevisionPayload = finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev'];
+          effectiveVCRevisionPayload = vcRevisionPayload === null || vcRevisionPayload === void 0 ? void 0 : vcRevisionPayload.find(function (_ref) {
+            var revision = _ref.revision;
+            return revision === DEFAULT_TTVC_REVISION;
+          });
+          if (!(!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined)) {
+            _context.next = 23;
+            break;
+          }
+          return _context.abrupt("return", null);
+        case 23:
           // Helper function to check if labelStack contains third-party type
           isThirdParty = function isThirdParty(labelStack) {
             var _labelStack$some;
@@ -109,9 +120,9 @@ function _createInteractionExtraLogPayload() {
           getDetailedInteractionMetrics = function getDetailedInteractionMetrics() {
             var _interaction$hold3pIn;
             return {
-              errors: filteredData.errors.map(function (_ref) {
-                var labelStack = _ref.labelStack,
-                  others = _objectWithoutProperties(_ref, _excluded);
+              errors: filteredData.errors.map(function (_ref2) {
+                var labelStack = _ref2.labelStack,
+                  others = _objectWithoutProperties(_ref2, _excluded);
                 return _objectSpread(_objectSpread({}, others), {}, {
                   labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type))
                 });
@@ -172,13 +183,13 @@ function _createInteractionExtraLogPayload() {
                   reactProfilerTimings: optimizeReactProfilerTimings(filteredData.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type)),
                   customData: filteredData.customData
                 }, getDetailedInteractionMetrics()),
-                'vc:effective:revision': mostRecentVCRevision
+                'vc:effective:revision': DEFAULT_TTVC_REVISION
               }
             }
           };
           payload.attributes.properties['event:sizeInKb'] = getPayloadSize(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 29:
+        case 32:
         case "end":
           return _context.stop();
       }

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

@@ -9,10 +9,9 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { v4 as createUUID } from 'uuid';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../coinflip';
-import { getAwaitBM3TTIList, getCapabilityRate, getConfig, getExperimentalInteractionRate, getExtraInteractionRate, getInteractionTimeout, getPostInteractionRate, getReactHydrationStats } from '../config';
+import { getAwaitBM3TTIList, getCapabilityRate, getConfig, getExperimentalInteractionRate, getExtraInteractionRate, getFinishInteractionOnTransition, getInteractionTimeout, getPostInteractionRate, getReactHydrationStats } from '../config';
 import { experimentalVC, getExperimentalVCMetrics, onExperimentalInteractionComplete } from '../create-experimental-interaction-metrics-payload';
 import { sanitizeUfoName, stringifyLabelStackFully } from '../create-payload/common/utils';
 import { clearActiveTrace } from '../experience-trace-id-context';
@@ -880,16 +879,6 @@ function callCancelCallbacks(interaction) {
   });
 }
 export function abort(interactionId, abortReason) {
-  var _FeatureGates$getExpe;
-  var activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  abortReason === 'new_interaction' && fg('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe = FeatureGates.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe !== void 0 && _FeatureGates$getExpe.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
   var interaction = interactions.get(interactionId);
   if (interaction != null) {
     callCancelCallbacks(interaction);
@@ -907,16 +896,6 @@ export function abort(interactionId, abortReason) {
   }
 }
 export function abortByNewInteraction(interactionId, interactionName) {
-  var _FeatureGates$getExpe2;
-  var activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe2 = FeatureGates.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe2 !== void 0 && _FeatureGates$getExpe2.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
   var interaction = interactions.get(interactionId);
   if (interaction != null) {
     callCancelCallbacks(interaction);
@@ -935,19 +914,15 @@ export function abortByNewInteraction(interactionId, interactionName) {
   }
 }
 export function abortAll(abortReason, abortedByInteractionName) {
-  var _FeatureGates$getExpe3;
   var activeInteraction = getActiveInteraction();
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  abortReason === 'new_interaction' && fg('ufo_targeting_confluence_hello') && // list of enabled experiences managed in switcheroo/statsig
-  // ignoring as per https://atlassian.slack.com/archives/C026LTWFZ47/p1752798490250649
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  (_FeatureGates$getExpe3 = FeatureGates.getExperimentValue('ufo_disable_aborted_new_interaction_on_confluence', 'enabledExperiences', [])) !== null && _FeatureGates$getExpe3 !== void 0 && _FeatureGates$getExpe3.includes((activeInteraction === null || activeInteraction === void 0 ? void 0 : activeInteraction.ufoName) || '')) {
-    return;
-  }
+  var finishInteractions = getFinishInteractionOnTransition();
   interactions.forEach(function (interaction, interactionId) {
-    var noMoreHolds = interaction.holdActive.size === 0;
-    if (!noMoreHolds) {
+    var isActiveInteraction = activeInteraction === interaction;
+    var 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')) {
+      hasFinished = true;
+    }
+    if (!hasFinished) {
       callCancelCallbacks(interaction);
       interaction.abortReason = abortReason;
       if (abortedByInteractionName != null) {

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

@@ -9,7 +9,6 @@ var _excluded = ["__debug__element"];
 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 { isVCRevisionEnabled } from '../../config';
 import { getActiveInteraction } from '../../interaction-metrics';
 import { attachAbortListeners } from './attachAbortListeners';
@@ -96,7 +95,7 @@ export var VCObserver = /*#__PURE__*/function () {
     });
     _defineProperty(this, "getVCResult", /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref3) {
-        var start, stop, tti, prefix, ssr, vc, isEventAborted, experienceKey, interactionId, includeSSRRatio, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, isTTVCv1Disabled, vcAbortedResultWithRevisions, _vcAbortedResultWithRevisions, ttvcV1Result, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, ttvcV1DevToolInfo, ttvcV2DevToolInfo, shouldCreateDebugDetails, v1RevisionDebugDetails, v2RevisionDebugDetails, _window$__ufo_devtool2, _window2, _window$__ufo_devtool, _window, _window$__on_ufo_vc_d2, _window4, _window$__on_ufo_vc_d, _window3, isVCClean, revisionsData, speedIndex, SSRRatio, SSRRatioNext, SSRRatioPayload, isTTVCv3Enabled;
+        var start, stop, tti, prefix, ssr, vc, isEventAborted, experienceKey, interactionId, includeSSRRatio, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, isTTVCv1Disabled, vcAbortedResultWithRevisions, ttvcV1Result, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, ttvcV1DevToolInfo, ttvcV2DevToolInfo, shouldCreateDebugDetails, v1RevisionDebugDetails, v2RevisionDebugDetails, _window$__ufo_devtool2, _window2, _window$__ufo_devtool, _window, _window$__on_ufo_vc_d2, _window4, _window$__on_ufo_vc_d, _window3, isVCClean, revisionsData, speedIndex, SSRRatio, SSRRatioNext, SSRRatioPayload, isTTVCv3Enabled;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -113,7 +112,7 @@ export var VCObserver = /*#__PURE__*/function () {
               abortReason = rawData.abortReason, abortReasonInfo = rawData.abortReasonInfo, heatmap = rawData.heatmap, heatmapNext = rawData.heatmapNext, outOfBoundaryInfo = rawData.outOfBoundaryInfo, totalTime = rawData.totalTime, componentsLog = rawData.componentsLog, viewport = rawData.viewport, devToolsEnabled = rawData.devToolsEnabled, ratios = rawData.ratios;
               isTTVCv1Disabled = !isVCRevisionEnabled('fy25.01', experienceKey);
               if (!(abortReasonInfo !== null)) {
-                _context.next = 19;
+                _context.next = 13;
                 break;
               }
               // exposing data to devtools
@@ -122,10 +121,6 @@ export var VCObserver = /*#__PURE__*/function () {
                   window.__vcNotAvailableReason = abortReasonInfo;
                 }
               } catch (e) {}
-              if (!fg('platform_ufo_abort_timestamp_by_revision')) {
-                _context.next = 16;
-                break;
-              }
               vcAbortedResultWithRevisions = _defineProperty({}, "".concat(fullPrefix, "vc:rev"), [{
                 revision: 'fy25.02',
                 clean: false,
@@ -143,23 +138,7 @@ export var VCObserver = /*#__PURE__*/function () {
                 });
               }
               return _context.abrupt("return", vcAbortedResultWithRevisions);
-            case 16:
-              _vcAbortedResultWithRevisions = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(fullPrefix, "vc:state"), false), "".concat(fullPrefix, "vc:abort:reason"), abortReason.reason), "".concat(fullPrefix, "vc:abort:timestamp"), abortReason.timestamp), "".concat(fullPrefix, "vc:rev"), [{
-                revision: 'fy25.02',
-                clean: false,
-                'metric:vc90': null,
-                abortReason: abortReason.reason
-              }]);
-              if (!isTTVCv1Disabled) {
-                _vcAbortedResultWithRevisions["".concat(fullPrefix, "vc:rev")].push({
-                  revision: 'fy25.01',
-                  clean: false,
-                  'metric:vc90': null,
-                  abortReason: abortReason.reason
-                });
-              }
-              return _context.abrupt("return", _vcAbortedResultWithRevisions);
-            case 19:
+            case 13:
               ttvcV1Result = isTTVCv1Disabled ? {
                 VC: {},
                 VCBox: {},
@@ -317,16 +296,16 @@ export var VCObserver = /*#__PURE__*/function () {
               SSRRatioNext = VCObserver.getSSRRatio(vcNext.VCEntries.rel, ssr);
               SSRRatioPayload = includeSSRRatio ? _defineProperty(_defineProperty({}, "".concat(fullPrefix, "vc:ssrRatio"), isTTVCv1Disabled ? SSRRatioNext : SSRRatio), "".concat(fullPrefix, "vc:next:ssrRatio"), SSRRatioNext) : {};
               if (!isTTVCv1Disabled) {
-                _context.next = 35;
+                _context.next = 29;
                 break;
               }
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread(_objectSpread(_defineProperty(_defineProperty(_defineProperty({}, "".concat(fullPrefix, "vc:size"), viewport), "".concat(fullPrefix, "vc:time"), Math.round(totalTime + (stopTime - startTime))), "".concat(fullPrefix, "vc:ratios"), ratios), outOfBoundary), {}, _defineProperty({}, "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), SSRRatioPayload), {}, _defineProperty({}, "".concat(fullPrefix, "vc:ssrRatio"), SSRRatioNext), revisionsData), speedIndex));
-            case 35:
+            case 29:
               isTTVCv3Enabled = isVCRevisionEnabled('fy25.03', experienceKey);
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread(_objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
                 'metrics:vc': VC
               }, "".concat(fullPrefix, "vc:state"), true), "".concat(fullPrefix, "vc:clean"), isVCClean), "".concat(fullPrefix, "vc:dom"), VCBox), "".concat(fullPrefix, "vc:updates"), isTTVCv3Enabled ? undefined : VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:size"), viewport), "".concat(fullPrefix, "vc:time"), Math.round(totalTime + (stopTime - startTime))), "".concat(fullPrefix, "vc:total"), totalPainted), "".concat(fullPrefix, "vc:ratios"), ratios), "".concat(fullPrefix, "vc:ssrRatio"), SSRRatio), outOfBoundary), {}, _defineProperty(_defineProperty(_defineProperty({}, "".concat(fullPrefix, "vc:next"), vcNext.VC), "".concat(fullPrefix, "vc:next:updates"), isTTVCv3Enabled ? undefined : vcNext.VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:next:dom"), vcNext.VCBox), SSRRatioPayload), {}, _defineProperty({}, "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), speedIndex));
-            case 37:
+            case 31:
             case "end":
               return _context.stop();
           }

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

@@ -389,14 +389,13 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
                 _context2.next = 7;
                 break;
               }
-              return _context2.abrupt("return", _objectSpread({
+              return _context2.abrupt("return", {
                 revision: this.revisionNo,
                 'metric:vc90': null,
                 clean: false,
-                abortReason: dirtyReason
-              }, fg('platform_ufo_abort_timestamp_by_revision') ? {
+                abortReason: dirtyReason,
                 abortTimestamp: getVCCleanStatusResult.abortTimestamp
-              } : {}));
+              });
             case 7:
               _context2.next = 9;
               return this.calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, orderedEntries, include3p);

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

@@ -1,11 +1,8 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
-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; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -77,21 +74,18 @@ var VCCalculator_FY25_03 = /*#__PURE__*/function (_AbstractVCCalculator) {
           var data = entry.data;
           if (ABORTING_WINDOW_EVENT.includes(data.eventType)) {
             dirtyReason = data.eventType === 'keydown' ? 'keypress' : data.eventType;
-            if (fg('platform_ufo_abort_timestamp_by_revision')) {
-              abortTimestamp = Math.round(entry.time);
-            }
+            abortTimestamp = Math.round(entry.time);
             return true;
           }
         }
         return false;
       });
       if (hasAbortEvent && dirtyReason) {
-        return _objectSpread({
+        return {
           isVCClean: false,
-          dirtyReason: dirtyReason
-        }, fg('platform_ufo_abort_timestamp_by_revision') ? {
+          dirtyReason: dirtyReason,
           abortTimestamp: abortTimestamp
-        } : {});
+        };
       }
       return {
         isVCClean: true

package/dist/types/config/index.d.ts

@@ -62,6 +62,7 @@ export type Config = {
     readonly minorInteractions?: string[];
     readonly doNotAbortActivePressInteraction?: string[];
     readonly doNotAbortActivePressInteractionOnTransition?: string[];
+    readonly finishInteractionOnTransition?: string[];
     readonly awaitBM3TTI?: string[];
     readonly ufoNameOverrides?: UFONameOverride;
     readonly namePrefix?: string;
@@ -169,6 +170,7 @@ export declare function getUfoNameOverrides(): UFONameOverride | undefined;
 export declare function getMinorInteractions(): string[] | undefined;
 export declare function getDoNotAbortActivePressInteraction(): string[] | undefined;
 export declare function getDoNotAbortActivePressInteractionOnTransition(): string[] | undefined;
+export declare function getFinishInteractionOnTransition(): string[] | undefined;
 export declare const CLEANUP_TIMEOUT: number;
 export declare function getInteractionTimeout(ufoName: string): number;
 export {};

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

@@ -93,7 +93,7 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
                 start: number;
                 'metric:ttai:3p': number | undefined;
             };
-            'vc:effective:revision': import("../config").TTVCRevision;
+            'vc:effective:revision': string;
         };
     };
 } | null>;

package/dist/types/vc/vc-observer-new/metric-calculator/fy25_03/index.d.ts

@@ -7,10 +7,12 @@ export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
     constructor();
     protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean): boolean;
     protected getVCCleanStatus(filteredEntries: readonly VCObserverEntry[]): {
-        abortTimestamp?: number | undefined;
         isVCClean: boolean;
         dirtyReason: never;
+        abortTimestamp: number;
     } | {
         isVCClean: boolean;
+        dirtyReason?: undefined;
+        abortTimestamp?: undefined;
     };
 }

package/dist/types-ts4.5/config/index.d.ts

@@ -62,6 +62,7 @@ export type Config = {
     readonly minorInteractions?: string[];
     readonly doNotAbortActivePressInteraction?: string[];
     readonly doNotAbortActivePressInteractionOnTransition?: string[];
+    readonly finishInteractionOnTransition?: string[];
     readonly awaitBM3TTI?: string[];
     readonly ufoNameOverrides?: UFONameOverride;
     readonly namePrefix?: string;
@@ -173,6 +174,7 @@ export declare function getUfoNameOverrides(): UFONameOverride | undefined;
 export declare function getMinorInteractions(): string[] | undefined;
 export declare function getDoNotAbortActivePressInteraction(): string[] | undefined;
 export declare function getDoNotAbortActivePressInteractionOnTransition(): string[] | undefined;
+export declare function getFinishInteractionOnTransition(): string[] | undefined;
 export declare const CLEANUP_TIMEOUT: number;
 export declare function getInteractionTimeout(ufoName: string): number;
 export {};

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

@@ -93,7 +93,7 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
                 start: number;
                 'metric:ttai:3p': number | undefined;
             };
-            'vc:effective:revision': import("../config").TTVCRevision;
+            'vc:effective:revision': string;
         };
     };
 } | null>;

package/dist/types-ts4.5/vc/vc-observer-new/metric-calculator/fy25_03/index.d.ts

@@ -7,10 +7,12 @@ export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
     constructor();
     protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean): boolean;
     protected getVCCleanStatus(filteredEntries: readonly VCObserverEntry[]): {
-        abortTimestamp?: number | undefined;
         isVCClean: boolean;
         dirtyReason: never;
+        abortTimestamp: number;
     } | {
         isVCClean: boolean;
+        dirtyReason?: undefined;
+        abortTimestamp?: undefined;
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.7.2",
+	"version": "4.7.4",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,7 +27,6 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/browser-apis": "^0.0.1",
-		"@atlaskit/feature-gate-js-client": "^5.5.0",
 		"@atlaskit/interaction-context": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@babel/runtime": "^7.0.0",
@@ -99,9 +98,6 @@
 		"enable_ufo_devtools_api_for_extra_events": {
 			"type": "boolean"
 		},
-		"platform_ufo_abort_timestamp_by_revision": {
-			"type": "boolean"
-		},
 		"ufo_payload_use_idle_callback": {
 			"type": "boolean"
 		},
@@ -152,6 +148,9 @@
 		},
 		"platform_ufo_enable_late_mutation_label_stacks": {
 			"type": "boolean"
+		},
+		"platform_ufo_enable_finish_interaction_transition": {
+			"type": "boolean"
 		}
 	}
 }