@atlaskit/react-ufo 4.11.1 → 4.11.3

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

@@ -208,24 +208,14 @@ export default class AbstractVCCalculatorBase {
     // Only create debug details if callbacks exist
     let v3RevisionDebugDetails = null;
     if (shouldCalculateDebugDetails) {
-      if (fg('platform_ufo_unify_abort_status_in_ttvc_debug_data')) {
-        v3RevisionDebugDetails = {
-          revision: this.revisionNo,
-          isClean: isVCClean && !interactionAbortReason && isPageVisible,
-          abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
-          vcLogs: enhancedVcLogs,
-          interactionId,
-          interactionType
-        };
-      } else {
-        v3RevisionDebugDetails = {
-          revision: this.revisionNo,
-          isClean: isVCClean,
-          abortReason: dirtyReason,
-          vcLogs: enhancedVcLogs,
-          interactionId
-        };
-      }
+      v3RevisionDebugDetails = {
+        revision: this.revisionNo,
+        isClean: isVCClean && !interactionAbortReason && isPageVisible,
+        abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
+        vcLogs: enhancedVcLogs,
+        interactionId,
+        interactionType
+      };
     }
 
     // Handle devtool callback

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

@@ -24,13 +24,13 @@ import { optimizeReactProfilerTimings } from '../create-payload/utils/optimize-r
 import { optimizeRequestInfo } from '../create-payload/utils/optimize-request-info';
 import { optimizeSpans } from '../create-payload/utils/optimize-spans';
 import { interactionSpans as atlaskitInteractionSpans } from '../interaction-metrics';
-function createInteractionExtraLogPayload(_x, _x2) {
+function createInteractionExtraLogPayload(_x, _x2, _x3, _x4) {
   return _createInteractionExtraLogPayload.apply(this, arguments);
 }
 function _createInteractionExtraLogPayload() {
-  _createInteractionExtraLogPayload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interactionId, interaction) {
-    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;
+  _createInteractionExtraLogPayload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult) {
+    var _getTTAI, _lastInteractionFinis, _getTTAI2, _window$location;
+    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, minorInteractions, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, finalVCMetrics, vcRevisionPayload, effectiveVCRevisionPayload, normalTTAI, lastInteractionFinishStart, lastInteractionFinishEnd, lastInteractionFinishVC90, lastInteractionFinishVCClean, lastInteractionFinishVCRev, lastInteractionFinishRevision, isThirdParty, filteredData, getDetailedInteractionMetrics, segments3p, segmentTree, payload;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -41,7 +41,7 @@ function _createInteractionExtraLogPayload() {
           }
           throw Error('UFO Configuration not provided');
         case 3:
-          end = interaction.end, start = interaction.start, ufoName = interaction.ufoName, rate = interaction.rate, type = interaction.type, abortReason = interaction.abortReason, routeName = interaction.routeName, previousInteractionName = interaction.previousInteractionName, isPreviousInteractionAborted = interaction.isPreviousInteractionAborted, abortedByInteractionName = interaction.abortedByInteractionName, knownSegments = interaction.knownSegments;
+          end = interaction.end, start = interaction.start, ufoName = interaction.ufoName, rate = interaction.rate, type = interaction.type, abortReason = interaction.abortReason, routeName = interaction.routeName, previousInteractionName = interaction.previousInteractionName, isPreviousInteractionAborted = interaction.isPreviousInteractionAborted, abortedByInteractionName = interaction.abortedByInteractionName, knownSegments = interaction.knownSegments, minorInteractions = interaction.minorInteractions;
           sanitisedUfoName = sanitizeUfoName(ufoName);
           configRate = getExtraInteractionRate(sanitisedUfoName, type);
           if (coinflip(configRate)) {
@@ -52,7 +52,7 @@ function _createInteractionExtraLogPayload() {
         case 8:
           pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
           isPageLoad = type === 'page_load' || type === 'transition';
-          if (isPageLoad) {
+          if (!(!isPageLoad || minorInteractions !== undefined && minorInteractions.length > 0)) {
             _context.next = 12;
             break;
           }
@@ -78,6 +78,46 @@ function _createInteractionExtraLogPayload() {
           }
           return _context.abrupt("return", null);
         case 23:
+          if (!(!lastInteractionFinish || lastInteractionFinish !== null && lastInteractionFinish !== void 0 && lastInteractionFinish.abortReason || lastInteractionFinish !== null && lastInteractionFinish !== void 0 && (_lastInteractionFinis = lastInteractionFinish.errors) !== null && _lastInteractionFinis !== void 0 && _lastInteractionFinis.length)) {
+            _context.next = 25;
+            break;
+          }
+          return _context.abrupt("return", null);
+        case 25:
+          normalTTAI = (_getTTAI2 = getTTAI(lastInteractionFinish)) !== null && _getTTAI2 !== void 0 ? _getTTAI2 : undefined;
+          lastInteractionFinishStart = typeof lastInteractionFinish.start === 'number' ? Math.round(lastInteractionFinish.start) : undefined;
+          lastInteractionFinishEnd = typeof lastInteractionFinish.end === 'number' ? Math.round(lastInteractionFinish.end) : undefined;
+          lastInteractionFinishVC90 = null;
+          lastInteractionFinishVCClean = false;
+          if (!lastInteractionFinishVCResult) {
+            _context.next = 41;
+            break;
+          }
+          lastInteractionFinishVCRev = lastInteractionFinishVCResult['ufo:vc:rev'];
+          lastInteractionFinishRevision = lastInteractionFinishVCRev === null || lastInteractionFinishVCRev === void 0 ? void 0 : lastInteractionFinishVCRev.find(function (_ref2) {
+            var revision = _ref2.revision;
+            return revision === DEFAULT_TTVC_REVISION;
+          });
+          if (!(lastInteractionFinishRevision !== null && lastInteractionFinishRevision !== void 0 && lastInteractionFinishRevision.clean)) {
+            _context.next = 38;
+            break;
+          }
+          lastInteractionFinishVCClean = true;
+          lastInteractionFinishVC90 = lastInteractionFinishRevision['metric:vc90'];
+          _context.next = 39;
+          break;
+        case 38:
+          return _context.abrupt("return", null);
+        case 39:
+          _context.next = 42;
+          break;
+        case 41:
+          if (normalTTAI !== undefined && typeof normalTTAI === 'number' && normalTTAI === extraTTAI) {
+            // Because TTAI is equal between with and without 3p, we can assume VC90 is also equal
+            lastInteractionFinishVC90 = effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90'];
+            lastInteractionFinishVCClean = effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload.clean;
+          }
+        case 42:
           // Helper function to check if labelStack contains third-party type
           isThirdParty = function isThirdParty(labelStack) {
             var _labelStack$some;
@@ -120,9 +160,9 @@ function _createInteractionExtraLogPayload() {
           getDetailedInteractionMetrics = function getDetailedInteractionMetrics() {
             var _interaction$hold3pIn;
             return {
-              errors: filteredData.errors.map(function (_ref2) {
-                var labelStack = _ref2.labelStack,
-                  others = _objectWithoutProperties(_ref2, _excluded);
+              errors: filteredData.errors.map(function (_ref3) {
+                var labelStack = _ref3.labelStack,
+                  others = _objectWithoutProperties(_ref3, _excluded);
                 return _objectSpread(_objectSpread({}, others), {}, {
                   labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type))
                 });
@@ -183,13 +223,20 @@ function _createInteractionExtraLogPayload() {
                   reactProfilerTimings: optimizeReactProfilerTimings(filteredData.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type)),
                   customData: filteredData.customData
                 }, getDetailedInteractionMetrics()),
-                'vc:effective:revision': DEFAULT_TTVC_REVISION
+                'vc:effective:revision': DEFAULT_TTVC_REVISION,
+                lastInteractionFinish: {
+                  start: lastInteractionFinishStart,
+                  end: lastInteractionFinishEnd,
+                  ttai: normalTTAI,
+                  vc90: lastInteractionFinishVC90,
+                  vcClean: lastInteractionFinishVCClean
+                }
               }
             }
           };
           payload.attributes.properties['event:sizeInKb'] = getPayloadSize(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 32:
+        case 51:
         case "end":
           return _context.stop();
       }

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

@@ -4,7 +4,7 @@ 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 { getConfig, getMostRecentVCRevision } from '../../config';
-import { postInteractionLog } from '../../interaction-metrics';
+import { interactionExtraMetrics, postInteractionLog } from '../../interaction-metrics';
 import getInteractionStatus from './get-interaction-status';
 import getPageVisibilityUpToTTAI from './get-page-visibility-up-to-ttai';
 import getSSRDoneTimeValue from './get-ssr-done-time-value';
@@ -90,6 +90,7 @@ function _getVCMetrics() {
           if (!include3p) {
             // For Post Interaction, last interaction should be without 3p
             postInteractionLog.setLastInteractionFinishVCResult(result);
+            interactionExtraMetrics.setLastInteractionFinishVCResult(result);
           }
           mostRecentVCRevision = getMostRecentVCRevision(interaction.ufoName);
           mostRecentVCRevisionPayload = result === null || result === void 0 || (_result$ufoVcRev = result['ufo:vc:rev']) === null || _result$ufoVcRev === void 0 ? void 0 : _result$ufoVcRev.find(function (_ref) {

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

@@ -688,7 +688,8 @@ function finishInteraction(id, data) {
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      if (interactionExtraMetrics.finishedInteractionId !== id) {
+      var _interactionExtraMetr;
+      if (((_interactionExtraMetr = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr === void 0 ? void 0 : _interactionExtraMetr.id) !== id) {
         // If this same interaction was not already handled, handle it
         handleInteraction(id, data);
       }
@@ -773,7 +774,7 @@ export function tryComplete(interactionId, endTime) {
     var postInteraction = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _getConfig7;
-        var _getConfig8, experimentalVC90, experimentalTTAI, _yield$getExperimenta, start, end, _getConfig9, _getConfig0;
+        var _getConfig8, experimentalVC90, experimentalTTAI, _yield$getExperimenta, start, end, _interactionExtraMetr2, _getConfig9, _getConfig0;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -816,7 +817,7 @@ export function tryComplete(interactionId, endTime) {
               }));
             case 17:
               if (fg('platform_ufo_enable_ttai_with_3p')) {
-                if (interactionExtraMetrics.finishedInteractionId !== interactionId) {
+                if (((_interactionExtraMetr2 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr2 === void 0 ? void 0 : _interactionExtraMetr2.id) !== interactionId) {
                   // If interactionExtraMetrics is not waiting for measuring this interaction
                   if ((_getConfig9 = getConfig()) !== null && _getConfig9 !== void 0 && (_getConfig9 = _getConfig9.experimentalInteractionMetrics) !== null && _getConfig9 !== void 0 && _getConfig9.enabled) {
                     remove(interactionId);
@@ -839,15 +840,15 @@ export function tryComplete(interactionId, endTime) {
       };
     }();
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      var _interaction$hold3pAc;
+      var _interaction$hold3pAc, _interactionExtraMetr3;
       var noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
-      if (noMoreActiveHolds && interactionExtraMetrics.finishedInteractionId !== interactionId) {
+      if (noMoreActiveHolds && ((_interactionExtraMetr3 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr3 === void 0 ? void 0 : _interactionExtraMetr3.id) !== interactionId) {
         // If it's not waiting for extra metrics to complete, finish the interaction as normal
         if (!activeSubmitted) {
           var _getConfig1, _getConfig10, _getConfig11;
           finishInteraction(interactionId, interaction, endTime);
           if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1 = _getConfig1.extraInteractionMetrics) !== null && _getConfig1 !== void 0 && _getConfig1.enabled) {
-            interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+            interactionExtraMetrics.updateFinishedInteraction(interaction);
           }
           if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10 = _getConfig10.extraSearchPageInteraction) !== null && _getConfig10 !== void 0 && _getConfig10.enabled && interaction.ufoName === ((_getConfig11 = getConfig()) === null || _getConfig11 === void 0 || (_getConfig11 = _getConfig11.extraSearchPageInteraction) === null || _getConfig11 === void 0 ? void 0 : _getConfig11.searchPageMetricName) && fg('react_ufo_unified_search_ignoring_sain_metric')) {
             onSearchPageInteractionComplete(interactionId, interaction);

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

@@ -9,8 +9,8 @@ import { remove } from './index';
 var InteractionExtraMetrics = /*#__PURE__*/function () {
   function InteractionExtraMetrics() {
     _classCallCheck(this, InteractionExtraMetrics);
-    // Store the finished interaction ID (as non-3p interaction)
-    _defineProperty(this, "finishedInteractionId", null);
+    // Store the finished interaction (as non-3p interaction)
+    _defineProperty(this, "finishedInteraction", null);
     // independent VC observer, that observes until `custom.post-interaction-logs` event is sent
     _defineProperty(this, "vcObserver", null);
     _defineProperty(this, "sinkHandlerFn", function () {});
@@ -48,12 +48,17 @@ var InteractionExtraMetrics = /*#__PURE__*/function () {
       return (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'page_load' || (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'transition';
     }
   }, {
-    key: "updateFinishedInteractionId",
-    value: function updateFinishedInteractionId(interactionId) {
-      if (this.eligibleToMeasure(interactionId)) {
-        this.finishedInteractionId = interactionId;
+    key: "updateFinishedInteraction",
+    value: function updateFinishedInteraction(interaction) {
+      if ((interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'page_load' || (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'transition') {
+        this.finishedInteraction = interaction;
       }
     }
+  }, {
+    key: "setLastInteractionFinishVCResult",
+    value: function setLastInteractionFinishVCResult(result) {
+      this.lastInteractionFinishVCResult = result;
+    }
   }, {
     key: "sinkHandler",
     value: function sinkHandler(fn) {
@@ -67,7 +72,7 @@ var InteractionExtraMetrics = /*#__PURE__*/function () {
         var updatedData = _objectSpread(_objectSpread({}, data), {}, {
           vcObserver: (_this$vcObserver3 = this.vcObserver) !== null && _this$vcObserver3 !== void 0 ? _this$vcObserver3 : undefined
         });
-        this.sinkHandlerFn(id, updatedData);
+        this.sinkHandlerFn(id, updatedData, this.finishedInteraction, this.lastInteractionFinishVCResult);
       }
       this.stopVCObserver();
       remove(id);
@@ -76,11 +81,13 @@ var InteractionExtraMetrics = /*#__PURE__*/function () {
   }, {
     key: "reset",
     value: function reset() {
+      var _this$finishedInterac;
       this.stopVCObserver();
-      if (this.finishedInteractionId) {
-        remove(this.finishedInteractionId);
+      if ((_this$finishedInterac = this.finishedInteraction) !== null && _this$finishedInterac !== void 0 && _this$finishedInterac.id) {
+        remove(this.finishedInteraction.id);
       }
-      this.finishedInteractionId = null;
+      this.finishedInteraction = null;
+      this.lastInteractionFinishVCResult = undefined;
     }
   }, {
     key: "stopAll",

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

@@ -73,14 +73,14 @@ function sinkPostInteractionLog(instance, createPostInteractionLogPayload) {
   });
 }
 function sinkInteractionExtraMetrics(instance, createInteractionExtraLogPayload) {
-  interactionExtraMetrics.sinkHandler(function (interactionId, interaction) {
+  interactionExtraMetrics.sinkHandler(function (interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult) {
     scheduleIdleCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var payload, devToolObserver;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return createInteractionExtraLogPayload(interactionId, interaction);
+            return createInteractionExtraLogPayload(interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult);
           case 2:
             payload = _context.sent;
             if (payload) {

package/dist/esm/segment/segment.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 React, { lazy, Profiler, Suspense, useCallback, useContext, useEffect, useMemo, useRef } from 'react';
+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';
@@ -16,18 +16,9 @@ import UFORouteName from '../route-name-context';
 import generateId from '../short-id';
 import scheduleOnPaint from './schedule-on-paint';
 var tryCompleteHandle;
-var AsyncSegmentHighlight = /*#__PURE__*/lazy(function () {
-  return import( /* webpackChunkName: "@atlaskit-internal_ufo-segment-highlight" */'./segment-highlight').then(function (module) {
-    return {
-      default: module.SegmentHighlight
-    };
-  });
-});
 
-// KARL TODO: finish self profiling
 /** A portion of the page we apply measurement to */
 export default function UFOSegment(_ref) {
-  var _getConfig2;
   var segmentName = _ref.name,
     children = _ref.children,
     _ref$mode = _ref.mode,
@@ -278,16 +269,11 @@ export default function UFOSegment(_ref) {
       return l.name;
     }).join('/');
   }, [labelStack]);
-  var enableSegmentHighlighting = (_getConfig2 = getConfig()) === null || _getConfig2 === void 0 ? void 0 : _getConfig2.enableSegmentHighlighting;
   return /*#__PURE__*/React.createElement(UFOInteractionContext.Provider, {
     value: interactionContext
   }, /*#__PURE__*/React.createElement(Profiler, {
     id: reactProfilerId,
     onRender: onRender
-  }, children, enableSegmentHighlighting && /*#__PURE__*/React.createElement(Suspense, {
-    fallback: null
-  }, /*#__PURE__*/React.createElement(AsyncSegmentHighlight, {
-    segmentName: segmentName
-  }))));
+  }, children));
 }
 UFOSegment.displayName = 'UFOSegment';

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

@@ -304,24 +304,14 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
               // Only create debug details if callbacks exist
               v3RevisionDebugDetails = null;
               if (shouldCalculateDebugDetails) {
-                if (fg('platform_ufo_unify_abort_status_in_ttvc_debug_data')) {
-                  v3RevisionDebugDetails = {
-                    revision: this.revisionNo,
-                    isClean: isVCClean && !interactionAbortReason && isPageVisible,
-                    abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
-                    vcLogs: enhancedVcLogs,
-                    interactionId: interactionId,
-                    interactionType: interactionType
-                  };
-                } else {
-                  v3RevisionDebugDetails = {
-                    revision: this.revisionNo,
-                    isClean: isVCClean,
-                    abortReason: dirtyReason,
-                    vcLogs: enhancedVcLogs,
-                    interactionId: interactionId
-                  };
-                }
+                v3RevisionDebugDetails = {
+                  revision: this.revisionNo,
+                  isClean: isVCClean && !interactionAbortReason && isPageVisible,
+                  abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
+                  vcLogs: enhancedVcLogs,
+                  interactionId: interactionId,
+                  interactionType: interactionType
+                };
               }
 
               // Handle devtool callback

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

@@ -132,6 +132,10 @@ export type Config = {
         readonly rates?: Rates;
         readonly kind?: Record<InteractionType, number>;
     };
+    /**
+     * @private
+     * @deprecated - to be removed on next major version
+     */
     readonly enableSegmentHighlighting?: boolean;
     readonly enableAdditionalPerformanceMarks?: boolean;
     /**

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

@@ -1,6 +1,7 @@
 import type { InteractionMetrics } from '../common';
+import type { VCResult } from '../common/vc/types';
 import type { LabelStack } from '../interaction-context';
-declare function createInteractionExtraLogPayload(interactionId: string, interaction: InteractionMetrics): Promise<{
+declare function createInteractionExtraLogPayload(interactionId: string, interaction: InteractionMetrics, lastInteractionFinish: InteractionMetrics | null, lastInteractionFinishVCResult?: VCResult): Promise<{
     actionSubject: string;
     action: string;
     eventType: string;
@@ -96,6 +97,13 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
                 'metric:ttai:3p': number;
             };
             'vc:effective:revision': string;
+            lastInteractionFinish: {
+                start: number | undefined;
+                end: number | undefined;
+                ttai: number | undefined;
+                vc90: number | null;
+                vcClean: boolean;
+            };
         };
     };
 } | null>;

package/dist/types/create-post-interaction-log-payload/index.d.ts

@@ -1,6 +1,6 @@
 import { type PostInteractionLogOutput } from '../common';
 import type { LateMutation } from '../common/react-ufo-payload-schema';
-declare function createPostInteractionLogPayload({ lastInteractionFinish, reactProfilerTimings, lastInteractionFinishVCResult, postInteractionFinishVCResult, postInteractionHoldInfo }: PostInteractionLogOutput): {
+declare function createPostInteractionLogPayload({ lastInteractionFinish, reactProfilerTimings, lastInteractionFinishVCResult, postInteractionFinishVCResult, postInteractionHoldInfo, }: PostInteractionLogOutput): {
     actionSubject: string;
     action: string;
     eventType: string;

package/dist/types/interaction-metrics/interaction-extra-metrics.d.ts

@@ -1,8 +1,10 @@
+import { type VCResult } from '../common/vc/types';
 import type { VCObserverInterface, VCObserverOptions } from '../vc/types';
 import { type InteractionMetrics } from './index';
 export default class InteractionExtraMetrics {
-    finishedInteractionId: string | null;
+    finishedInteraction: InteractionMetrics | null;
     vcObserver: VCObserverInterface | null;
+    lastInteractionFinishVCResult?: VCResult;
     private sinkHandlerFn;
     initializeVCObserver(options: VCObserverOptions): void;
     startVCObserver({ startTime }: {
@@ -10,8 +12,9 @@ export default class InteractionExtraMetrics {
     }, interactionId: string): void;
     stopVCObserver(): void;
     eligibleToMeasure(interactionId: string): boolean;
-    updateFinishedInteractionId(interactionId: string): void;
-    sinkHandler(fn: (interactionId: string, interaction: InteractionMetrics) => void | Promise<void>): void;
+    updateFinishedInteraction(interaction: InteractionMetrics): void;
+    setLastInteractionFinishVCResult(result: VCResult): void;
+    sinkHandler(fn: (interactionId: string, interaction: InteractionMetrics, lastInteractionFinish: InteractionMetrics | null, lastInteractionFinishVCResult?: VCResult) => void | Promise<void>): void;
     onInteractionComplete(id: string, data: InteractionMetrics): void;
     reset(): void;
     stopAll(id: string): void;

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

@@ -132,6 +132,10 @@ export type Config = {
         readonly rates?: Rates;
         readonly kind?: Record<InteractionType, number>;
     };
+    /**
+     * @private
+     * @deprecated - to be removed on next major version
+     */
     readonly enableSegmentHighlighting?: boolean;
     readonly enableAdditionalPerformanceMarks?: boolean;
     /**

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

@@ -1,6 +1,7 @@
 import type { InteractionMetrics } from '../common';
+import type { VCResult } from '../common/vc/types';
 import type { LabelStack } from '../interaction-context';
-declare function createInteractionExtraLogPayload(interactionId: string, interaction: InteractionMetrics): Promise<{
+declare function createInteractionExtraLogPayload(interactionId: string, interaction: InteractionMetrics, lastInteractionFinish: InteractionMetrics | null, lastInteractionFinishVCResult?: VCResult): Promise<{
     actionSubject: string;
     action: string;
     eventType: string;
@@ -96,6 +97,13 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
                 'metric:ttai:3p': number;
             };
             'vc:effective:revision': string;
+            lastInteractionFinish: {
+                start: number | undefined;
+                end: number | undefined;
+                ttai: number | undefined;
+                vc90: number | null;
+                vcClean: boolean;
+            };
         };
     };
 } | null>;

package/dist/types-ts4.5/create-post-interaction-log-payload/index.d.ts

@@ -1,6 +1,6 @@
 import { type PostInteractionLogOutput } from '../common';
 import type { LateMutation } from '../common/react-ufo-payload-schema';
-declare function createPostInteractionLogPayload({ lastInteractionFinish, reactProfilerTimings, lastInteractionFinishVCResult, postInteractionFinishVCResult, postInteractionHoldInfo }: PostInteractionLogOutput): {
+declare function createPostInteractionLogPayload({ lastInteractionFinish, reactProfilerTimings, lastInteractionFinishVCResult, postInteractionFinishVCResult, postInteractionHoldInfo, }: PostInteractionLogOutput): {
     actionSubject: string;
     action: string;
     eventType: string;

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

@@ -1,8 +1,10 @@
+import { type VCResult } from '../common/vc/types';
 import type { VCObserverInterface, VCObserverOptions } from '../vc/types';
 import { type InteractionMetrics } from './index';
 export default class InteractionExtraMetrics {
-    finishedInteractionId: string | null;
+    finishedInteraction: InteractionMetrics | null;
     vcObserver: VCObserverInterface | null;
+    lastInteractionFinishVCResult?: VCResult;
     private sinkHandlerFn;
     initializeVCObserver(options: VCObserverOptions): void;
     startVCObserver({ startTime }: {
@@ -10,8 +12,9 @@ export default class InteractionExtraMetrics {
     }, interactionId: string): void;
     stopVCObserver(): void;
     eligibleToMeasure(interactionId: string): boolean;
-    updateFinishedInteractionId(interactionId: string): void;
-    sinkHandler(fn: (interactionId: string, interaction: InteractionMetrics) => void | Promise<void>): void;
+    updateFinishedInteraction(interaction: InteractionMetrics): void;
+    setLastInteractionFinishVCResult(result: VCResult): void;
+    sinkHandler(fn: (interactionId: string, interaction: InteractionMetrics, lastInteractionFinish: InteractionMetrics | null, lastInteractionFinishVCResult?: VCResult) => void | Promise<void>): void;
     onInteractionComplete(id: string, data: InteractionMetrics): void;
     reset(): void;
     stopAll(id: string): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.11.1",
+	"version": "4.11.3",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -124,9 +124,6 @@
 		"platform_ufo_enable_interactivity_jsm": {
 			"type": "boolean"
 		},
-		"platform_ufo_unify_abort_status_in_ttvc_debug_data": {
-			"type": "boolean"
-		},
 		"platform_ufo_exclude_3p_elements_from_ttai": {
 			"type": "boolean"
 		},

package/dist/cjs/segment/segment-highlight.js

@@ -1,39 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SegmentHighlight = SegmentHighlight;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-function SegmentHighlight(_ref) {
-  var segmentName = _ref.segmentName;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    segmentHighlight = _useState2[0],
-    setSegmentHighlight = _useState2[1];
-  (0, _react.useEffect)(function () {
-    try {
-      var shouldHighlightSegments = sessionStorage.getItem('segmentsHighlight') === 'true';
-      setSegmentHighlight(shouldHighlightSegments);
-    } catch (err) {
-      /* do nothing */
-    }
-  }, []);
-  if (segmentHighlight) {
-    return (
-      /*#__PURE__*/
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      _react.default.createElement("span", {
-        "data-segment-name": segmentName,
-        style: {
-          display: 'none'
-        }
-      })
-    );
-  }
-  return null;
-}

package/dist/es2019/segment/segment-highlight.js

@@ -1,27 +0,0 @@
-import React, { useEffect, useState } from 'react';
-export function SegmentHighlight({
-  segmentName
-}) {
-  const [segmentHighlight, setSegmentHighlight] = useState(false);
-  useEffect(() => {
-    try {
-      const shouldHighlightSegments = sessionStorage.getItem('segmentsHighlight') === 'true';
-      setSegmentHighlight(shouldHighlightSegments);
-    } catch (err) {
-      /* do nothing */
-    }
-  }, []);
-  if (segmentHighlight) {
-    return (
-      /*#__PURE__*/
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      React.createElement("span", {
-        "data-segment-name": segmentName,
-        style: {
-          display: 'none'
-        }
-      })
-    );
-  }
-  return null;
-}

package/dist/esm/segment/segment-highlight.js

@@ -1,30 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useEffect, useState } from 'react';
-export function SegmentHighlight(_ref) {
-  var segmentName = _ref.segmentName;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    segmentHighlight = _useState2[0],
-    setSegmentHighlight = _useState2[1];
-  useEffect(function () {
-    try {
-      var shouldHighlightSegments = sessionStorage.getItem('segmentsHighlight') === 'true';
-      setSegmentHighlight(shouldHighlightSegments);
-    } catch (err) {
-      /* do nothing */
-    }
-  }, []);
-  if (segmentHighlight) {
-    return (
-      /*#__PURE__*/
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      React.createElement("span", {
-        "data-segment-name": segmentName,
-        style: {
-          display: 'none'
-        }
-      })
-    );
-  }
-  return null;
-}