@atlaskit/react-ufo 2.16.1 → 3.1.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 3.1.0
+
+### Minor Changes
+
+- [#118212](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/118212)
+  [`7a1ec3e0fb496`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7a1ec3e0fb496) -
+  Updating logic to track resource timings to include 'other' type which includes '.js'
+
+## 3.0.0
+
+### Major Changes
+
+- [#117363](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117363)
+  [`10a0f7f6c2027`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/10a0f7f6c2027) -
+  This package's `peerDependencies` have been adjusted for `react` and/or `react-dom` to reflect the
+  status of only supporting React 18 going forward. No explicit breaking change to React support has
+  been made in this release, but this is to signify going forward, breaking changes for React 16 or
+  React 17 may come via non-major semver releases.
+
+  Please refer this community post for more details:
+  https://community.developer.atlassian.com/t/rfc-78-dropping-support-for-react-16-and-rendering-in-a-react-18-concurrent-root-in-jira-and-confluence/87026
+
+### Patch Changes
+
+- [#117324](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117324)
+  [`921179f5ee66d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/921179f5ee66d) -
+  Remove FG from CHR API
+- Updated dependencies
+
 ## 2.16.1
 
 ### Patch Changes

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

@@ -320,11 +320,10 @@ var getAssetsMetrics = function getAssetsMetrics(interaction, resourceTimings) {
   try {
     var config = (0, _config.getConfig)();
     var type = interaction.type;
-    var isCHREnabled = (0, _platformFeatureFlags.fg)('ufo_chr_config');
     var allowedTypes = ['page_load', 'transition'];
     var assetsClassification = config === null || config === void 0 ? void 0 : config.assetsClassification;
-    if (!isCHREnabled || !allowedTypes.includes(type) || !assetsClassification) {
-      // Skip if: FG disabled, not allowed type or assetsClassification isn't configured
+    if (!allowedTypes.includes(type) || !assetsClassification) {
+      // Skip if: type not allowed or assetsClassification isn't configured
       return {};
     }
     var reporter = new _assets.CHRReporter();

package/dist/cjs/resource-timing/main.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getResourceTimings = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../config");
 var _roundNumber = require("../round-number");
 var _config2 = require("./common/utils/config");
@@ -17,10 +18,19 @@ var resourceTypes = ['fetch', 'xmlhttprequest'];
 var CACHE_NETWORK = 'network';
 var CACHE_MEMORY = 'memory';
 var CACHE_DISK = 'disk';
+var isCacheableType = function isCacheableType(url, type) {
+  if (cacheableTypes.includes(type)) {
+    return true;
+  }
+  if (type === 'other' && url.includes('.js') && (0, _platformFeatureFlags.fg)('ufo_support_other_resource_type_js')) {
+    return true;
+  }
+  return false;
+};
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-var calculateTransferType = function calculateTransferType(type, duration, size) {
-  if (!cacheableTypes.includes(type)) {
+var calculateTransferType = function calculateTransferType(name, type, duration, size) {
+  if (!isCacheableType(name, type)) {
     return CACHE_NETWORK;
   }
   if ((size === undefined || size === 0) && duration === 0) {
@@ -38,15 +48,22 @@ var getWindowObject = function getWindowObject() {
   return typeof window !== 'undefined' && !!window ? window : undefined;
 };
 var hasAccessToResourceSize = function hasAccessToResourceSize(url, type, entry, hasTimingHeaders) {
-  return !cacheableTypes.includes(type) || url.includes('localhost') || !!getWindowObject() && url.includes(window.location.hostname) || hasTimingHeaders(url, entry);
+  return !isCacheableType(url, type) || url.includes('localhost') || !!getWindowObject() && url.includes(window.location.hostname) || hasTimingHeaders(url, entry);
 };
 var getReportedInitiatorTypes = function getReportedInitiatorTypes(xhrEnabled) {
   var ufoConfig = (0, _config.getConfig)();
   if (!(ufoConfig !== null && ufoConfig !== void 0 && ufoConfig.allowedResources)) {
-    if (xhrEnabled) {
-      return ['script', 'link', 'fetch', 'xmlhttprequest'];
+    if ((0, _platformFeatureFlags.fg)('ufo_support_other_resource_type_js')) {
+      if (xhrEnabled) {
+        return ['script', 'link', 'fetch', 'other', 'xmlhttprequest'];
+      }
+      return ['script', 'link', 'fetch', 'other'];
+    } else {
+      if (xhrEnabled) {
+        return ['script', 'link', 'fetch', 'xmlhttprequest'];
+      }
+      return ['script', 'link', 'fetch'];
     }
-    return ['script', 'link', 'fetch'];
   }
   return ufoConfig.allowedResources;
 };
@@ -77,7 +94,7 @@ var getNetworkData = function getNetworkData(item, eventStart) {
     return {};
   }
   if (cacheableTypes.includes(initiatorType)) {
-    var transferType = calculateTransferType(initiatorType, duration, transferSize);
+    var transferType = calculateTransferType(name, initiatorType, duration, transferSize);
     return _objectSpread({
       ttfb: ttfb,
       transferType: transferType,
@@ -125,6 +142,9 @@ var getResourceTimings = exports.getResourceTimings = function getResourceTiming
     if (initiatorType === 'xmlhttprequest' && (xhrFilter === undefined || xhrFilter(name) === false)) {
       return;
     }
+    if (initiatorType === 'other' && !name.includes('.js') && (0, _platformFeatureFlags.fg)('ufo_support_other_resource_type_js')) {
+      return;
+    }
     var url = resourceTypes.includes(initiatorType) ? sanitiseEndpoints(name) : mapResources(name);
     if (!url) {
       return;

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

@@ -131,6 +131,8 @@ var MultiRevisionHeatmap = exports.MultiRevisionHeatmap = /*#__PURE__*/function
       var _this3 = this;
       var VCParts = _ref4.VCParts,
         VCCalculationMethods = _ref4.VCCalculationMethods,
+        filterComponentsLog = _ref4.filterComponentsLog,
+        ttai = _ref4.ttai,
         _ref4$ssr = _ref4.ssr,
         ssr = _ref4$ssr === void 0 ? UNUSED_SECTOR : _ref4$ssr;
       return this.heatmaps.map(function (heatmap, i) {
@@ -173,6 +175,12 @@ var MultiRevisionHeatmap = exports.MultiRevisionHeatmap = /*#__PURE__*/function
         }).sort(function (a, b) {
           return a[0] > b[0] ? 1 : -1;
         });
+
+        // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+        componentsLog = filterComponentsLog[i]({
+          componentsLog: componentsLog,
+          ttai: ttai
+        });
         var _VCCalculationMethods = VCCalculationMethods[i]({
             VCParts: VCParts,
             componentsLog: componentsLog,
@@ -249,7 +257,7 @@ var MultiRevisionHeatmap = exports.MultiRevisionHeatmap = /*#__PURE__*/function
   }, {
     key: "getCleanHeatmap",
     value: function getCleanHeatmap() {
-      return new Uint32Array(this.arraySize.w * this.arraySize.h);
+      return new Int32Array(this.arraySize.w * this.arraySize.h);
     }
   }], [{
     key: "makeVCReturnObj",

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

@@ -260,6 +260,11 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
           var classifier = _ref8.classifier;
           return classifier.VCCalculationMethod;
         }),
+        filterComponentsLog: (0, _revisions.getRevisions)().map(function (_ref9) {
+          var classifier = _ref9.classifier;
+          return classifier.filterComponentsLog;
+        }),
+        ttai: stop,
         ssr: ssr,
         clean: !abortReasonInfo
       })) : null;
@@ -306,13 +311,13 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
         });
       }
     });
-    (0, _defineProperty2.default)(this, "onViewportChangeDetected", function (_ref10) {
-      var element = _ref10.element,
-        type = _ref10.type,
-        ignoreReason = _ref10.ignoreReason,
-        timestamp = _ref10.timestamp,
-        targetName = _ref10.targetName,
-        intersectionRect = _ref10.intersectionRect;
+    (0, _defineProperty2.default)(this, "onViewportChangeDetected", function (_ref11) {
+      var element = _ref11.element,
+        type = _ref11.type,
+        ignoreReason = _ref11.ignoreReason,
+        timestamp = _ref11.timestamp,
+        targetName = _ref11.targetName,
+        intersectionRect = _ref11.intersectionRect;
       if (_this.multiHeatmap === null) {
         return;
       }
@@ -394,10 +399,10 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
       var unbinds = (0, _attachAbortListeners.attachAbortListeners)(window, _this.viewport, _this.abortReasonCallback);
       if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__) {
         var _window2;
-        Object.entries(window.__SSR_ABORT_LISTENERS__.aborts).forEach(function (_ref11) {
-          var _ref12 = (0, _slicedToArray2.default)(_ref11, 2),
-            key = _ref12[0],
-            time = _ref12[1];
+        Object.entries(window.__SSR_ABORT_LISTENERS__.aborts).forEach(function (_ref12) {
+          var _ref13 = (0, _slicedToArray2.default)(_ref12, 2),
+            key = _ref13[0],
+            time = _ref13[1];
           if (time) {
             _this.abortReasonCallback(key, time);
           }
@@ -432,8 +437,8 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
   }
   return (0, _createClass2.default)(VCObserver, [{
     key: "start",
-    value: function start(_ref13) {
-      var startTime = _ref13.startTime;
+    value: function start(_ref14) {
+      var startTime = _ref14.startTime;
       this.active = true;
       if (this.observers.isBrowserSupported()) {
         this.setViewportSize();
@@ -455,12 +460,12 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
   }, {
     key: "getIgnoredElements",
     value: function getIgnoredElements(componentsLog) {
-      return Object.values(componentsLog).flat().filter(function (_ref14) {
-        var ignoreReason = _ref14.ignoreReason;
+      return Object.values(componentsLog).flat().filter(function (_ref15) {
+        var ignoreReason = _ref15.ignoreReason;
         return Boolean(ignoreReason);
-      }).map(function (_ref15) {
-        var targetName = _ref15.targetName,
-          ignoreReason = _ref15.ignoreReason;
+      }).map(function (_ref16) {
+        var targetName = _ref16.targetName,
+          ignoreReason = _ref16.ignoreReason;
         return {
           targetName: targetName,
           ignoreReason: ignoreReason
@@ -516,6 +521,13 @@ 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.totalTime = 0;
       this.componentsLog = {};
       this.vcRatios = {};
@@ -581,12 +593,12 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
     }
   }], [{
     key: "calculateVC",
-    value: function calculateVC(_ref16) {
-      var heatmap = _ref16.heatmap,
-        _ref16$ssr = _ref16.ssr,
-        ssr = _ref16$ssr === void 0 ? UNUSED_SECTOR : _ref16$ssr,
-        componentsLog = _ref16.componentsLog,
-        viewport = _ref16.viewport;
+    value: function calculateVC(_ref17) {
+      var heatmap = _ref17.heatmap,
+        _ref17$ssr = _ref17.ssr,
+        ssr = _ref17$ssr === void 0 ? UNUSED_SECTOR : _ref17$ssr,
+        componentsLog = _ref17.componentsLog,
+        viewport = _ref17.viewport;
       var lastUpdate = {};
       var totalPainted = 0;
       if (ssr !== UNUSED_SECTOR) {
@@ -655,11 +667,11 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
         });
         return VCRatio;
       }, 0);
-      var VCEntries = entries.reduce(function (acc, _ref17, i) {
+      var VCEntries = entries.reduce(function (acc, _ref18, i) {
         var _acc$abs, _componentsLog$timest, _acc$rel$vc, _acc$rel;
-        var _ref18 = (0, _slicedToArray2.default)(_ref17, 2),
-          timestamp = _ref18[0],
-          entryPainted = _ref18[1];
+        var _ref19 = (0, _slicedToArray2.default)(_ref18, 2),
+          timestamp = _ref19[0],
+          entryPainted = _ref19[1];
         var currentlyPainted = entryPainted + (((_acc$abs = acc.abs[i - 1]) === null || _acc$abs === void 0 ? void 0 : _acc$abs[1]) || 0);
         var currentlyPaintedRatio = Math.round(currentlyPainted / totalPainted * 1000) / 10;
         var logEntry = (_componentsLog$timest = componentsLog[timestamp]) === null || _componentsLog$timest === void 0 ? void 0 : _componentsLog$timest.map(function (v) {

package/dist/cjs/vc/vc-observer/revisions/ViewportUpdateClassifier.js

@@ -26,6 +26,14 @@ var ViewportUpdateClassifier = exports.ViewportUpdateClassifier = /*#__PURE__*/f
         VCBox: {}
       };
     }
+
+    // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+  }, {
+    key: "filterComponentsLog",
+    value: function filterComponentsLog(_ref) {
+      var componentsLog = _ref.componentsLog;
+      return componentsLog;
+    }
   }, {
     key: "mergeConfig",
     value: function mergeConfig() {
@@ -38,17 +46,17 @@ var ViewportUpdateClassifier = exports.ViewportUpdateClassifier = /*#__PURE__*/f
     }
   }, {
     key: "classifyUpdate",
-    value: function classifyUpdate(_ref) {
-      var element = _ref.element,
-        type = _ref.type,
-        tags = _ref.tags,
-        ignoreReason = _ref.ignoreReason;
+    value: function classifyUpdate(_ref2) {
+      var element = _ref2.element,
+        type = _ref2.type,
+        tags = _ref2.tags,
+        ignoreReason = _ref2.ignoreReason;
       if (!this.__combinedTypes.includes(type)) {
         return false;
       }
-      return this.__combinedFilters.every(function (_ref2) {
-        var filter = _ref2.filter,
-          name = _ref2.name;
+      return this.__combinedFilters.every(function (_ref3) {
+        var filter = _ref3.filter,
+          name = _ref3.name;
         return filter({
           type: type,
           tags: tags,

package/dist/cjs/vc/vc-observer/revisions/fy24_01.js

@@ -11,6 +11,7 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ViewportUpdateClassifier = require("./ViewportUpdateClassifier");
 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; })(); }
@@ -48,6 +49,12 @@ var FY24_01Classifier = exports.FY24_01Classifier = /*#__PURE__*/function (_View
         var v = arguments.length > 1 ? arguments[1] : undefined;
         var VCRatio = v[1] / totalPainted + acc;
         var time = v[0];
+        if ((0, _platformFeatureFlags.fg)('platform_ufo_fix_vc_observer_rounding_error')) {
+          // @todo apply fix to include small changes into accumulator
+          var preciseCurrRatio = Math.round(100 * (v[1] / totalPainted));
+          var preciseAccRatio = Math.round(acc * 100);
+          VCRatio = (preciseCurrRatio + preciseAccRatio) / 100;
+        }
         VCParts.forEach(function (value) {
           if ((VC[value] === null || VC[value] === undefined) && VCRatio >= value / 100) {
             var _componentsLog$time;

package/dist/cjs/vc/vc-observer/revisions/fy25_01.js

@@ -5,13 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.revFY25_01Classifier = exports.FY25_01Classifier = void 0;
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _fy24_ = require("./fy24_01");
+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 FY25_01Classifier = exports.FY25_01Classifier = /*#__PURE__*/function (_FY24_01Classifier) {
@@ -34,6 +38,31 @@ var FY25_01Classifier = exports.FY25_01Classifier = /*#__PURE__*/function (_FY24
     return _this;
   }
   (0, _inherits2.default)(FY25_01Classifier, _FY24_01Classifier);
-  return (0, _createClass2.default)(FY25_01Classifier);
+  return (0, _createClass2.default)(FY25_01Classifier, [{
+    key: "filterComponentsLog",
+    value:
+    // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+    function filterComponentsLog(_ref2) {
+      var componentsLog = _ref2.componentsLog,
+        ttai = _ref2.ttai;
+      var _componentsLog = {};
+
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      if ((0, _platformFeatureFlags.fg)('ufo-remove-vc-component-observations-after-ttai')) {
+        Object.entries(componentsLog).forEach(function (_ref3) {
+          var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+            _timestamp = _ref4[0],
+            value = _ref4[1];
+          var timestamp = Number(_timestamp);
+          if (ttai > timestamp) {
+            _componentsLog[timestamp] = value;
+          }
+        });
+      } else {
+        _componentsLog = _objectSpread({}, componentsLog);
+      }
+      return _componentsLog;
+    }
+  }]);
 }(_fy24_.FY24_01Classifier);
 var revFY25_01Classifier = exports.revFY25_01Classifier = new FY25_01Classifier();

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

@@ -305,11 +305,10 @@ const getAssetsMetrics = (interaction, resourceTimings) => {
     const {
       type
     } = interaction;
-    const isCHREnabled = fg('ufo_chr_config');
     const allowedTypes = ['page_load', 'transition'];
     const assetsClassification = config === null || config === void 0 ? void 0 : config.assetsClassification;
-    if (!isCHREnabled || !allowedTypes.includes(type) || !assetsClassification) {
-      // Skip if: FG disabled, not allowed type or assetsClassification isn't configured
+    if (!allowedTypes.includes(type) || !assetsClassification) {
+      // Skip if: type not allowed or assetsClassification isn't configured
       return {};
     }
     const reporter = new CHRReporter();

package/dist/es2019/resource-timing/main.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig as getConfigUFO } from '../config';
 import { roundEpsilon } from '../round-number';
 import { getConfig } from './common/utils/config';
@@ -7,10 +8,19 @@ const resourceTypes = ['fetch', 'xmlhttprequest'];
 const CACHE_NETWORK = 'network';
 const CACHE_MEMORY = 'memory';
 const CACHE_DISK = 'disk';
+const isCacheableType = (url, type) => {
+  if (cacheableTypes.includes(type)) {
+    return true;
+  }
+  if (type === 'other' && url.includes('.js') && fg('ufo_support_other_resource_type_js')) {
+    return true;
+  }
+  return false;
+};
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-const calculateTransferType = (type, duration, size) => {
-  if (!cacheableTypes.includes(type)) {
+const calculateTransferType = (name, type, duration, size) => {
+  if (!isCacheableType(name, type)) {
     return CACHE_NETWORK;
   }
   if ((size === undefined || size === 0) && duration === 0) {
@@ -25,14 +35,21 @@ const calculateTransferType = (type, duration, size) => {
   return CACHE_NETWORK;
 };
 const getWindowObject = () => typeof window !== 'undefined' && !!window ? window : undefined;
-const hasAccessToResourceSize = (url, type, entry, hasTimingHeaders) => !cacheableTypes.includes(type) || url.includes('localhost') || !!getWindowObject() && url.includes(window.location.hostname) || hasTimingHeaders(url, entry);
+const hasAccessToResourceSize = (url, type, entry, hasTimingHeaders) => !isCacheableType(url, type) || url.includes('localhost') || !!getWindowObject() && url.includes(window.location.hostname) || hasTimingHeaders(url, entry);
 const getReportedInitiatorTypes = xhrEnabled => {
   const ufoConfig = getConfigUFO();
   if (!(ufoConfig !== null && ufoConfig !== void 0 && ufoConfig.allowedResources)) {
-    if (xhrEnabled) {
-      return ['script', 'link', 'fetch', 'xmlhttprequest'];
+    if (fg('ufo_support_other_resource_type_js')) {
+      if (xhrEnabled) {
+        return ['script', 'link', 'fetch', 'other', 'xmlhttprequest'];
+      }
+      return ['script', 'link', 'fetch', 'other'];
+    } else {
+      if (xhrEnabled) {
+        return ['script', 'link', 'fetch', 'xmlhttprequest'];
+      }
+      return ['script', 'link', 'fetch'];
     }
-    return ['script', 'link', 'fetch'];
   }
   return ufoConfig.allowedResources;
 };
@@ -60,7 +77,7 @@ const getNetworkData = (item, eventStart, hasTimingHeaders = evaluateAccessToRes
     return {};
   }
   if (cacheableTypes.includes(initiatorType)) {
-    const transferType = calculateTransferType(initiatorType, duration, transferSize);
+    const transferType = calculateTransferType(name, initiatorType, duration, transferSize);
     return {
       ttfb,
       transferType,
@@ -113,6 +130,9 @@ export const getResourceTimings = (interactionStart, interactionEnd) => {
     if (initiatorType === 'xmlhttprequest' && (xhrFilter === undefined || xhrFilter(name) === false)) {
       return;
     }
+    if (initiatorType === 'other' && !name.includes('.js') && fg('ufo_support_other_resource_type_js')) {
+      return;
+    }
     const url = resourceTypes.includes(initiatorType) ? sanitiseEndpoints(name) : mapResources(name);
     if (!url) {
       return;

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

@@ -112,6 +112,8 @@ export class MultiRevisionHeatmap {
   processData({
     VCParts,
     VCCalculationMethods,
+    filterComponentsLog,
+    ttai,
     ssr = UNUSED_SECTOR
   }) {
     return this.heatmaps.map((heatmap, i) => {
@@ -150,6 +152,12 @@ export class MultiRevisionHeatmap {
         }
       }
       const entries = Object.entries(lastUpdate).map(a => [parseInt(a[0], 10), a[1]]).sort((a, b) => a[0] > b[0] ? 1 : -1);
+
+      // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+      componentsLog = filterComponentsLog[i]({
+        componentsLog,
+        ttai
+      });
       const {
         VC,
         VCBox
@@ -218,7 +226,7 @@ export class MultiRevisionHeatmap {
     return x + this.arraySize.w * y;
   }
   getCleanHeatmap() {
-    return new Uint32Array(this.arraySize.w * this.arraySize.h);
+    return new Int32Array(this.arraySize.w * this.arraySize.h);
   }
   static makeVCReturnObj(VCParts) {
     const vc = {};

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

@@ -256,6 +256,10 @@ export class VCObserver {
           VCCalculationMethods: getRevisions().map(({
             classifier
           }) => classifier.VCCalculationMethod),
+          filterComponentsLog: getRevisions().map(({
+            classifier
+          }) => classifier.filterComponentsLog),
+          ttai: stop,
           ssr,
           clean: !abortReasonInfo
         })
@@ -605,6 +609,13 @@ 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.totalTime = 0;
     this.componentsLog = {};
     this.vcRatios = {};

package/dist/es2019/vc/vc-observer/revisions/ViewportUpdateClassifier.js

@@ -13,6 +13,13 @@ export class ViewportUpdateClassifier {
       VCBox: {}
     };
   }
+
+  // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+  filterComponentsLog({
+    componentsLog
+  }) {
+    return componentsLog;
+  }
   mergeConfig() {
     this.__combinedTypes = [...this.types, ...((this === null || this === void 0 ? void 0 : this.__combinedTypes) || [])];
     const previousFilters = this.removedFilters.length === 0 ? this.__combinedFilters : this.__combinedFilters.filter(filter => !this.removedFilters.includes(filter.name));

package/dist/es2019/vc/vc-observer/revisions/fy24_01.js

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ViewportUpdateClassifier } from './ViewportUpdateClassifier';
 const legacyIgnoreReasons = ['image', 'ssr-hydration', 'editor-lazy-node-view', 'editor-container-mutation'];
 export class FY24_01Classifier extends ViewportUpdateClassifier {
@@ -11,8 +12,14 @@ export class FY24_01Classifier extends ViewportUpdateClassifier {
     const VC = {};
     const VCBox = {};
     entries.reduce((acc = 0, v) => {
-      const VCRatio = v[1] / totalPainted + acc;
+      let VCRatio = v[1] / totalPainted + acc;
       const time = v[0];
+      if (fg('platform_ufo_fix_vc_observer_rounding_error')) {
+        // @todo apply fix to include small changes into accumulator
+        const preciseCurrRatio = Math.round(100 * (v[1] / totalPainted));
+        const preciseAccRatio = Math.round(acc * 100);
+        VCRatio = (preciseCurrRatio + preciseAccRatio) / 100;
+      }
       VCParts.forEach(value => {
         if ((VC[value] === null || VC[value] === undefined) && VCRatio >= value / 100) {
           var _componentsLog$time;

package/dist/es2019/vc/vc-observer/revisions/fy25_01.js

@@ -1,6 +1,29 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FY24_01Classifier } from './fy24_01';
 export class FY25_01Classifier extends FY24_01Classifier {
+  // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+  filterComponentsLog({
+    componentsLog,
+    ttai
+  }) {
+    let _componentsLog = {};
+
+    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+    if (fg('ufo-remove-vc-component-observations-after-ttai')) {
+      Object.entries(componentsLog).forEach(([_timestamp, value]) => {
+        const timestamp = Number(_timestamp);
+        if (ttai > timestamp) {
+          _componentsLog[timestamp] = value;
+        }
+      });
+    } else {
+      _componentsLog = {
+        ...componentsLog
+      };
+    }
+    return _componentsLog;
+  }
   constructor() {
     super();
     _defineProperty(this, "revision", 'fy25.01');

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

@@ -309,11 +309,10 @@ var getAssetsMetrics = function getAssetsMetrics(interaction, resourceTimings) {
   try {
     var config = getConfig();
     var type = interaction.type;
-    var isCHREnabled = fg('ufo_chr_config');
     var allowedTypes = ['page_load', 'transition'];
     var assetsClassification = config === null || config === void 0 ? void 0 : config.assetsClassification;
-    if (!isCHREnabled || !allowedTypes.includes(type) || !assetsClassification) {
-      // Skip if: FG disabled, not allowed type or assetsClassification isn't configured
+    if (!allowedTypes.includes(type) || !assetsClassification) {
+      // Skip if: type not allowed or assetsClassification isn't configured
       return {};
     }
     var reporter = new CHRReporter();

package/dist/esm/resource-timing/main.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 { getConfig as getConfigUFO } from '../config';
 import { roundEpsilon } from '../round-number';
 import { getConfig } from './common/utils/config';
@@ -10,10 +11,19 @@ var resourceTypes = ['fetch', 'xmlhttprequest'];
 var CACHE_NETWORK = 'network';
 var CACHE_MEMORY = 'memory';
 var CACHE_DISK = 'disk';
+var isCacheableType = function isCacheableType(url, type) {
+  if (cacheableTypes.includes(type)) {
+    return true;
+  }
+  if (type === 'other' && url.includes('.js') && fg('ufo_support_other_resource_type_js')) {
+    return true;
+  }
+  return false;
+};
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-var calculateTransferType = function calculateTransferType(type, duration, size) {
-  if (!cacheableTypes.includes(type)) {
+var calculateTransferType = function calculateTransferType(name, type, duration, size) {
+  if (!isCacheableType(name, type)) {
     return CACHE_NETWORK;
   }
   if ((size === undefined || size === 0) && duration === 0) {
@@ -31,15 +41,22 @@ var getWindowObject = function getWindowObject() {
   return typeof window !== 'undefined' && !!window ? window : undefined;
 };
 var hasAccessToResourceSize = function hasAccessToResourceSize(url, type, entry, hasTimingHeaders) {
-  return !cacheableTypes.includes(type) || url.includes('localhost') || !!getWindowObject() && url.includes(window.location.hostname) || hasTimingHeaders(url, entry);
+  return !isCacheableType(url, type) || url.includes('localhost') || !!getWindowObject() && url.includes(window.location.hostname) || hasTimingHeaders(url, entry);
 };
 var getReportedInitiatorTypes = function getReportedInitiatorTypes(xhrEnabled) {
   var ufoConfig = getConfigUFO();
   if (!(ufoConfig !== null && ufoConfig !== void 0 && ufoConfig.allowedResources)) {
-    if (xhrEnabled) {
-      return ['script', 'link', 'fetch', 'xmlhttprequest'];
+    if (fg('ufo_support_other_resource_type_js')) {
+      if (xhrEnabled) {
+        return ['script', 'link', 'fetch', 'other', 'xmlhttprequest'];
+      }
+      return ['script', 'link', 'fetch', 'other'];
+    } else {
+      if (xhrEnabled) {
+        return ['script', 'link', 'fetch', 'xmlhttprequest'];
+      }
+      return ['script', 'link', 'fetch'];
     }
-    return ['script', 'link', 'fetch'];
   }
   return ufoConfig.allowedResources;
 };
@@ -70,7 +87,7 @@ var getNetworkData = function getNetworkData(item, eventStart) {
     return {};
   }
   if (cacheableTypes.includes(initiatorType)) {
-    var transferType = calculateTransferType(initiatorType, duration, transferSize);
+    var transferType = calculateTransferType(name, initiatorType, duration, transferSize);
     return _objectSpread({
       ttfb: ttfb,
       transferType: transferType,
@@ -118,6 +135,9 @@ export var getResourceTimings = function getResourceTimings(interactionStart, in
     if (initiatorType === 'xmlhttprequest' && (xhrFilter === undefined || xhrFilter(name) === false)) {
       return;
     }
+    if (initiatorType === 'other' && !name.includes('.js') && fg('ufo_support_other_resource_type_js')) {
+      return;
+    }
     var url = resourceTypes.includes(initiatorType) ? sanitiseEndpoints(name) : mapResources(name);
     if (!url) {
       return;

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

@@ -124,6 +124,8 @@ export var MultiRevisionHeatmap = /*#__PURE__*/function () {
       var _this3 = this;
       var VCParts = _ref4.VCParts,
         VCCalculationMethods = _ref4.VCCalculationMethods,
+        filterComponentsLog = _ref4.filterComponentsLog,
+        ttai = _ref4.ttai,
         _ref4$ssr = _ref4.ssr,
         ssr = _ref4$ssr === void 0 ? UNUSED_SECTOR : _ref4$ssr;
       return this.heatmaps.map(function (heatmap, i) {
@@ -166,6 +168,12 @@ export var MultiRevisionHeatmap = /*#__PURE__*/function () {
         }).sort(function (a, b) {
           return a[0] > b[0] ? 1 : -1;
         });
+
+        // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+        componentsLog = filterComponentsLog[i]({
+          componentsLog: componentsLog,
+          ttai: ttai
+        });
         var _VCCalculationMethods = VCCalculationMethods[i]({
             VCParts: VCParts,
             componentsLog: componentsLog,
@@ -242,7 +250,7 @@ export var MultiRevisionHeatmap = /*#__PURE__*/function () {
   }, {
     key: "getCleanHeatmap",
     value: function getCleanHeatmap() {
-      return new Uint32Array(this.arraySize.w * this.arraySize.h);
+      return new Int32Array(this.arraySize.w * this.arraySize.h);
     }
   }], [{
     key: "makeVCReturnObj",

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

@@ -253,6 +253,11 @@ export var VCObserver = /*#__PURE__*/function () {
           var classifier = _ref8.classifier;
           return classifier.VCCalculationMethod;
         }),
+        filterComponentsLog: getRevisions().map(function (_ref9) {
+          var classifier = _ref9.classifier;
+          return classifier.filterComponentsLog;
+        }),
+        ttai: stop,
         ssr: ssr,
         clean: !abortReasonInfo
       })) : null;
@@ -299,13 +304,13 @@ export var VCObserver = /*#__PURE__*/function () {
         });
       }
     });
-    _defineProperty(this, "onViewportChangeDetected", function (_ref10) {
-      var element = _ref10.element,
-        type = _ref10.type,
-        ignoreReason = _ref10.ignoreReason,
-        timestamp = _ref10.timestamp,
-        targetName = _ref10.targetName,
-        intersectionRect = _ref10.intersectionRect;
+    _defineProperty(this, "onViewportChangeDetected", function (_ref11) {
+      var element = _ref11.element,
+        type = _ref11.type,
+        ignoreReason = _ref11.ignoreReason,
+        timestamp = _ref11.timestamp,
+        targetName = _ref11.targetName,
+        intersectionRect = _ref11.intersectionRect;
       if (_this.multiHeatmap === null) {
         return;
       }
@@ -387,10 +392,10 @@ export var VCObserver = /*#__PURE__*/function () {
       var unbinds = attachAbortListeners(window, _this.viewport, _this.abortReasonCallback);
       if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__) {
         var _window2;
-        Object.entries(window.__SSR_ABORT_LISTENERS__.aborts).forEach(function (_ref11) {
-          var _ref12 = _slicedToArray(_ref11, 2),
-            key = _ref12[0],
-            time = _ref12[1];
+        Object.entries(window.__SSR_ABORT_LISTENERS__.aborts).forEach(function (_ref12) {
+          var _ref13 = _slicedToArray(_ref12, 2),
+            key = _ref13[0],
+            time = _ref13[1];
           if (time) {
             _this.abortReasonCallback(key, time);
           }
@@ -425,8 +430,8 @@ export var VCObserver = /*#__PURE__*/function () {
   }
   return _createClass(VCObserver, [{
     key: "start",
-    value: function start(_ref13) {
-      var startTime = _ref13.startTime;
+    value: function start(_ref14) {
+      var startTime = _ref14.startTime;
       this.active = true;
       if (this.observers.isBrowserSupported()) {
         this.setViewportSize();
@@ -448,12 +453,12 @@ export var VCObserver = /*#__PURE__*/function () {
   }, {
     key: "getIgnoredElements",
     value: function getIgnoredElements(componentsLog) {
-      return Object.values(componentsLog).flat().filter(function (_ref14) {
-        var ignoreReason = _ref14.ignoreReason;
+      return Object.values(componentsLog).flat().filter(function (_ref15) {
+        var ignoreReason = _ref15.ignoreReason;
         return Boolean(ignoreReason);
-      }).map(function (_ref15) {
-        var targetName = _ref15.targetName,
-          ignoreReason = _ref15.ignoreReason;
+      }).map(function (_ref16) {
+        var targetName = _ref16.targetName,
+          ignoreReason = _ref16.ignoreReason;
         return {
           targetName: targetName,
           ignoreReason: ignoreReason
@@ -509,6 +514,13 @@ 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.totalTime = 0;
       this.componentsLog = {};
       this.vcRatios = {};
@@ -574,12 +586,12 @@ export var VCObserver = /*#__PURE__*/function () {
     }
   }], [{
     key: "calculateVC",
-    value: function calculateVC(_ref16) {
-      var heatmap = _ref16.heatmap,
-        _ref16$ssr = _ref16.ssr,
-        ssr = _ref16$ssr === void 0 ? UNUSED_SECTOR : _ref16$ssr,
-        componentsLog = _ref16.componentsLog,
-        viewport = _ref16.viewport;
+    value: function calculateVC(_ref17) {
+      var heatmap = _ref17.heatmap,
+        _ref17$ssr = _ref17.ssr,
+        ssr = _ref17$ssr === void 0 ? UNUSED_SECTOR : _ref17$ssr,
+        componentsLog = _ref17.componentsLog,
+        viewport = _ref17.viewport;
       var lastUpdate = {};
       var totalPainted = 0;
       if (ssr !== UNUSED_SECTOR) {
@@ -648,11 +660,11 @@ export var VCObserver = /*#__PURE__*/function () {
         });
         return VCRatio;
       }, 0);
-      var VCEntries = entries.reduce(function (acc, _ref17, i) {
+      var VCEntries = entries.reduce(function (acc, _ref18, i) {
         var _acc$abs, _componentsLog$timest, _acc$rel$vc, _acc$rel;
-        var _ref18 = _slicedToArray(_ref17, 2),
-          timestamp = _ref18[0],
-          entryPainted = _ref18[1];
+        var _ref19 = _slicedToArray(_ref18, 2),
+          timestamp = _ref19[0],
+          entryPainted = _ref19[1];
         var currentlyPainted = entryPainted + (((_acc$abs = acc.abs[i - 1]) === null || _acc$abs === void 0 ? void 0 : _acc$abs[1]) || 0);
         var currentlyPaintedRatio = Math.round(currentlyPainted / totalPainted * 1000) / 10;
         var logEntry = (_componentsLog$timest = componentsLog[timestamp]) === null || _componentsLog$timest === void 0 ? void 0 : _componentsLog$timest.map(function (v) {

package/dist/esm/vc/vc-observer/revisions/ViewportUpdateClassifier.js

@@ -19,6 +19,14 @@ export var ViewportUpdateClassifier = /*#__PURE__*/function () {
         VCBox: {}
       };
     }
+
+    // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+  }, {
+    key: "filterComponentsLog",
+    value: function filterComponentsLog(_ref) {
+      var componentsLog = _ref.componentsLog;
+      return componentsLog;
+    }
   }, {
     key: "mergeConfig",
     value: function mergeConfig() {
@@ -31,17 +39,17 @@ export var ViewportUpdateClassifier = /*#__PURE__*/function () {
     }
   }, {
     key: "classifyUpdate",
-    value: function classifyUpdate(_ref) {
-      var element = _ref.element,
-        type = _ref.type,
-        tags = _ref.tags,
-        ignoreReason = _ref.ignoreReason;
+    value: function classifyUpdate(_ref2) {
+      var element = _ref2.element,
+        type = _ref2.type,
+        tags = _ref2.tags,
+        ignoreReason = _ref2.ignoreReason;
       if (!this.__combinedTypes.includes(type)) {
         return false;
       }
-      return this.__combinedFilters.every(function (_ref2) {
-        var filter = _ref2.filter,
-          name = _ref2.name;
+      return this.__combinedFilters.every(function (_ref3) {
+        var filter = _ref3.filter,
+          name = _ref3.name;
         return filter({
           type: type,
           tags: tags,

package/dist/esm/vc/vc-observer/revisions/fy24_01.js

@@ -6,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
 import { ViewportUpdateClassifier } from './ViewportUpdateClassifier';
 var legacyIgnoreReasons = ['image', 'ssr-hydration', 'editor-lazy-node-view', 'editor-container-mutation'];
 export var FY24_01Classifier = /*#__PURE__*/function (_ViewportUpdateClassi) {
@@ -41,6 +42,12 @@ export var FY24_01Classifier = /*#__PURE__*/function (_ViewportUpdateClassi) {
         var v = arguments.length > 1 ? arguments[1] : undefined;
         var VCRatio = v[1] / totalPainted + acc;
         var time = v[0];
+        if (fg('platform_ufo_fix_vc_observer_rounding_error')) {
+          // @todo apply fix to include small changes into accumulator
+          var preciseCurrRatio = Math.round(100 * (v[1] / totalPainted));
+          var preciseAccRatio = Math.round(acc * 100);
+          VCRatio = (preciseCurrRatio + preciseAccRatio) / 100;
+        }
         VCParts.forEach(function (value) {
           if ((VC[value] === null || VC[value] === undefined) && VCRatio >= value / 100) {
             var _componentsLog$time;

package/dist/esm/vc/vc-observer/revisions/fy25_01.js

@@ -1,11 +1,15 @@
-import _createClass from "@babel/runtime/helpers/createClass";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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';
 import { FY24_01Classifier } from './fy24_01';
 export var FY25_01Classifier = /*#__PURE__*/function (_FY24_01Classifier) {
   function FY25_01Classifier() {
@@ -27,6 +31,31 @@ export var FY25_01Classifier = /*#__PURE__*/function (_FY24_01Classifier) {
     return _this;
   }
   _inherits(FY25_01Classifier, _FY24_01Classifier);
-  return _createClass(FY25_01Classifier);
+  return _createClass(FY25_01Classifier, [{
+    key: "filterComponentsLog",
+    value:
+    // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+    function filterComponentsLog(_ref2) {
+      var componentsLog = _ref2.componentsLog,
+        ttai = _ref2.ttai;
+      var _componentsLog = {};
+
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      if (fg('ufo-remove-vc-component-observations-after-ttai')) {
+        Object.entries(componentsLog).forEach(function (_ref3) {
+          var _ref4 = _slicedToArray(_ref3, 2),
+            _timestamp = _ref4[0],
+            value = _ref4[1];
+          var timestamp = Number(_timestamp);
+          if (ttai > timestamp) {
+            _componentsLog[timestamp] = value;
+          }
+        });
+      } else {
+        _componentsLog = _objectSpread({}, componentsLog);
+      }
+      return _componentsLog;
+    }
+  }]);
 }(FY24_01Classifier);
 export var revFY25_01Classifier = new FY25_01Classifier();

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

@@ -1,6 +1,6 @@
 import type { ComponentsLogType, MultiHeatmapPayload, VCEntryType, VCIgnoreReason, VCRatioType } from '../../../common/vc/types';
 import type { ObservedMutationType } from '../observers/types';
-import type { RevisionEntry, VCCalculationMethodType } from '../revisions/types';
+import type { FilterComponentsLogType, RevisionEntry, VCCalculationMethodType } from '../revisions/types';
 type Viewport = {
     w: number;
     h: number;
@@ -15,11 +15,13 @@ type HeatmapAttrs = {
     arraySize?: ArraySize;
     devToolsEnabled?: boolean;
 };
-type Heatmap = Uint32Array;
+type Heatmap = Int32Array;
 type ProcessDataArgs = {
     VCParts: number[];
     VCCalculationMethods: VCCalculationMethodType[];
     clean: boolean;
+    ttai: number;
+    filterComponentsLog: FilterComponentsLogType[];
     ssr?: number;
 };
 type PerRevision<T> = T[];
@@ -48,10 +50,10 @@ export declare class MultiRevisionHeatmap {
     constructor({ viewport, revisions, arraySize, devToolsEnabled }: HeatmapAttrs);
     handleUpdate({ time, type, classification, intersectionRect, element, targetName, ignoreReason, onError, }: HandleUpdateArgs): void;
     getData(): {
-        heatmaps: Uint32Array[];
+        heatmaps: Int32Array[];
     };
     getPayloadShapedData(args: ProcessDataArgs): MultiHeatmapPayload;
-    processData({ VCParts, VCCalculationMethods, ssr }: ProcessDataArgs): {
+    processData({ VCParts, VCCalculationMethods, filterComponentsLog, ttai, ssr, }: ProcessDataArgs): {
         VC: import("../revisions/types").VCType;
         VCBox: import("../revisions/types").VCBoxType;
         VCEntries: {

package/dist/types/vc/vc-observer/revisions/ViewportUpdateClassifier.d.ts

@@ -1,4 +1,4 @@
-import type { VCCalculationMethodArgs } from './types';
+import type { FilterComponentsLogArgs, VCCalculationMethodArgs } from './types';
 export type FilterArgs = {
     type: string;
     tags?: string[];
@@ -22,6 +22,7 @@ export declare class ViewportUpdateClassifier {
         VC: {};
         VCBox: {};
     };
+    filterComponentsLog({ componentsLog }: FilterComponentsLogArgs): import("../../../common/vc/types").ComponentsLogType;
     protected __combinedTypes: string[];
     protected __combinedFilters: Filter[];
     mergeConfig(): void;

package/dist/types/vc/vc-observer/revisions/fy25_01.d.ts

@@ -1,5 +1,7 @@
+import type { ComponentsLogType } from '../../../common/vc/types';
 import { FY24_01Classifier } from './fy24_01';
-import { type FilterArgs } from './ViewportUpdateClassifier';
+import type { FilterComponentsLogArgs } from './types';
+import type { FilterArgs } from './ViewportUpdateClassifier';
 export declare class FY25_01Classifier extends FY24_01Classifier {
     revision: string;
     types: string[];
@@ -8,6 +10,7 @@ export declare class FY25_01Classifier extends FY24_01Classifier {
         filter: ({ type, ignoreReason }: FilterArgs) => boolean;
     }[];
     removedFilters: never[];
+    filterComponentsLog({ componentsLog, ttai }: FilterComponentsLogArgs): ComponentsLogType;
     constructor();
 }
 export declare const revFY25_01Classifier: FY25_01Classifier;

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

@@ -21,3 +21,8 @@ export type VCCalculationMethodReturn = {
     VCBox: VCBoxType;
 };
 export type VCCalculationMethodType = (args: VCCalculationMethodArgs) => VCCalculationMethodReturn;
+export type FilterComponentsLogArgs = {
+    componentsLog: ComponentsLogType;
+    ttai: number;
+};
+export type FilterComponentsLogType = (args: FilterComponentsLogArgs) => ComponentsLogType;

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

@@ -1,6 +1,6 @@
 import type { ComponentsLogType, MultiHeatmapPayload, VCEntryType, VCIgnoreReason, VCRatioType } from '../../../common/vc/types';
 import type { ObservedMutationType } from '../observers/types';
-import type { RevisionEntry, VCCalculationMethodType } from '../revisions/types';
+import type { FilterComponentsLogType, RevisionEntry, VCCalculationMethodType } from '../revisions/types';
 type Viewport = {
     w: number;
     h: number;
@@ -15,11 +15,13 @@ type HeatmapAttrs = {
     arraySize?: ArraySize;
     devToolsEnabled?: boolean;
 };
-type Heatmap = Uint32Array;
+type Heatmap = Int32Array;
 type ProcessDataArgs = {
     VCParts: number[];
     VCCalculationMethods: VCCalculationMethodType[];
     clean: boolean;
+    ttai: number;
+    filterComponentsLog: FilterComponentsLogType[];
     ssr?: number;
 };
 type PerRevision<T> = T[];
@@ -48,10 +50,10 @@ export declare class MultiRevisionHeatmap {
     constructor({ viewport, revisions, arraySize, devToolsEnabled }: HeatmapAttrs);
     handleUpdate({ time, type, classification, intersectionRect, element, targetName, ignoreReason, onError, }: HandleUpdateArgs): void;
     getData(): {
-        heatmaps: Uint32Array[];
+        heatmaps: Int32Array[];
     };
     getPayloadShapedData(args: ProcessDataArgs): MultiHeatmapPayload;
-    processData({ VCParts, VCCalculationMethods, ssr }: ProcessDataArgs): {
+    processData({ VCParts, VCCalculationMethods, filterComponentsLog, ttai, ssr, }: ProcessDataArgs): {
         VC: import("../revisions/types").VCType;
         VCBox: import("../revisions/types").VCBoxType;
         VCEntries: {

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

@@ -1,4 +1,4 @@
-import type { VCCalculationMethodArgs } from './types';
+import type { FilterComponentsLogArgs, VCCalculationMethodArgs } from './types';
 export type FilterArgs = {
     type: string;
     tags?: string[];
@@ -22,6 +22,7 @@ export declare class ViewportUpdateClassifier {
         VC: {};
         VCBox: {};
     };
+    filterComponentsLog({ componentsLog }: FilterComponentsLogArgs): import("../../../common/vc/types").ComponentsLogType;
     protected __combinedTypes: string[];
     protected __combinedFilters: Filter[];
     mergeConfig(): void;

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

@@ -1,5 +1,7 @@
+import type { ComponentsLogType } from '../../../common/vc/types';
 import { FY24_01Classifier } from './fy24_01';
-import { type FilterArgs } from './ViewportUpdateClassifier';
+import type { FilterComponentsLogArgs } from './types';
+import type { FilterArgs } from './ViewportUpdateClassifier';
 export declare class FY25_01Classifier extends FY24_01Classifier {
     revision: string;
     types: string[];
@@ -8,6 +10,7 @@ export declare class FY25_01Classifier extends FY24_01Classifier {
         filter: ({ type, ignoreReason }: FilterArgs) => boolean;
     }[];
     removedFilters: never[];
+    filterComponentsLog({ componentsLog, ttai }: FilterComponentsLogArgs): ComponentsLogType;
     constructor();
 }
 export declare const revFY25_01Classifier: FY25_01Classifier;

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

@@ -21,3 +21,8 @@ export type VCCalculationMethodReturn = {
     VCBox: VCBoxType;
 };
 export type VCCalculationMethodType = (args: VCCalculationMethodArgs) => VCCalculationMethodReturn;
+export type FilterComponentsLogArgs = {
+    componentsLog: ComponentsLogType;
+    ttai: number;
+};
+export type FilterComponentsLogType = (args: FilterComponentsLogArgs) => ComponentsLogType;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "2.16.1",
+	"version": "3.1.0",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -74,7 +74,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/interaction-context": "^2.6.0",
+		"@atlaskit/interaction-context": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
@@ -83,7 +83,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+		"react": "^18.2.0"
 	},
 	"devDependencies": {
 		"@af/integration-testing": "*",
@@ -159,6 +159,9 @@
 		},
 		"ufo_chr_config": {
 			"type": "boolean"
+		},
+		"ufo_support_other_resource_type_js": {
+			"type": "boolean"
 		}
 	}
 }