@atlaskit/react-ufo 3.2.0 → 3.3.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 3.3.1
+
+### Patch Changes
+
+- [#122115](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122115)
+  [`b39ca387a9eb6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b39ca387a9eb6) -
+  Remove VC multiheatmap FG
+
+## 3.3.0
+
+### Minor Changes
+
+- [#120083](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120083)
+  [`25a022df71ba2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/25a022df71ba2) -
+  add UFO devtools chrome extension api for more events
+
 ## 3.2.0
 
 ### Minor Changes

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

@@ -105,6 +105,7 @@ var getExperimentalVCMetrics = exports.getExperimentalVCMetrics = /*#__PURE__*/f
             start: interaction.start,
             stop: interaction.end,
             tti: (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime,
+            isEventAborted: !!interaction.abortReason,
             prefix: prefix,
             vc: interaction.vc
           });

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

@@ -192,7 +192,7 @@ var getTTAI = function getTTAI(interaction) {
 var getVCMetrics = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(interaction) {
     var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$experimentalI;
-    var config, isSSREnabled, ssr, tti, prefix, result, VC, interactionStatus, pageVisibilityUpToTTAI, _result;
+    var config, isSSREnabled, ssr, tti, prefix, interactionStatus, pageVisibilityUpToTTAI, result, VC;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -216,15 +216,18 @@ var getVCMetrics = /*#__PURE__*/function () {
           _interactionMetrics.postInteractionLog.setVCObserverSSRConfig(ssr);
           tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
           prefix = 'ufo';
-          _context.next = 12;
+          interactionStatus = getInteractionStatus(interaction);
+          pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
+          _context.next = 14;
           return (0, _vc.getVCObserver)().getVCResult(_objectSpread({
             start: interaction.start,
             stop: interaction.end,
             tti: tti,
             prefix: prefix,
-            vc: interaction.vc
+            vc: interaction.vc,
+            isEventAborted: interactionStatus.originalInteractionStatus !== 'SUCCEEDED'
           }, ssr));
-        case 12:
+        case 14:
           result = _context.sent;
           if ((_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
             (0, _vc.getVCObserver)().stop();
@@ -232,32 +235,21 @@ var getVCMetrics = /*#__PURE__*/function () {
           _interactionMetrics.postInteractionLog.setLastInteractionFinishVCResult(result);
           VC = result === null || result === void 0 ? void 0 : result['metrics:vc'];
           if (!(!VC || !(result !== null && result !== void 0 && result["".concat(prefix, ":vc:clean")]))) {
-            _context.next = 18;
+            _context.next = 20;
             break;
           }
           return _context.abrupt("return", result);
-        case 18:
-          interactionStatus = getInteractionStatus(interaction);
-          pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
+        case 20:
           if (!(interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible')) {
             _context.next = 22;
             break;
           }
           return _context.abrupt("return", result);
         case 22:
-          if ((0, _platformFeatureFlags.fg)('ufo_vc_multiheatmap')) {
-            (_result = result["".concat(prefix, ":vc:rev")]) === null || _result === void 0 || _result.forEach(function (element) {
-              var _element$vcDetails;
-              if ((_element$vcDetails = element.vcDetails) !== null && _element$vcDetails !== void 0 && (_element$vcDetails = _element$vcDetails['90']) !== null && _element$vcDetails !== void 0 && _element$vcDetails.t) {
-                var _element$vcDetails$;
-                element['metric:vc90'] = (_element$vcDetails$ = element.vcDetails['90']) === null || _element$vcDetails$ === void 0 ? void 0 : _element$vcDetails$.t;
-              }
-            });
-          }
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': VC['90']
           }));
-        case 24:
+        case 23:
         case "end":
           return _context.stop();
       }

package/dist/cjs/interaction-metrics/post-interaction-log.js

@@ -137,6 +137,7 @@ var PostInteractionLog = exports.default = /*#__PURE__*/function () {
                 stop: performance.now(),
                 tti: -1,
                 // no need for TTI value here
+                isEventAborted: !!this.lastInteractionFinish.abortReason,
                 prefix: 'ufo'
               }, this.vcObserverSSRConfig));
             case 6:

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

@@ -8,6 +8,7 @@ exports.init = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _scheduler = require("scheduler");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _additionalPayload = require("../additional-payload");
 var _config = require("../config");
 var _createExperimentalInteractionMetricsPayload = require("../create-experimental-interaction-metrics-payload");
@@ -21,6 +22,7 @@ function sinkInteraction(instance, payloadPackage) {
   (0, _interactionMetrics.sinkInteractionHandler)(function (interactionId, interaction) {
     (0, _scheduler.unstable_scheduleCallback)(_scheduler.unstable_IdlePriority, function () {
       payloadPackage.createPayloads(interactionId, interaction).then(function (payloads) {
+        // NOTE: This API is used by the UFO DevTool Chrome Extension and Criterion
         var devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
         payloads === null || payloads === void 0 || payloads.forEach(function (payload) {
           if (typeof devToolObserver === 'function') {
@@ -39,6 +41,13 @@ function sinkExperimentalInteractionMetrics(instance, payloadPackage) {
     (0, _scheduler.unstable_scheduleCallback)(_scheduler.unstable_IdlePriority, function () {
       var payload = payloadPackage.createExperimentalMetricsPayload(interactionId, interaction);
       if (payload) {
+        if ((0, _platformFeatureFlags.fg)('enable_ufo_devtools_api_for_extra_events')) {
+          // NOTE: This API is used by the UFO DevTool Chrome Extension and Criterion
+          var devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
+          if (typeof devToolObserver === 'function') {
+            devToolObserver === null || devToolObserver === void 0 || devToolObserver(payload);
+          }
+        }
         instance.sendOperationalEvent(payload);
       }
     });
@@ -49,6 +58,13 @@ function sinkPostInteractionLog(instance, createPostInteractionLogPayload) {
     (0, _scheduler.unstable_scheduleCallback)(_scheduler.unstable_IdlePriority, function () {
       var payload = createPostInteractionLogPayload(logOutput);
       if (payload) {
+        // NOTE: This API is used by the UFO DevTool Chrome Extension and also by Criterion
+        if ((0, _platformFeatureFlags.fg)('enable_ufo_devtools_api_for_extra_events')) {
+          var devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
+          if (typeof devToolObserver === 'function') {
+            devToolObserver === null || devToolObserver === void 0 || devToolObserver(payload);
+          }
+        }
         instance.sendOperationalEvent(payload);
       }
     });

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

@@ -10,6 +10,7 @@ var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _hiddenTiming = require("../../../hidden-timing");
 var UNUSED_SECTOR = 0;
 var MultiRevisionHeatmap = exports.MultiRevisionHeatmap = /*#__PURE__*/function () {
   function MultiRevisionHeatmap(_ref) {
@@ -107,8 +108,10 @@ var MultiRevisionHeatmap = exports.MultiRevisionHeatmap = /*#__PURE__*/function
   }, {
     key: "getPayloadShapedData",
     value: function getPayloadShapedData(args) {
+      var pageVisibilityUpToTTAI = (0, _hiddenTiming.getPageVisibilityState)(args.interactionStart, args.ttai);
       var result = this.processData(args);
       var payload = this.revisions.map(function (rev, i) {
+        var _vcDetails$;
         var vcDetails = {};
         args.VCParts.forEach(function (VCPart) {
           vcDetails[VCPart] = {
@@ -120,7 +123,7 @@ var MultiRevisionHeatmap = exports.MultiRevisionHeatmap = /*#__PURE__*/function
           revision: rev.name,
           vcDetails: vcDetails,
           clean: args.clean,
-          'metric:vc90': null // will be set or not in the payload generator
+          'metric:vc90': args.clean && !args.isEventAborted && pageVisibilityUpToTTAI === 'visible' ? vcDetails === null || vcDetails === void 0 || (_vcDetails$ = vcDetails['90']) === null || _vcDetails$ === void 0 ? void 0 : _vcDetails$.t : null
         };
       });
       return payload;

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

@@ -103,11 +103,11 @@ 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, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, multiHeatmap, _VCObserver$calculate, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, isMultiHeatmapEnabled, revisionsData, isCalcSpeedIndexEnabled;
+        var start, stop, tti, prefix, ssr, vc, isEventAborted, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, multiHeatmap, _VCObserver$calculate, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, isMultiHeatmapEnabled, revisionsData, isCalcSpeedIndexEnabled, speedIndex;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              start = _ref3.start, stop = _ref3.stop, tti = _ref3.tti, prefix = _ref3.prefix, ssr = _ref3.ssr, vc = _ref3.vc;
+              start = _ref3.start, stop = _ref3.stop, tti = _ref3.tti, prefix = _ref3.prefix, ssr = _ref3.ssr, vc = _ref3.vc, isEventAborted = _ref3.isEventAborted;
               startTime = performance.now(); // add local measurement
               fullPrefix = prefix !== undefined && prefix !== '' ? "".concat(prefix, ":") : '';
               rawData = vc !== undefined ? vc : _this.getVCRawData();
@@ -240,8 +240,8 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
               } catch (e) {
                 /*  do nothing */
               }
-              isMultiHeatmapEnabled = (0, _platformFeatureFlags.fg)('ufo_vc_multiheatmap');
-              revisionsData = isMultiHeatmapEnabled && multiHeatmap !== null ? (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), multiHeatmap.getPayloadShapedData({
+              isMultiHeatmapEnabled = !(0, _platformFeatureFlags.fg)('platform_ufo_multiheatmap_killswitch');
+              revisionsData = isMultiHeatmapEnabled && multiHeatmap !== null ? (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), multiHeatmap === null || multiHeatmap === void 0 ? void 0 : multiHeatmap.getPayloadShapedData({
                 VCParts: VCObserver.VCParts.map(function (v) {
                   return parseInt(v);
                 }),
@@ -253,15 +253,18 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
                   var classifier = _ref10.classifier;
                   return classifier.filterComponentsLog;
                 }),
+                isEventAborted: isEventAborted,
+                interactionStart: start,
                 ttai: stop,
                 ssr: ssr,
                 clean: !abortReasonInfo
               })) : null; // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
               isCalcSpeedIndexEnabled = (0, _platformFeatureFlags.fg)('ufo-calc-speed-index');
+              speedIndex = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "ufo:speedIndex", VCEntries.speedIndex), "ufo:next:speedIndex", vcNext.VCEntries.speedIndex);
               return _context.abrupt("return", _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)({
                 'metrics:vc': VC
-              }, "".concat(fullPrefix, "vc:state"), true), "".concat(fullPrefix, "vc:clean"), !abortReasonInfo), "".concat(fullPrefix, "vc:dom"), VCBox), "".concat(fullPrefix, "vc:updates"), 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), outOfBoundary), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:next"), vcNext.VC), "".concat(fullPrefix, "vc:next:updates"), vcNext.VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:next:dom"), vcNext.VCBox), "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "ufo:speedIndex", isCalcSpeedIndexEnabled ? VCEntries.speedIndex : undefined), "ufo:next:speedIndex", isCalcSpeedIndexEnabled ? vcNext.VCEntries.speedIndex : undefined)));
-            case 23:
+              }, "".concat(fullPrefix, "vc:state"), true), "".concat(fullPrefix, "vc:clean"), !abortReasonInfo), "".concat(fullPrefix, "vc:dom"), VCBox), "".concat(fullPrefix, "vc:updates"), 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), outOfBoundary), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:next"), vcNext.VC), "".concat(fullPrefix, "vc:next:updates"), vcNext.VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:next:dom"), vcNext.VCBox), "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), isCalcSpeedIndexEnabled ? speedIndex : {}));
+            case 24:
             case "end":
               return _context.stop();
           }
@@ -274,16 +277,14 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "handleUpdate", function (rawTime, intersectionRect, targetName, element, type, ignoreReason) {
       _this.measureStart();
       _this.legacyHandleUpdate(rawTime, intersectionRect, targetName, element, type, ignoreReason);
-      if ((0, _platformFeatureFlags.fg)('ufo_vc_multiheatmap')) {
-        _this.onViewportChangeDetected({
-          timestamp: rawTime,
-          intersectionRect: intersectionRect,
-          targetName: targetName,
-          element: element,
-          type: type,
-          ignoreReason: ignoreReason
-        });
-      }
+      _this.onViewportChangeDetected({
+        timestamp: rawTime,
+        intersectionRect: intersectionRect,
+        targetName: targetName,
+        element: element,
+        type: type,
+        ignoreReason: ignoreReason
+      });
       _this.measureStop();
     });
     (0, _defineProperty2.default)(this, "legacyHandleUpdate", function (rawTime, intersectionRect, targetName, element, type, ignoreReason) {
@@ -423,13 +424,11 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
     });
     this.heatmap = this.getCleanHeatmap();
     this.heatmapNext = this.getCleanHeatmap();
-    if ((0, _platformFeatureFlags.fg)('ufo_vc_multiheatmap')) {
-      this.multiHeatmap = new _heatmap.MultiRevisionHeatmap({
-        viewport: this.viewport,
-        revisions: (0, _revisions.getRevisions)(),
-        devToolsEnabled: this.devToolsEnabled
-      });
-    }
+    this.multiHeatmap = new _heatmap.MultiRevisionHeatmap({
+      viewport: this.viewport,
+      revisions: (0, _revisions.getRevisions)(),
+      devToolsEnabled: this.devToolsEnabled
+    });
     this.isPostInteraction = options.isPostInteraction || false;
   }
   return (0, _createClass2.default)(VCObserver, [{
@@ -512,13 +511,11 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
       this.detachAbortListeners();
       this.heatmap = this.getCleanHeatmap();
       this.heatmapNext = this.getCleanHeatmap();
-      if ((0, _platformFeatureFlags.fg)('ufo_vc_multiheatmap')) {
-        this.multiHeatmap = new _heatmap.MultiRevisionHeatmap({
-          viewport: this.viewport,
-          revisions: (0, _revisions.getRevisions)(),
-          devToolsEnabled: this.devToolsEnabled
-        });
-      }
+      this.multiHeatmap = new _heatmap.MultiRevisionHeatmap({
+        viewport: this.viewport,
+        revisions: (0, _revisions.getRevisions)(),
+        devToolsEnabled: this.devToolsEnabled
+      });
       this.totalTime = 0;
       this.componentsLog = {};
       this.vcRatios = {};

package/dist/cjs/vc/vc-observer-new/metric-calculator/percentile-calc/canvas-heatmap/canvas-pixel.js

@@ -63,7 +63,7 @@ var ViewportCanvas = exports.ViewportCanvas = /*#__PURE__*/function () {
       throw new Error('Could not get canvas context');
     }
     this.ctx = ctx;
-    this.ctx.globalCompositeOperation = "source-over";
+    this.ctx.globalCompositeOperation = 'source-over';
     this.clear();
   }
   return (0, _createClass2.default)(ViewportCanvas, [{

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

@@ -65,6 +65,7 @@ export const getExperimentalVCMetrics = async interaction => {
       start: interaction.start,
       stop: interaction.end,
       tti: (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 ? void 0 : (_interaction$apdex$ = _interaction$apdex[0]) === null || _interaction$apdex$ === void 0 ? void 0 : _interaction$apdex$.stopTime,
+      isEventAborted: !!interaction.abortReason,
       prefix,
       vc: interaction.vc
     });

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

@@ -181,12 +181,15 @@ const getVCMetrics = async interaction => {
   postInteractionLog.setVCObserverSSRConfig(ssr);
   const tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 ? void 0 : (_interaction$apdex$ = _interaction$apdex[0]) === null || _interaction$apdex$ === void 0 ? void 0 : _interaction$apdex$.stopTime;
   const prefix = 'ufo';
+  const interactionStatus = getInteractionStatus(interaction);
+  const pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
   const result = await getVCObserver().getVCResult({
     start: interaction.start,
     stop: interaction.end,
     tti,
     prefix,
     vc: interaction.vc,
+    isEventAborted: interactionStatus.originalInteractionStatus !== 'SUCCEEDED',
     ...ssr
   });
   if ((_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
@@ -197,21 +200,9 @@ const getVCMetrics = async interaction => {
   if (!VC || !(result !== null && result !== void 0 && result[`${prefix}:vc:clean`])) {
     return result;
   }
-  const interactionStatus = getInteractionStatus(interaction);
-  const pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
   if (interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible') {
     return result;
   }
-  if (fg('ufo_vc_multiheatmap')) {
-    var _result;
-    (_result = result[`${prefix}:vc:rev`]) === null || _result === void 0 ? void 0 : _result.forEach(element => {
-      var _element$vcDetails, _element$vcDetails$;
-      if ((_element$vcDetails = element.vcDetails) !== null && _element$vcDetails !== void 0 && (_element$vcDetails$ = _element$vcDetails['90']) !== null && _element$vcDetails$ !== void 0 && _element$vcDetails$.t) {
-        var _element$vcDetails$2;
-        element['metric:vc90'] = (_element$vcDetails$2 = element.vcDetails['90']) === null || _element$vcDetails$2 === void 0 ? void 0 : _element$vcDetails$2.t;
-      }
-    });
-  }
   return {
     ...result,
     'metric:vc90': VC['90']

package/dist/es2019/interaction-metrics/post-interaction-log.js

@@ -101,6 +101,7 @@ export default class PostInteractionLog {
       stop: performance.now(),
       tti: -1,
       // no need for TTI value here
+      isEventAborted: !!this.lastInteractionFinish.abortReason,
       prefix: 'ufo',
       ...this.vcObserverSSRConfig
     }));

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

@@ -1,4 +1,5 @@
 import { unstable_IdlePriority as idlePriority, unstable_scheduleCallback as scheduleCallback } from 'scheduler';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { startLighthouseObserver } from '../additional-payload';
 import { setUFOConfig } from '../config';
 import { experimentalVC, sinkExperimentalHandler } from '../create-experimental-interaction-metrics-payload';
@@ -10,6 +11,7 @@ function sinkInteraction(instance, payloadPackage) {
   sinkInteractionHandler((interactionId, interaction) => {
     scheduleCallback(idlePriority, () => {
       payloadPackage.createPayloads(interactionId, interaction).then(payloads => {
+        // NOTE: This API is used by the UFO DevTool Chrome Extension and Criterion
         const devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
         payloads === null || payloads === void 0 ? void 0 : payloads.forEach(payload => {
           if (typeof devToolObserver === 'function') {
@@ -28,6 +30,13 @@ function sinkExperimentalInteractionMetrics(instance, payloadPackage) {
     scheduleCallback(idlePriority, () => {
       const payload = payloadPackage.createExperimentalMetricsPayload(interactionId, interaction);
       if (payload) {
+        if (fg('enable_ufo_devtools_api_for_extra_events')) {
+          // NOTE: This API is used by the UFO DevTool Chrome Extension and Criterion
+          const devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
+          if (typeof devToolObserver === 'function') {
+            devToolObserver === null || devToolObserver === void 0 ? void 0 : devToolObserver(payload);
+          }
+        }
         instance.sendOperationalEvent(payload);
       }
     });
@@ -38,6 +47,13 @@ function sinkPostInteractionLog(instance, createPostInteractionLogPayload) {
     scheduleCallback(idlePriority, () => {
       const payload = createPostInteractionLogPayload(logOutput);
       if (payload) {
+        // NOTE: This API is used by the UFO DevTool Chrome Extension and also by Criterion
+        if (fg('enable_ufo_devtools_api_for_extra_events')) {
+          const devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
+          if (typeof devToolObserver === 'function') {
+            devToolObserver === null || devToolObserver === void 0 ? void 0 : devToolObserver(payload);
+          }
+        }
         instance.sendOperationalEvent(payload);
       }
     });

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

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { getPageVisibilityState } from '../../../hidden-timing';
 const UNUSED_SECTOR = 0;
 export class MultiRevisionHeatmap {
   constructor({
@@ -91,8 +92,10 @@ export class MultiRevisionHeatmap {
     };
   }
   getPayloadShapedData(args) {
+    const pageVisibilityUpToTTAI = getPageVisibilityState(args.interactionStart, args.ttai);
     const result = this.processData(args);
     const payload = this.revisions.map((rev, i) => {
+      var _vcDetails$;
       const vcDetails = {};
       args.VCParts.forEach(VCPart => {
         vcDetails[VCPart] = {
@@ -104,7 +107,7 @@ export class MultiRevisionHeatmap {
         revision: rev.name,
         vcDetails,
         clean: args.clean,
-        'metric:vc90': null // will be set or not in the payload generator
+        'metric:vc90': args.clean && !args.isEventAborted && pageVisibilityUpToTTAI === 'visible' ? vcDetails === null || vcDetails === void 0 ? void 0 : (_vcDetails$ = vcDetails['90']) === null || _vcDetails$ === void 0 ? void 0 : _vcDetails$.t : null
       };
     });
     return payload;

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

@@ -91,7 +91,8 @@ export class VCObserver {
       tti,
       prefix,
       ssr,
-      vc
+      vc,
+      isEventAborted
     }) => {
       const startTime = performance.now();
       // add local measurement
@@ -249,9 +250,9 @@ export class VCObserver {
       } catch (e) {
         /*  do nothing */
       }
-      const isMultiHeatmapEnabled = fg('ufo_vc_multiheatmap');
+      const isMultiHeatmapEnabled = !fg('platform_ufo_multiheatmap_killswitch');
       const revisionsData = isMultiHeatmapEnabled && multiHeatmap !== null ? {
-        [`${fullPrefix}vc:rev`]: multiHeatmap.getPayloadShapedData({
+        [`${fullPrefix}vc:rev`]: multiHeatmap === null || multiHeatmap === void 0 ? void 0 : multiHeatmap.getPayloadShapedData({
           VCParts: VCObserver.VCParts.map(v => parseInt(v)),
           VCCalculationMethods: getRevisions().map(({
             classifier
@@ -259,6 +260,8 @@ export class VCObserver {
           filterComponentsLog: getRevisions().map(({
             classifier
           }) => classifier.filterComponentsLog),
+          isEventAborted,
+          interactionStart: start,
           ttai: stop,
           ssr,
           clean: !abortReasonInfo
@@ -266,6 +269,10 @@ export class VCObserver {
       } : null;
       // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
       const isCalcSpeedIndexEnabled = fg('ufo-calc-speed-index');
+      const speedIndex = {
+        [`ufo:speedIndex`]: VCEntries.speedIndex,
+        [`ufo:next:speedIndex`]: vcNext.VCEntries.speedIndex
+      };
       return {
         'metrics:vc': VC,
         [`${fullPrefix}vc:state`]: true,
@@ -284,23 +291,20 @@ export class VCObserver {
         //...oldDomUpdates,
         [`${fullPrefix}vc:ignored`]: this.getIgnoredElements(componentsLog),
         ...revisionsData,
-        [`ufo:speedIndex`]: isCalcSpeedIndexEnabled ? VCEntries.speedIndex : undefined,
-        [`ufo:next:speedIndex`]: isCalcSpeedIndexEnabled ? vcNext.VCEntries.speedIndex : undefined
+        ...(isCalcSpeedIndexEnabled ? speedIndex : {})
       };
     });
     _defineProperty(this, "handleUpdate", (rawTime, intersectionRect, targetName, element, type, ignoreReason) => {
       this.measureStart();
       this.legacyHandleUpdate(rawTime, intersectionRect, targetName, element, type, ignoreReason);
-      if (fg('ufo_vc_multiheatmap')) {
-        this.onViewportChangeDetected({
-          timestamp: rawTime,
-          intersectionRect,
-          targetName,
-          element,
-          type,
-          ignoreReason
-        });
-      }
+      this.onViewportChangeDetected({
+        timestamp: rawTime,
+        intersectionRect,
+        targetName,
+        element,
+        type,
+        ignoreReason
+      });
       this.measureStop();
     });
     _defineProperty(this, "legacyHandleUpdate", (rawTime, intersectionRect, targetName, element, type, ignoreReason) => {
@@ -441,13 +445,11 @@ export class VCObserver {
     });
     this.heatmap = this.getCleanHeatmap();
     this.heatmapNext = this.getCleanHeatmap();
-    if (fg('ufo_vc_multiheatmap')) {
-      this.multiHeatmap = new MultiRevisionHeatmap({
-        viewport: this.viewport,
-        revisions: getRevisions(),
-        devToolsEnabled: this.devToolsEnabled
-      });
-    }
+    this.multiHeatmap = new MultiRevisionHeatmap({
+      viewport: this.viewport,
+      revisions: getRevisions(),
+      devToolsEnabled: this.devToolsEnabled
+    });
     this.isPostInteraction = options.isPostInteraction || false;
   }
   start({
@@ -606,13 +608,11 @@ export class VCObserver {
     this.detachAbortListeners();
     this.heatmap = this.getCleanHeatmap();
     this.heatmapNext = this.getCleanHeatmap();
-    if (fg('ufo_vc_multiheatmap')) {
-      this.multiHeatmap = new MultiRevisionHeatmap({
-        viewport: this.viewport,
-        revisions: getRevisions(),
-        devToolsEnabled: this.devToolsEnabled
-      });
-    }
+    this.multiHeatmap = new MultiRevisionHeatmap({
+      viewport: this.viewport,
+      revisions: getRevisions(),
+      devToolsEnabled: this.devToolsEnabled
+    });
     this.totalTime = 0;
     this.componentsLog = {};
     this.vcRatios = {};

package/dist/es2019/vc/vc-observer-new/metric-calculator/percentile-calc/canvas-heatmap/canvas-pixel.js

@@ -50,7 +50,7 @@ export class ViewportCanvas {
       throw new Error('Could not get canvas context');
     }
     this.ctx = ctx;
-    this.ctx.globalCompositeOperation = "source-over";
+    this.ctx.globalCompositeOperation = 'source-over';
     this.clear();
   }
   getScaledDimensions() {

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

@@ -95,6 +95,7 @@ export var getExperimentalVCMetrics = /*#__PURE__*/function () {
             start: interaction.start,
             stop: interaction.end,
             tti: (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime,
+            isEventAborted: !!interaction.abortReason,
             prefix: prefix,
             vc: interaction.vc
           });

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

@@ -181,7 +181,7 @@ var getTTAI = function getTTAI(interaction) {
 var getVCMetrics = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interaction) {
     var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$experimentalI;
-    var config, isSSREnabled, ssr, tti, prefix, result, VC, interactionStatus, pageVisibilityUpToTTAI, _result;
+    var config, isSSREnabled, ssr, tti, prefix, interactionStatus, pageVisibilityUpToTTAI, result, VC;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -205,15 +205,18 @@ var getVCMetrics = /*#__PURE__*/function () {
           postInteractionLog.setVCObserverSSRConfig(ssr);
           tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
           prefix = 'ufo';
-          _context.next = 12;
+          interactionStatus = getInteractionStatus(interaction);
+          pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
+          _context.next = 14;
           return getVCObserver().getVCResult(_objectSpread({
             start: interaction.start,
             stop: interaction.end,
             tti: tti,
             prefix: prefix,
-            vc: interaction.vc
+            vc: interaction.vc,
+            isEventAborted: interactionStatus.originalInteractionStatus !== 'SUCCEEDED'
           }, ssr));
-        case 12:
+        case 14:
           result = _context.sent;
           if ((_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
             getVCObserver().stop();
@@ -221,32 +224,21 @@ var getVCMetrics = /*#__PURE__*/function () {
           postInteractionLog.setLastInteractionFinishVCResult(result);
           VC = result === null || result === void 0 ? void 0 : result['metrics:vc'];
           if (!(!VC || !(result !== null && result !== void 0 && result["".concat(prefix, ":vc:clean")]))) {
-            _context.next = 18;
+            _context.next = 20;
             break;
           }
           return _context.abrupt("return", result);
-        case 18:
-          interactionStatus = getInteractionStatus(interaction);
-          pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
+        case 20:
           if (!(interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible')) {
             _context.next = 22;
             break;
           }
           return _context.abrupt("return", result);
         case 22:
-          if (fg('ufo_vc_multiheatmap')) {
-            (_result = result["".concat(prefix, ":vc:rev")]) === null || _result === void 0 || _result.forEach(function (element) {
-              var _element$vcDetails;
-              if ((_element$vcDetails = element.vcDetails) !== null && _element$vcDetails !== void 0 && (_element$vcDetails = _element$vcDetails['90']) !== null && _element$vcDetails !== void 0 && _element$vcDetails.t) {
-                var _element$vcDetails$;
-                element['metric:vc90'] = (_element$vcDetails$ = element.vcDetails['90']) === null || _element$vcDetails$ === void 0 ? void 0 : _element$vcDetails$.t;
-              }
-            });
-          }
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': VC['90']
           }));
-        case 24:
+        case 23:
         case "end":
           return _context.stop();
       }

package/dist/esm/interaction-metrics/post-interaction-log.js

@@ -130,6 +130,7 @@ var PostInteractionLog = /*#__PURE__*/function () {
                 stop: performance.now(),
                 tti: -1,
                 // no need for TTI value here
+                isEventAborted: !!this.lastInteractionFinish.abortReason,
                 prefix: 'ufo'
               }, this.vcObserverSSRConfig));
             case 6:

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

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { unstable_IdlePriority as idlePriority, unstable_scheduleCallback as scheduleCallback } from 'scheduler';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { startLighthouseObserver } from '../additional-payload';
 import { setUFOConfig } from '../config';
 import { experimentalVC, sinkExperimentalHandler } from '../create-experimental-interaction-metrics-payload';
@@ -11,6 +12,7 @@ function sinkInteraction(instance, payloadPackage) {
   sinkInteractionHandler(function (interactionId, interaction) {
     scheduleCallback(idlePriority, function () {
       payloadPackage.createPayloads(interactionId, interaction).then(function (payloads) {
+        // NOTE: This API is used by the UFO DevTool Chrome Extension and Criterion
         var devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
         payloads === null || payloads === void 0 || payloads.forEach(function (payload) {
           if (typeof devToolObserver === 'function') {
@@ -29,6 +31,13 @@ function sinkExperimentalInteractionMetrics(instance, payloadPackage) {
     scheduleCallback(idlePriority, function () {
       var payload = payloadPackage.createExperimentalMetricsPayload(interactionId, interaction);
       if (payload) {
+        if (fg('enable_ufo_devtools_api_for_extra_events')) {
+          // NOTE: This API is used by the UFO DevTool Chrome Extension and Criterion
+          var devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
+          if (typeof devToolObserver === 'function') {
+            devToolObserver === null || devToolObserver === void 0 || devToolObserver(payload);
+          }
+        }
         instance.sendOperationalEvent(payload);
       }
     });
@@ -39,6 +48,13 @@ function sinkPostInteractionLog(instance, createPostInteractionLogPayload) {
     scheduleCallback(idlePriority, function () {
       var payload = createPostInteractionLogPayload(logOutput);
       if (payload) {
+        // NOTE: This API is used by the UFO DevTool Chrome Extension and also by Criterion
+        if (fg('enable_ufo_devtools_api_for_extra_events')) {
+          var devToolObserver = globalThis.__ufo_devtool_onUfoPayload;
+          if (typeof devToolObserver === 'function') {
+            devToolObserver === null || devToolObserver === void 0 || devToolObserver(payload);
+          }
+        }
         instance.sendOperationalEvent(payload);
       }
     });

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

@@ -3,6 +3,7 @@ import _objectDestructuringEmpty from "@babel/runtime/helpers/objectDestructurin
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { getPageVisibilityState } from '../../../hidden-timing';
 var UNUSED_SECTOR = 0;
 export var MultiRevisionHeatmap = /*#__PURE__*/function () {
   function MultiRevisionHeatmap(_ref) {
@@ -100,8 +101,10 @@ export var MultiRevisionHeatmap = /*#__PURE__*/function () {
   }, {
     key: "getPayloadShapedData",
     value: function getPayloadShapedData(args) {
+      var pageVisibilityUpToTTAI = getPageVisibilityState(args.interactionStart, args.ttai);
       var result = this.processData(args);
       var payload = this.revisions.map(function (rev, i) {
+        var _vcDetails$;
         var vcDetails = {};
         args.VCParts.forEach(function (VCPart) {
           vcDetails[VCPart] = {
@@ -113,7 +116,7 @@ export var MultiRevisionHeatmap = /*#__PURE__*/function () {
           revision: rev.name,
           vcDetails: vcDetails,
           clean: args.clean,
-          'metric:vc90': null // will be set or not in the payload generator
+          'metric:vc90': args.clean && !args.isEventAborted && pageVisibilityUpToTTAI === 'visible' ? vcDetails === null || vcDetails === void 0 || (_vcDetails$ = vcDetails['90']) === null || _vcDetails$ === void 0 ? void 0 : _vcDetails$.t : null
         };
       });
       return payload;

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

@@ -96,11 +96,11 @@ 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, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, multiHeatmap, _VCObserver$calculate, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, isMultiHeatmapEnabled, revisionsData, isCalcSpeedIndexEnabled;
+        var start, stop, tti, prefix, ssr, vc, isEventAborted, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, multiHeatmap, _VCObserver$calculate, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, isMultiHeatmapEnabled, revisionsData, isCalcSpeedIndexEnabled, speedIndex;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              start = _ref3.start, stop = _ref3.stop, tti = _ref3.tti, prefix = _ref3.prefix, ssr = _ref3.ssr, vc = _ref3.vc;
+              start = _ref3.start, stop = _ref3.stop, tti = _ref3.tti, prefix = _ref3.prefix, ssr = _ref3.ssr, vc = _ref3.vc, isEventAborted = _ref3.isEventAborted;
               startTime = performance.now(); // add local measurement
               fullPrefix = prefix !== undefined && prefix !== '' ? "".concat(prefix, ":") : '';
               rawData = vc !== undefined ? vc : _this.getVCRawData();
@@ -233,8 +233,8 @@ export var VCObserver = /*#__PURE__*/function () {
               } catch (e) {
                 /*  do nothing */
               }
-              isMultiHeatmapEnabled = fg('ufo_vc_multiheatmap');
-              revisionsData = isMultiHeatmapEnabled && multiHeatmap !== null ? _defineProperty({}, "".concat(fullPrefix, "vc:rev"), multiHeatmap.getPayloadShapedData({
+              isMultiHeatmapEnabled = !fg('platform_ufo_multiheatmap_killswitch');
+              revisionsData = isMultiHeatmapEnabled && multiHeatmap !== null ? _defineProperty({}, "".concat(fullPrefix, "vc:rev"), multiHeatmap === null || multiHeatmap === void 0 ? void 0 : multiHeatmap.getPayloadShapedData({
                 VCParts: VCObserver.VCParts.map(function (v) {
                   return parseInt(v);
                 }),
@@ -246,15 +246,18 @@ export var VCObserver = /*#__PURE__*/function () {
                   var classifier = _ref10.classifier;
                   return classifier.filterComponentsLog;
                 }),
+                isEventAborted: isEventAborted,
+                interactionStart: start,
                 ttai: stop,
                 ssr: ssr,
                 clean: !abortReasonInfo
               })) : null; // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
               isCalcSpeedIndexEnabled = fg('ufo-calc-speed-index');
+              speedIndex = _defineProperty(_defineProperty({}, "ufo:speedIndex", VCEntries.speedIndex), "ufo:next:speedIndex", vcNext.VCEntries.speedIndex);
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
                 'metrics:vc': VC
-              }, "".concat(fullPrefix, "vc:state"), true), "".concat(fullPrefix, "vc:clean"), !abortReasonInfo), "".concat(fullPrefix, "vc:dom"), VCBox), "".concat(fullPrefix, "vc:updates"), 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), outOfBoundary), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(fullPrefix, "vc:next"), vcNext.VC), "".concat(fullPrefix, "vc:next:updates"), vcNext.VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:next:dom"), vcNext.VCBox), "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), {}, _defineProperty(_defineProperty({}, "ufo:speedIndex", isCalcSpeedIndexEnabled ? VCEntries.speedIndex : undefined), "ufo:next:speedIndex", isCalcSpeedIndexEnabled ? vcNext.VCEntries.speedIndex : undefined)));
-            case 23:
+              }, "".concat(fullPrefix, "vc:state"), true), "".concat(fullPrefix, "vc:clean"), !abortReasonInfo), "".concat(fullPrefix, "vc:dom"), VCBox), "".concat(fullPrefix, "vc:updates"), 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), outOfBoundary), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(fullPrefix, "vc:next"), vcNext.VC), "".concat(fullPrefix, "vc:next:updates"), vcNext.VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:next:dom"), vcNext.VCBox), "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), isCalcSpeedIndexEnabled ? speedIndex : {}));
+            case 24:
             case "end":
               return _context.stop();
           }
@@ -267,16 +270,14 @@ export var VCObserver = /*#__PURE__*/function () {
     _defineProperty(this, "handleUpdate", function (rawTime, intersectionRect, targetName, element, type, ignoreReason) {
       _this.measureStart();
       _this.legacyHandleUpdate(rawTime, intersectionRect, targetName, element, type, ignoreReason);
-      if (fg('ufo_vc_multiheatmap')) {
-        _this.onViewportChangeDetected({
-          timestamp: rawTime,
-          intersectionRect: intersectionRect,
-          targetName: targetName,
-          element: element,
-          type: type,
-          ignoreReason: ignoreReason
-        });
-      }
+      _this.onViewportChangeDetected({
+        timestamp: rawTime,
+        intersectionRect: intersectionRect,
+        targetName: targetName,
+        element: element,
+        type: type,
+        ignoreReason: ignoreReason
+      });
       _this.measureStop();
     });
     _defineProperty(this, "legacyHandleUpdate", function (rawTime, intersectionRect, targetName, element, type, ignoreReason) {
@@ -416,13 +417,11 @@ export var VCObserver = /*#__PURE__*/function () {
     });
     this.heatmap = this.getCleanHeatmap();
     this.heatmapNext = this.getCleanHeatmap();
-    if (fg('ufo_vc_multiheatmap')) {
-      this.multiHeatmap = new MultiRevisionHeatmap({
-        viewport: this.viewport,
-        revisions: getRevisions(),
-        devToolsEnabled: this.devToolsEnabled
-      });
-    }
+    this.multiHeatmap = new MultiRevisionHeatmap({
+      viewport: this.viewport,
+      revisions: getRevisions(),
+      devToolsEnabled: this.devToolsEnabled
+    });
     this.isPostInteraction = options.isPostInteraction || false;
   }
   return _createClass(VCObserver, [{
@@ -505,13 +504,11 @@ export var VCObserver = /*#__PURE__*/function () {
       this.detachAbortListeners();
       this.heatmap = this.getCleanHeatmap();
       this.heatmapNext = this.getCleanHeatmap();
-      if (fg('ufo_vc_multiheatmap')) {
-        this.multiHeatmap = new MultiRevisionHeatmap({
-          viewport: this.viewport,
-          revisions: getRevisions(),
-          devToolsEnabled: this.devToolsEnabled
-        });
-      }
+      this.multiHeatmap = new MultiRevisionHeatmap({
+        viewport: this.viewport,
+        revisions: getRevisions(),
+        devToolsEnabled: this.devToolsEnabled
+      });
       this.totalTime = 0;
       this.componentsLog = {};
       this.vcRatios = {};

package/dist/esm/vc/vc-observer-new/metric-calculator/percentile-calc/canvas-heatmap/canvas-pixel.js

@@ -56,7 +56,7 @@ export var ViewportCanvas = /*#__PURE__*/function () {
       throw new Error('Could not get canvas context');
     }
     this.ctx = ctx;
-    this.ctx.globalCompositeOperation = "source-over";
+    this.ctx.globalCompositeOperation = 'source-over';
     this.clear();
   }
   return _createClass(ViewportCanvas, [{

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

@@ -1,6 +1,6 @@
 export type { AssetResourceEntry, AssetsClassification, AssetsData, AssetsReporter, } from './assets/types';
 export type { LifecycleMarkType, MarkType, SpanType, InteractionType, AbortReasonType, CustomTiming, HoldInfo, LoadProfilerEventInfo, ReactProfilerTiming, Span, Mark, InteractionError, RequestInfo, ApdexType, SegmentInfo, CustomData, HoldActive, Redirect, InteractionMetrics, EnhancedUFOInteractionContextType, BM3Event, PostInteractionLogOutput, LastInteractionFinishInfo, } from './common/types';
-export type { MultiHeatmapPayload, } from './vc/types';
+export type { MultiHeatmapPayload } from './vc/types';
 /**
  * @deprecated Prefer import from @atlaskit/react-ufo/interaction-context
  */

package/dist/types/vc/types.d.ts

@@ -3,6 +3,7 @@ export type GetVCResultType = {
     start: number;
     stop: number;
     tti: number;
+    isEventAborted: boolean;
     prefix?: string;
     ssr?: number;
     vc?: VCRawDataType | null;

package/dist/types/vc/vc-observer/heatmap/heatmap.d.ts

@@ -20,6 +20,8 @@ type ProcessDataArgs = {
     VCParts: number[];
     VCCalculationMethods: VCCalculationMethodType[];
     clean: boolean;
+    isEventAborted: boolean;
+    interactionStart: number;
     ttai: number;
     filterComponentsLog: FilterComponentsLogType[];
     ssr?: number;

package/dist/types/vc/vc-observer/index.d.ts

@@ -41,7 +41,7 @@ export declare class VCObserver implements VCObserverInterface {
         targetName: string;
         ignoreReason: VCIgnoreReason | undefined;
     }[];
-    getVCResult: ({ start, stop, tti, prefix, ssr, vc, }: GetVCResultType) => Promise<VCResult>;
+    getVCResult: ({ start, stop, tti, prefix, ssr, vc, isEventAborted, }: GetVCResultType) => Promise<VCResult>;
     static calculateVC({ heatmap, ssr, componentsLog, viewport, }: {
         heatmap: number[][];
         ssr?: number;

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

@@ -1,6 +1,6 @@
 export type { AssetResourceEntry, AssetsClassification, AssetsData, AssetsReporter, } from './assets/types';
 export type { LifecycleMarkType, MarkType, SpanType, InteractionType, AbortReasonType, CustomTiming, HoldInfo, LoadProfilerEventInfo, ReactProfilerTiming, Span, Mark, InteractionError, RequestInfo, ApdexType, SegmentInfo, CustomData, HoldActive, Redirect, InteractionMetrics, EnhancedUFOInteractionContextType, BM3Event, PostInteractionLogOutput, LastInteractionFinishInfo, } from './common/types';
-export type { MultiHeatmapPayload, } from './vc/types';
+export type { MultiHeatmapPayload } from './vc/types';
 /**
  * @deprecated Prefer import from @atlaskit/react-ufo/interaction-context
  */

package/dist/types-ts4.5/vc/types.d.ts

@@ -3,6 +3,7 @@ export type GetVCResultType = {
     start: number;
     stop: number;
     tti: number;
+    isEventAborted: boolean;
     prefix?: string;
     ssr?: number;
     vc?: VCRawDataType | null;

package/dist/types-ts4.5/vc/vc-observer/heatmap/heatmap.d.ts

@@ -20,6 +20,8 @@ type ProcessDataArgs = {
     VCParts: number[];
     VCCalculationMethods: VCCalculationMethodType[];
     clean: boolean;
+    isEventAborted: boolean;
+    interactionStart: number;
     ttai: number;
     filterComponentsLog: FilterComponentsLogType[];
     ssr?: number;

package/dist/types-ts4.5/vc/vc-observer/index.d.ts

@@ -51,7 +51,7 @@ export declare class VCObserver implements VCObserverInterface {
         targetName: string;
         ignoreReason: VCIgnoreReason | undefined;
     }[];
-    getVCResult: ({ start, stop, tti, prefix, ssr, vc, }: GetVCResultType) => Promise<VCResult>;
+    getVCResult: ({ start, stop, tti, prefix, ssr, vc, isEventAborted, }: GetVCResultType) => Promise<VCResult>;
     static calculateVC({ heatmap, ssr, componentsLog, viewport, }: {
         heatmap: number[][];
         ssr?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "3.2.0",
+	"version": "3.3.1",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -151,9 +151,6 @@
 		"ufo-remove-vc-component-observations-after-ttai": {
 			"type": "boolean"
 		},
-		"ufo_vc_multiheatmap": {
-			"type": "boolean"
-		},
 		"ufo-calc-speed-index": {
 			"type": "boolean"
 		},
@@ -171,6 +168,12 @@
 		},
 		"platform_ufo_vc_ttai_on_paint": {
 			"type": "boolean"
+		},
+		"enable_ufo_devtools_api_for_extra_events": {
+			"type": "boolean"
+		},
+		"platform_ufo_multiheatmap_killswitch": {
+			"type": "boolean"
 		}
 	}
 }