@atlaskit/react-ufo 3.13.1 → 3.13.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 3.13.3
+
+### Patch Changes
+
+- [#159817](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159817)
+  [`b0c2c870bc291`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b0c2c870bc291) -
+  [HOT-117391] Ignore mutations from data-aui-version
+
+## 3.13.2
+
+### Patch Changes
+
+- [#159297](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159297)
+  [`9669e0bb8bda1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9669e0bb8bda1) -
+  Make VCObserverNew (TTVC v3) listens to abort events from ssr mark
+
 ## 3.13.1
 
 ### Patch Changes

package/dist/cjs/vc/index.js

@@ -35,7 +35,30 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
       this.oldVCObserver = new _vcObserver.VCObserver(opts);
     }
   }
+
+  // Helper method to process SSR abort listeners
   return (0, _createClass2.default)(VCObserverWrapper, [{
+    key: "processSsrAbortListeners",
+    value: function processSsrAbortListeners() {
+      var _window;
+      // Process any SSR abort listeners that remain
+      if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__) {
+        // Clean up any event listeners that may have been registered during SSR
+        // This is centralized here so only the wrapper handles unbinding, not individual observers
+        if (window.__SSR_ABORT_LISTENERS__.unbinds && Array.isArray(window.__SSR_ABORT_LISTENERS__.unbinds)) {
+          window.__SSR_ABORT_LISTENERS__.unbinds.forEach(function (unbind) {
+            if (typeof unbind === 'function') {
+              unbind();
+            }
+          });
+        }
+
+        // After all observers had a chance to process abort events,
+        // we can safely delete the SSR_ABORT_LISTENERS object
+        delete window.__SSR_ABORT_LISTENERS__;
+      }
+    }
+  }, {
     key: "start",
     value: function start(_ref) {
       var startTime = _ref.startTime,
@@ -52,6 +75,9 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
           startTime: startTime
         });
       }
+
+      // Clean up any remaining SSR abort listeners after all observers have been started
+      this.processSsrAbortListeners();
     }
   }, {
     key: "stop",

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

@@ -436,7 +436,6 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
       _this.detachAbortListeners();
       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],
@@ -445,8 +444,6 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
             _this.abortReasonCallback(key, time);
           }
         });
-        unbinds = unbinds.concat(window.__SSR_ABORT_LISTENERS__.unbinds);
-        (_window2 = window) === null || _window2 === void 0 || delete _window2.__SSR_ABORT_LISTENERS__;
       }
       _this.unbind = unbinds;
     });

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

@@ -7,9 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _entriesTimeline = _interopRequireDefault(require("./entries-timeline"));
 var _getElementName2 = _interopRequireDefault(require("./get-element-name"));
 var _fy25_ = _interopRequireDefault(require("./metric-calculator/fy25_03"));
@@ -79,9 +82,32 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
   return (0, _createClass2.default)(VCObserverNew, [{
     key: "start",
     value: function start(_ref2) {
-      var _this$viewportObserve, _this$windowEventObse;
+      var _this$viewportObserve,
+        _window,
+        _this2 = this,
+        _this$windowEventObse;
       var startTime = _ref2.startTime;
       (_this$viewportObserve = this.viewportObserver) === null || _this$viewportObserve === void 0 || _this$viewportObserve.start();
+      if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__ && (0, _platformFeatureFlags.fg)('platform_ufo_vc_observer_new_ssr_abort_listener')) {
+        var abortListeners = window.__SSR_ABORT_LISTENERS__;
+        var aborts = abortListeners.aborts;
+        if (aborts && (0, _typeof2.default)(aborts) === 'object') {
+          Object.entries(aborts).forEach(function (_ref3) {
+            var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+              key = _ref4[0],
+              time = _ref4[1];
+            if (typeof time === 'number') {
+              _this2.entriesTimeline.push({
+                time: time,
+                data: {
+                  type: 'window:event',
+                  eventType: key
+                }
+              });
+            }
+          });
+        }
+      }
       (_this$windowEventObse = this.windowEventObserver) === null || _this$windowEventObse === void 0 || _this$windowEventObse.start();
       this.entriesTimeline.clear();
     }

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

@@ -10,6 +10,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _abstractBaseVcCalculator = _interopRequireDefault(require("../abstract-base-vc-calculator"));
 var _isViewportEntryData = _interopRequireDefault(require("../utils/is-viewport-entry-data"));
 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)); }
@@ -40,6 +41,9 @@ var VCCalculator_FY25_03 = exports.default = /*#__PURE__*/function (_AbstractVCC
         if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
           return false;
         }
+        if (attributeName === 'data-aui-version' && (0, _platformFeatureFlags.fg)('platform_ufo_filter_out_aui_attribute_changes')) {
+          return false;
+        }
         return true;
       }
       if ((0, _isViewportEntryData.default)(entry.data) && !entry.data.visible) {

package/dist/es2019/vc/index.js

@@ -16,6 +16,27 @@ export class VCObserverWrapper {
       this.oldVCObserver = new VCObserver(opts);
     }
   }
+
+  // Helper method to process SSR abort listeners
+  processSsrAbortListeners() {
+    var _window;
+    // Process any SSR abort listeners that remain
+    if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__) {
+      // Clean up any event listeners that may have been registered during SSR
+      // This is centralized here so only the wrapper handles unbinding, not individual observers
+      if (window.__SSR_ABORT_LISTENERS__.unbinds && Array.isArray(window.__SSR_ABORT_LISTENERS__.unbinds)) {
+        window.__SSR_ABORT_LISTENERS__.unbinds.forEach(unbind => {
+          if (typeof unbind === 'function') {
+            unbind();
+          }
+        });
+      }
+
+      // After all observers had a chance to process abort events,
+      // we can safely delete the SSR_ABORT_LISTENERS object
+      delete window.__SSR_ABORT_LISTENERS__;
+    }
+  }
   start({
     startTime,
     experienceKey
@@ -32,6 +53,9 @@ export class VCObserverWrapper {
         startTime
       });
     }
+
+    // Clean up any remaining SSR abort listeners after all observers have been started
+    this.processSsrAbortListeners();
   }
   stop(experienceKey) {
     if (isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey)) {

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

@@ -468,14 +468,11 @@ export class VCObserver {
       this.detachAbortListeners();
       let 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(([key, time]) => {
           if (time) {
             this.abortReasonCallback(key, time);
           }
         });
-        unbinds = unbinds.concat(window.__SSR_ABORT_LISTENERS__.unbinds);
-        (_window2 = window) === null || _window2 === void 0 ? true : delete _window2.__SSR_ABORT_LISTENERS__;
       }
       this.unbind = unbinds;
     });

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

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { fg } from '@atlaskit/platform-feature-flags';
 import EntriesTimeline from './entries-timeline';
 import getElementName from './get-element-name';
 import VCCalculator_FY25_03 from './metric-calculator/fy25_03';
@@ -68,8 +69,25 @@ export default class VCObserverNew {
   start({
     startTime
   }) {
-    var _this$viewportObserve, _this$windowEventObse;
+    var _this$viewportObserve, _window, _this$windowEventObse;
     (_this$viewportObserve = this.viewportObserver) === null || _this$viewportObserve === void 0 ? void 0 : _this$viewportObserve.start();
+    if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__ && fg('platform_ufo_vc_observer_new_ssr_abort_listener')) {
+      const abortListeners = window.__SSR_ABORT_LISTENERS__;
+      const aborts = abortListeners.aborts;
+      if (aborts && typeof aborts === 'object') {
+        Object.entries(aborts).forEach(([key, time]) => {
+          if (typeof time === 'number') {
+            this.entriesTimeline.push({
+              time,
+              data: {
+                type: 'window:event',
+                eventType: key
+              }
+            });
+          }
+        });
+      }
+    }
     (_this$windowEventObse = this.windowEventObserver) === null || _this$windowEventObse === void 0 ? void 0 : _this$windowEventObse.start();
     this.entriesTimeline.clear();
   }

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

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import AbstractVCCalculatorBase from '../abstract-base-vc-calculator';
 import isViewportEntryData from '../utils/is-viewport-entry-data';
 const ABORTING_WINDOW_EVENT = ['wheel', 'scroll', 'keydown', 'resize'];
@@ -22,6 +23,9 @@ export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
       if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
         return false;
       }
+      if (attributeName === 'data-aui-version' && fg('platform_ufo_filter_out_aui_attribute_changes')) {
+        return false;
+      }
       return true;
     }
     if (isViewportEntryData(entry.data) && !entry.data.visible) {

package/dist/esm/vc/index.js

@@ -26,7 +26,30 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
       this.oldVCObserver = new VCObserver(opts);
     }
   }
+
+  // Helper method to process SSR abort listeners
   return _createClass(VCObserverWrapper, [{
+    key: "processSsrAbortListeners",
+    value: function processSsrAbortListeners() {
+      var _window;
+      // Process any SSR abort listeners that remain
+      if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__) {
+        // Clean up any event listeners that may have been registered during SSR
+        // This is centralized here so only the wrapper handles unbinding, not individual observers
+        if (window.__SSR_ABORT_LISTENERS__.unbinds && Array.isArray(window.__SSR_ABORT_LISTENERS__.unbinds)) {
+          window.__SSR_ABORT_LISTENERS__.unbinds.forEach(function (unbind) {
+            if (typeof unbind === 'function') {
+              unbind();
+            }
+          });
+        }
+
+        // After all observers had a chance to process abort events,
+        // we can safely delete the SSR_ABORT_LISTENERS object
+        delete window.__SSR_ABORT_LISTENERS__;
+      }
+    }
+  }, {
     key: "start",
     value: function start(_ref) {
       var startTime = _ref.startTime,
@@ -43,6 +66,9 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
           startTime: startTime
         });
       }
+
+      // Clean up any remaining SSR abort listeners after all observers have been started
+      this.processSsrAbortListeners();
     }
   }, {
     key: "stop",

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

@@ -429,7 +429,6 @@ export var VCObserver = /*#__PURE__*/function () {
       _this.detachAbortListeners();
       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],
@@ -438,8 +437,6 @@ export var VCObserver = /*#__PURE__*/function () {
             _this.abortReasonCallback(key, time);
           }
         });
-        unbinds = unbinds.concat(window.__SSR_ABORT_LISTENERS__.unbinds);
-        (_window2 = window) === null || _window2 === void 0 || delete _window2.__SSR_ABORT_LISTENERS__;
       }
       _this.unbind = unbinds;
     });

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

@@ -1,8 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { fg } from '@atlaskit/platform-feature-flags';
 import EntriesTimeline from './entries-timeline';
 import _getElementName from './get-element-name';
 import VCCalculator_FY25_03 from './metric-calculator/fy25_03';
@@ -72,9 +75,32 @@ var VCObserverNew = /*#__PURE__*/function () {
   return _createClass(VCObserverNew, [{
     key: "start",
     value: function start(_ref2) {
-      var _this$viewportObserve, _this$windowEventObse;
+      var _this$viewportObserve,
+        _window,
+        _this2 = this,
+        _this$windowEventObse;
       var startTime = _ref2.startTime;
       (_this$viewportObserve = this.viewportObserver) === null || _this$viewportObserve === void 0 || _this$viewportObserve.start();
+      if ((_window = window) !== null && _window !== void 0 && _window.__SSR_ABORT_LISTENERS__ && fg('platform_ufo_vc_observer_new_ssr_abort_listener')) {
+        var abortListeners = window.__SSR_ABORT_LISTENERS__;
+        var aborts = abortListeners.aborts;
+        if (aborts && _typeof(aborts) === 'object') {
+          Object.entries(aborts).forEach(function (_ref3) {
+            var _ref4 = _slicedToArray(_ref3, 2),
+              key = _ref4[0],
+              time = _ref4[1];
+            if (typeof time === 'number') {
+              _this2.entriesTimeline.push({
+                time: time,
+                data: {
+                  type: 'window:event',
+                  eventType: key
+                }
+              });
+            }
+          });
+        }
+      }
       (_this$windowEventObse = this.windowEventObserver) === null || _this$windowEventObse === void 0 || _this$windowEventObse.start();
       this.entriesTimeline.clear();
     }

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

@@ -5,6 +5,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 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 AbstractVCCalculatorBase from '../abstract-base-vc-calculator';
 import isViewportEntryData from '../utils/is-viewport-entry-data';
 var ABORTING_WINDOW_EVENT = ['wheel', 'scroll', 'keydown', 'resize'];
@@ -33,6 +34,9 @@ var VCCalculator_FY25_03 = /*#__PURE__*/function (_AbstractVCCalculator) {
         if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
           return false;
         }
+        if (attributeName === 'data-aui-version' && fg('platform_ufo_filter_out_aui_attribute_changes')) {
+          return false;
+        }
         return true;
       }
       if (isViewportEntryData(entry.data) && !entry.data.visible) {

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

@@ -7,6 +7,7 @@ export declare class VCObserverWrapper implements VCObserverInterface {
     private oldVCObserver;
     private newVCObserver;
     constructor(opts?: VCObserverOptions);
+    private processSsrAbortListeners;
     start({ startTime, experienceKey }: {
         startTime: number;
         experienceKey: string;

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

@@ -7,6 +7,7 @@ export declare class VCObserverWrapper implements VCObserverInterface {
     private oldVCObserver;
     private newVCObserver;
     constructor(opts?: VCObserverOptions);
+    private processSsrAbortListeners;
     start({ startTime, experienceKey }: {
         startTime: number;
         experienceKey: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "3.13.1",
+	"version": "3.13.3",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -162,6 +162,12 @@
 		},
 		"platform_ufo_ttvc_v3_devtool": {
 			"type": "boolean"
+		},
+		"platform_ufo_filter_out_aui_attribute_changes": {
+			"type": "boolean"
+		},
+		"platform_ufo_vc_observer_new_ssr_abort_listener": {
+			"type": "boolean"
 		}
 	}
 }