npm - @atlaskit/react-ufo - Versions diffs - 4.7.5 → 4.8.0 - Mend

@atlaskit/react-ufo 4.7.5 → 4.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,19 @@
 # @atlaskit/ufo-interaction-ignore
+## 4.8.0
+### Minor Changes
+- [`fed39716487e7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fed39716487e7) -
+  calculate VCNext (TTVC v4) metric behind FG
+## 4.7.6
+### Patch Changes
+- [`71df791f80bf5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/71df791f80bf5) -
+  Remove TTVC debug data for post-interaction-log events
 ## 4.7.5
 ### Patch Changes

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

@@ -79,7 +79,7 @@ function _createInteractionExtraLogPayload() {
             var revision = _ref.revision;
             return revision === _config.DEFAULT_TTVC_REVISION;
           });
-          if (!(!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined)) {
+          if (!(!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined || typeof (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) !== 'number' || extraTTAI === undefined || typeof extraTTAI !== 'number' || interaction.errors.length > 0)) {
             _context.next = 23;
             break;
           }

package/dist/cjs/vc/index.js CHANGED Viewed

@@ -35,7 +35,7 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
     this.ssrPlaceholderHandler = new _ssrPlaceholders.SSRPlaceholderHandlers({
       enablePageLayoutPlaceholder: (_opts$ssrEnablePageLa = opts.ssrEnablePageLayoutPlaceholder) !== null && _opts$ssrEnablePageLa !== void 0 ? _opts$ssrEnablePageLa : false
     });
-    if ((0, _config.isVCRevisionEnabled)('fy25.03')) {
+    if ((0, _config.isVCRevisionEnabled)('fy25.03') || (0, _config.isVCRevisionEnabled)('next')) {
       var _opts$ssrEnablePageLa2;
       this.newVCObserver = new _vcObserverNew.default({
         selectorConfig: opts.selectorConfig,

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

@@ -19,6 +19,7 @@ var _getElementName2 = _interopRequireDefault(require("./get-element-name"));
 var _fy25_ = _interopRequireDefault(require("./metric-calculator/fy25_03"));
 var _getViewportHeight = _interopRequireDefault(require("./metric-calculator/utils/get-viewport-height"));
 var _getViewportWidth = _interopRequireDefault(require("./metric-calculator/utils/get-viewport-width"));
+var _vcnext = _interopRequireDefault(require("./metric-calculator/vcnext"));
 var _viewportObserver = _interopRequireDefault(require("./viewport-observer"));
 var _windowEventObserver = _interopRequireDefault(require("./window-event-observer"));
 var SSRState = {
@@ -237,7 +238,7 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
     key: "getVCResult",
     value: function () {
       var _getVCResult = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(param) {
-        var start, stop, interactionId, include3p, results, calculator_fy25_03, orderedEntries, fy25_03;
+        var start, stop, interactionId, include3p, results, calculator_fy25_03, orderedEntries, fy25_03, calculator_next, vcNext;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -266,8 +267,30 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
               if (fy25_03) {
                 results.push(fy25_03);
               }
+              // TODO on cleanup: put behind `enabledVCRevisions` config
+              if (!(0, _platformFeatureFlags.fg)('platform_ufo_vcnext_v4_enabled')) {
+                _context.next = 16;
+                break;
+              }
+              calculator_next = new _vcnext.default();
+              _context.next = 14;
+              return calculator_next.calculate({
+                orderedEntries: orderedEntries,
+                startTime: start,
+                stopTime: stop,
+                interactionId: interactionId,
+                isPostInteraction: this.isPostInteraction,
+                include3p: include3p
+              });
+            case 14:
+              vcNext = _context.sent;
+              if (vcNext) {
+                results.push(vcNext);
+              }
+            case 16:
               return _context.abrupt("return", results);
-            case 11:
+            case 17:
             case "end":
               return _context.stop();
           }

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

@@ -112,8 +112,8 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
     key: "calculateWithDebugInfo",
     value: function () {
       var _calculateWithDebugInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, allEntries, include3p) {
-        var _window, _window2, _window3, _window5;
-        var percentiles, viewportEntries, vcLogs, vcDetails, percentileIndex, entryDataBuffer, _iterator4, _step4, _entry3, time, viewportPercentage, entries, elementNames, previousResult, i, percentile, enhancedVcLogs, shouldCalculate3p, shouldCalculateDebugDetails, sortedVcLogs, maxViewportPercentageAtTime, maxSoFar, _iterator5, _step5, log, getBiggestPreviousViewportPercentage, ignoredEntriesByTime, _iterator6, _step6, _entry4, _ignoredEntriesByTime, _viewportData$rect, _viewportData$previou, viewportData, timestamp, additionalVcLogs, _iterator7, _step7, _step7$value, _timestamp, ignoredEntries, _viewportPercentage, v3RevisionDebugDetails, _activeInteractionId$, activeInteractionId, activeInteraction, pageVisibilityUpToTTAI, isBackgrounded, _window4, _window4$__ufo_devtoo, _window6, _window6$__on_ufo_vc_;
+        var _window, _window2, _window6, _window8;
+        var percentiles, viewportEntries, vcLogs, vcDetails, percentileIndex, entryDataBuffer, _iterator4, _step4, _entry3, time, viewportPercentage, entries, elementNames, previousResult, i, percentile, enhancedVcLogs, shouldCalculate3p, shouldCalculateDebugDetails, _window3, _window4, _window5, sortedVcLogs, maxViewportPercentageAtTime, maxSoFar, _iterator5, _step5, log, getBiggestPreviousViewportPercentage, ignoredEntriesByTime, _iterator6, _step6, _entry4, _ignoredEntriesByTime, _viewportData$rect, _viewportData$previou, viewportData, timestamp, additionalVcLogs, _iterator7, _step7, _step7$value, _timestamp, ignoredEntries, _viewportPercentage, v3RevisionDebugDetails, _activeInteractionId$, activeInteractionId, activeInteraction, pageVisibilityUpToTTAI, isBackgrounded, _window7, _window7$__ufo_devtoo, _window9, _window9$__on_ufo_vc_;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -217,6 +217,9 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
               }) : []; // If 3p metric enabled - calculate the debug details
               shouldCalculate3p = include3p && (0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p'); // Only calculate enhanced debug details if devtool callbacks exist
               shouldCalculateDebugDetails = (!isPostInteraction || shouldCalculate3p) && (typeof ((_window = window) === null || _window === void 0 ? void 0 : _window.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.__on_ufo_vc_debug_data_ready) === 'function');
+              if ((0, _platformFeatureFlags.fg)('platform_ufo_fix_post_interaction_check_vc_debug')) {
+                shouldCalculateDebugDetails = !isPostInteraction && (typeof ((_window3 = window) === null || _window3 === void 0 ? void 0 : _window3.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window4 = window) === null || _window4 === void 0 ? void 0 : _window4.__on_ufo_vc_debug_data_ready) === 'function' || typeof ((_window5 = window) === null || _window5 === void 0 ? void 0 : _window5.__ufo_devtool_vc_3p_debug_data) === 'function');
+              }
               if (shouldCalculateDebugDetails && allEntries && vcLogs) {
                 // Pre-sort vcLogs by time for efficient lookups
                 sortedVcLogs = (0, _toConsumableArray2.default)(vcLogs).sort(function (a, b) {
@@ -335,18 +338,18 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
               }
               // Handle devtool callback
-              if (v3RevisionDebugDetails && typeof ((_window3 = window) === null || _window3 === void 0 ? void 0 : _window3.__ufo_devtool_onVCRevisionReady__) === 'function' && !include3p) {
+              if (v3RevisionDebugDetails && typeof ((_window6 = window) === null || _window6 === void 0 ? void 0 : _window6.__ufo_devtool_onVCRevisionReady__) === 'function' && !include3p) {
                 try {
-                  (_window4 = window) === null || _window4 === void 0 || (_window4$__ufo_devtoo = _window4.__ufo_devtool_onVCRevisionReady__) === null || _window4$__ufo_devtoo === void 0 || _window4$__ufo_devtoo.call(_window4, v3RevisionDebugDetails);
+                  (_window7 = window) === null || _window7 === void 0 || (_window7$__ufo_devtoo = _window7.__ufo_devtool_onVCRevisionReady__) === null || _window7$__ufo_devtoo === void 0 || _window7$__ufo_devtoo.call(_window7, v3RevisionDebugDetails);
                 } catch (e) {
                   // if any error communicating with devtool, we don't want to break the app
                   // eslint-disable-next-line no-console
                   console.error('Error in onVCRevisionReady', e);
                 }
               }
-              if (v3RevisionDebugDetails && typeof ((_window5 = window) === null || _window5 === void 0 ? void 0 : _window5.__on_ufo_vc_debug_data_ready) === 'function' && !include3p) {
+              if (v3RevisionDebugDetails && typeof ((_window8 = window) === null || _window8 === void 0 ? void 0 : _window8.__on_ufo_vc_debug_data_ready) === 'function' && !include3p) {
                 try {
-                  (_window6 = window) === null || _window6 === void 0 || (_window6$__on_ufo_vc_ = _window6.__on_ufo_vc_debug_data_ready) === null || _window6$__on_ufo_vc_ === void 0 || _window6$__on_ufo_vc_.call(_window6, v3RevisionDebugDetails);
+                  (_window9 = window) === null || _window9 === void 0 || (_window9$__on_ufo_vc_ = _window9.__on_ufo_vc_debug_data_ready) === null || _window9$__on_ufo_vc_ === void 0 || _window9$__on_ufo_vc_.call(_window9, v3RevisionDebugDetails);
                 } catch (e) {
                   // eslint-disable-next-line no-console
                   console.error('Error in onVCRevisionReady', e);
@@ -362,7 +365,7 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
                 }
               }
               return _context.abrupt("return", vcDetails);
-            case 40:
+            case 41:
             case "end":
               return _context.stop();
           }

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

@@ -44,9 +44,9 @@ var THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES = exports.THIRD_PARTY_BROWSER_EXTEN
 // grammarly extensions
 'data-new-gr-c-s-loaded', 'data-gr-aaa-notch-connection-id', 'data-gr-aaa-loaded'];
 var VCCalculator_FY25_03 = exports.default = /*#__PURE__*/function (_AbstractVCCalculator) {
-  function VCCalculator_FY25_03() {
+  function VCCalculator_FY25_03(revisionNo) {
     (0, _classCallCheck2.default)(this, VCCalculator_FY25_03);
-    return _callSuper(this, VCCalculator_FY25_03, [REVISION_NO]);
+    return _callSuper(this, VCCalculator_FY25_03, [revisionNo !== null && revisionNo !== void 0 ? revisionNo : REVISION_NO]);
   }
   (0, _inherits2.default)(VCCalculator_FY25_03, _AbstractVCCalculator);
   return (0, _createClass2.default)(VCCalculator_FY25_03, [{

package/dist/cjs/vc/vc-observer-new/metric-calculator/vcnext/index.js ADDED Viewed

@@ -0,0 +1,41 @@
+"use strict";
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+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 _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _fy25_ = _interopRequireDefault(require("../fy25_03"));
+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; })(); }
+function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+// NOTE: `next` to be renamed `fy26.04` once stable
+var REVISION_NO = 'next';
+var getConsideredEntryTypes = function getConsideredEntryTypes() {
+  return ['mutation:display-contents-children-element'];
+};
+// NOTE: `VCNext` to be renamed `FY26_04` once stable
+var VCNextCalculator = exports.default = /*#__PURE__*/function (_VCCalculator_FY25_) {
+  function VCNextCalculator() {
+    (0, _classCallCheck2.default)(this, VCNextCalculator);
+    return _callSuper(this, VCNextCalculator, [REVISION_NO]);
+  }
+  (0, _inherits2.default)(VCNextCalculator, _VCCalculator_FY25_);
+  return (0, _createClass2.default)(VCNextCalculator, [{
+    key: "isEntryIncluded",
+    value: function isEntryIncluded(entry, include3p) {
+      var isEntryIncludedInV3 = _superPropGet(VCNextCalculator, "isEntryIncluded", this, 3)([entry, include3p]);
+      if (isEntryIncludedInV3) {
+        return true;
+      }
+      return getConsideredEntryTypes().includes(entry.data.type);
+    }
+  }]);
+}(_fy25_.default);

package/dist/cjs/vc/vc-observer-new/viewport-observer/index.js CHANGED Viewed

@@ -126,7 +126,7 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
               _iterator = _createForOfIteratorHelper(addedNodes);
               _context2.prev = 4;
               _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
-                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs5, _this$intersectionObs6, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs7, validTargets, _iterator2, _step2, _this$intersectionObs8, validTarget, _this$intersectionObs9;
+                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs5, _this$intersectionObs6, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs7, _window, _iterator2, _step2, child, _this$intersectionObs8, _this$intersectionObs9, validTargets, _iterator3, _step3, _this$intersectionObs0, validTarget, _this$intersectionObs1;
                 return _regenerator.default.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -238,25 +238,45 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                       (_this$intersectionObs7 = _this.intersectionObserver) === null || _this$intersectionObs7 === void 0 || _this$intersectionObs7.watchAndTag(addedNode, 'mutation:third-party-element');
                       return _context.abrupt("return", 0);
                     case 45:
-                      if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_resolution_ttvc_v3')) {
-                        // Check if the target has display:content css property, return array of valid targets
-                        validTargets = (0, _checkDisplayContent.default)(addedNode);
-                        _iterator2 = _createForOfIteratorHelper(validTargets);
-                        try {
-                          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                            validTarget = _step2.value;
-                            (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
+                      if ((0, _platformFeatureFlags.fg)('platform_ufo_vcnext_v4_enabled')) {
+                        if (((_window = window) === null || _window === void 0 || (_window = _window.getComputedStyle(addedNode)) === null || _window === void 0 ? void 0 : _window.display) === 'contents') {
+                          _iterator2 = _createForOfIteratorHelper(addedNode.children);
+                          try {
+                            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                              child = _step2.value;
+                              if (child instanceof HTMLElement) {
+                                (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(child, 'mutation:display-contents-children-element');
+                              }
+                            }
+                          } catch (err) {
+                            _iterator2.e(err);
+                          } finally {
+                            _iterator2.f();
                           }
-                        } catch (err) {
-                          _iterator2.e(err);
-                        } finally {
-                          _iterator2.f();
+                        } else {
+                          (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                         }
                       } else {
-                        if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_track_occurrence')) {
-                          (0, _trackDisplayContentOccurrence.default)(addedNode);
+                        if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_resolution_ttvc_v3')) {
+                          // Check if the target has display:content css property, return array of valid targets
+                          validTargets = (0, _checkDisplayContent.default)(addedNode);
+                          _iterator3 = _createForOfIteratorHelper(validTargets);
+                          try {
+                            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                              validTarget = _step3.value;
+                              (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
+                            }
+                          } catch (err) {
+                            _iterator3.e(err);
+                          } finally {
+                            _iterator3.f();
+                          }
+                        } else {
+                          if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_track_occurrence')) {
+                            (0, _trackDisplayContentOccurrence.default)(addedNode);
+                          }
+                          (_this$intersectionObs1 = _this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                         }
-                        (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                       }
                     case 46:
                     case "end":
@@ -303,12 +323,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
       };
     }());
     (0, _defineProperty2.default)(this, "handleAttributeMutation", function (_ref6) {
-      var _this$intersectionObs0;
+      var _this$intersectionObs10;
       var target = _ref6.target,
         attributeName = _ref6.attributeName,
         oldValue = _ref6.oldValue,
         newValue = _ref6.newValue;
-      (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(target, function (_ref7) {
+      (_this$intersectionObs10 = _this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.watchAndTag(target, function (_ref7) {
         var target = _ref7.target,
           rect = _ref7.rect;
         if ((0, _vcUtils.isContainedWithinMediaWrapper)(target)) {
@@ -386,11 +406,11 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "handleLayoutShift", function (_ref8) {
       var time = _ref8.time,
         changedRects = _ref8.changedRects;
-      var _iterator3 = _createForOfIteratorHelper(changedRects),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(changedRects),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var changedRect = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var changedRect = _step4.value;
           var target = changedRect.node;
           if (target) {
             _this.onChange({
@@ -404,9 +424,9 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
     });
     this.mapVisibleNodeRects = new WeakMap();
@@ -463,12 +483,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this$mutationObserve2, _this$intersectionObs1, _this$performanceObse2;
+      var _this$mutationObserve2, _this$intersectionObs11, _this$performanceObse2;
       if (!this.isStarted) {
         return;
       }
       (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 || _this$mutationObserve2.disconnect();
-      (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.disconnect();
+      (_this$intersectionObs11 = this.intersectionObserver) === null || _this$intersectionObs11 === void 0 || _this$intersectionObs11.disconnect();
       (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 || _this$performanceObse2.disconnect();
       this.isStarted = false;
       // Clean up caches when stopping

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

@@ -57,7 +57,7 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
   const effectiveVCRevisionPayload = vcRevisionPayload === null || vcRevisionPayload === void 0 ? void 0 : vcRevisionPayload.find(({
     revision
   }) => revision === DEFAULT_TTVC_REVISION);
-  if (!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined) {
+  if (!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined || typeof (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) !== 'number' || extraTTAI === undefined || typeof extraTTAI !== 'number' || interaction.errors.length > 0) {
     return null;
   }

package/dist/es2019/vc/index.js CHANGED Viewed

@@ -15,7 +15,7 @@ export class VCObserverWrapper {
     this.ssrPlaceholderHandler = new SSRPlaceholderHandlers({
       enablePageLayoutPlaceholder: (_opts$ssrEnablePageLa = opts.ssrEnablePageLayoutPlaceholder) !== null && _opts$ssrEnablePageLa !== void 0 ? _opts$ssrEnablePageLa : false
     });
-    if (isVCRevisionEnabled('fy25.03')) {
+    if (isVCRevisionEnabled('fy25.03') || isVCRevisionEnabled('next')) {
       var _opts$ssrEnablePageLa2;
       this.newVCObserver = new VCObserverNew({
         selectorConfig: opts.selectorConfig,

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

@@ -6,6 +6,7 @@ import getElementName from './get-element-name';
 import VCCalculator_FY25_03 from './metric-calculator/fy25_03';
 import getViewportHeight from './metric-calculator/utils/get-viewport-height';
 import getViewportWidth from './metric-calculator/utils/get-viewport-width';
+import VCNextCalculator from './metric-calculator/vcnext';
 import ViewportObserver from './viewport-observer';
 import WindowEventObserver from './window-event-observer';
 const SSRState = {
@@ -218,6 +219,22 @@ export default class VCObserverNew {
     if (fy25_03) {
       results.push(fy25_03);
     }
+    // TODO on cleanup: put behind `enabledVCRevisions` config
+    if (fg('platform_ufo_vcnext_v4_enabled')) {
+      const calculator_next = new VCNextCalculator();
+      const vcNext = await calculator_next.calculate({
+        orderedEntries,
+        startTime: start,
+        stopTime: stop,
+        interactionId,
+        isPostInteraction: this.isPostInteraction,
+        include3p
+      });
+      if (vcNext) {
+        results.push(vcNext);
+      }
+    }
     return results;
   }
   addStartEntry(startTime) {

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

@@ -56,7 +56,7 @@ export default class AbstractVCCalculatorBase {
     return labelStacks;
   }
   async calculateWithDebugInfo(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, allEntries, include3p) {
-    var _window, _window2, _window3, _window5;
+    var _window, _window2, _window6, _window8;
     const percentiles = [25, 50, 75, 80, 85, 90, 95, 98, 99, 100];
     const viewportEntries = this.filterViewportEntries(filteredEntries);
     const vcLogs = await calculateTTVCPercentilesWithDebugInfo({
@@ -135,7 +135,11 @@ export default class AbstractVCCalculatorBase {
     // If 3p metric enabled - calculate the debug details
     const shouldCalculate3p = include3p && fg('platform_ufo_enable_ttai_with_3p');
     // Only calculate enhanced debug details if devtool callbacks exist
-    const shouldCalculateDebugDetails = (!isPostInteraction || shouldCalculate3p) && (typeof ((_window = window) === null || _window === void 0 ? void 0 : _window.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.__on_ufo_vc_debug_data_ready) === 'function');
+    let shouldCalculateDebugDetails = (!isPostInteraction || shouldCalculate3p) && (typeof ((_window = window) === null || _window === void 0 ? void 0 : _window.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.__on_ufo_vc_debug_data_ready) === 'function');
+    if (fg('platform_ufo_fix_post_interaction_check_vc_debug')) {
+      var _window3, _window4, _window5;
+      shouldCalculateDebugDetails = !isPostInteraction && (typeof ((_window3 = window) === null || _window3 === void 0 ? void 0 : _window3.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window4 = window) === null || _window4 === void 0 ? void 0 : _window4.__on_ufo_vc_debug_data_ready) === 'function' || typeof ((_window5 = window) === null || _window5 === void 0 ? void 0 : _window5.__ufo_devtool_vc_3p_debug_data) === 'function');
+    }
     if (shouldCalculateDebugDetails && allEntries && vcLogs) {
       // Pre-sort vcLogs by time for efficient lookups
       const sortedVcLogs = [...vcLogs].sort((a, b) => a.time - b.time);
@@ -233,20 +237,20 @@ export default class AbstractVCCalculatorBase {
     }
     // Handle devtool callback
-    if (v3RevisionDebugDetails && typeof ((_window3 = window) === null || _window3 === void 0 ? void 0 : _window3.__ufo_devtool_onVCRevisionReady__) === 'function' && !include3p) {
+    if (v3RevisionDebugDetails && typeof ((_window6 = window) === null || _window6 === void 0 ? void 0 : _window6.__ufo_devtool_onVCRevisionReady__) === 'function' && !include3p) {
       try {
-        var _window4, _window4$__ufo_devtoo;
-        (_window4 = window) === null || _window4 === void 0 ? void 0 : (_window4$__ufo_devtoo = _window4.__ufo_devtool_onVCRevisionReady__) === null || _window4$__ufo_devtoo === void 0 ? void 0 : _window4$__ufo_devtoo.call(_window4, v3RevisionDebugDetails);
+        var _window7, _window7$__ufo_devtoo;
+        (_window7 = window) === null || _window7 === void 0 ? void 0 : (_window7$__ufo_devtoo = _window7.__ufo_devtool_onVCRevisionReady__) === null || _window7$__ufo_devtoo === void 0 ? void 0 : _window7$__ufo_devtoo.call(_window7, v3RevisionDebugDetails);
       } catch (e) {
         // if any error communicating with devtool, we don't want to break the app
         // eslint-disable-next-line no-console
         console.error('Error in onVCRevisionReady', e);
       }
     }
-    if (v3RevisionDebugDetails && typeof ((_window5 = window) === null || _window5 === void 0 ? void 0 : _window5.__on_ufo_vc_debug_data_ready) === 'function' && !include3p) {
+    if (v3RevisionDebugDetails && typeof ((_window8 = window) === null || _window8 === void 0 ? void 0 : _window8.__on_ufo_vc_debug_data_ready) === 'function' && !include3p) {
       try {
-        var _window6, _window6$__on_ufo_vc_;
-        (_window6 = window) === null || _window6 === void 0 ? void 0 : (_window6$__on_ufo_vc_ = _window6.__on_ufo_vc_debug_data_ready) === null || _window6$__on_ufo_vc_ === void 0 ? void 0 : _window6$__on_ufo_vc_.call(_window6, v3RevisionDebugDetails);
+        var _window9, _window9$__on_ufo_vc_;
+        (_window9 = window) === null || _window9 === void 0 ? void 0 : (_window9$__on_ufo_vc_ = _window9.__on_ufo_vc_debug_data_ready) === null || _window9$__on_ufo_vc_ === void 0 ? void 0 : _window9$__on_ufo_vc_.call(_window9, v3RevisionDebugDetails);
       } catch (e) {
         // eslint-disable-next-line no-console
         console.error('Error in onVCRevisionReady', e);

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

@@ -30,8 +30,8 @@ export const THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES = ['bis_skin_checked', 'cz
 // grammarly extensions
 'data-new-gr-c-s-loaded', 'data-gr-aaa-notch-connection-id', 'data-gr-aaa-loaded'];
 export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
-  constructor() {
-    super(REVISION_NO);
+  constructor(revisionNo) {
+    super(revisionNo !== null && revisionNo !== void 0 ? revisionNo : REVISION_NO);
   }
   isEntryIncluded(entry, include3p) {
     if (!getConsideredEntryTypes(include3p).includes(entry.data.type)) {

package/dist/es2019/vc/vc-observer-new/metric-calculator/vcnext/index.js ADDED Viewed

@@ -0,0 +1,21 @@
+import VCCalculator_FY25_03 from '../fy25_03';
+// NOTE: `next` to be renamed `fy26.04` once stable
+const REVISION_NO = 'next';
+const getConsideredEntryTypes = () => {
+  return ['mutation:display-contents-children-element'];
+};
+// NOTE: `VCNext` to be renamed `FY26_04` once stable
+export default class VCNextCalculator extends VCCalculator_FY25_03 {
+  constructor() {
+    super(REVISION_NO);
+  }
+  isEntryIncluded(entry, include3p) {
+    const isEntryIncludedInV3 = super.isEntryIncluded(entry, include3p);
+    if (isEntryIncludedInV3) {
+      return true;
+    }
+    return getConsideredEntryTypes().includes(entry.data.type);
+  }
+}

package/dist/es2019/vc/vc-observer-new/viewport-observer/index.js CHANGED Viewed

@@ -187,19 +187,34 @@ export default class ViewportObserver {
           (_this$intersectionObs7 = this.intersectionObserver) === null || _this$intersectionObs7 === void 0 ? void 0 : _this$intersectionObs7.watchAndTag(addedNode, 'mutation:third-party-element');
           continue;
         }
-        if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
-          // Check if the target has display:content css property, return array of valid targets
-          const validTargets = checkCssProperty(addedNode);
-          for (const validTarget of validTargets) {
-            var _this$intersectionObs8;
-            (_this$intersectionObs8 = this.intersectionObserver) === null || _this$intersectionObs8 === void 0 ? void 0 : _this$intersectionObs8.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
+        if (fg('platform_ufo_vcnext_v4_enabled')) {
+          var _window, _window$getComputedSt;
+          if (((_window = window) === null || _window === void 0 ? void 0 : (_window$getComputedSt = _window.getComputedStyle(addedNode)) === null || _window$getComputedSt === void 0 ? void 0 : _window$getComputedSt.display) === 'contents') {
+            for (const child of addedNode.children) {
+              if (child instanceof HTMLElement) {
+                var _this$intersectionObs8;
+                (_this$intersectionObs8 = this.intersectionObserver) === null || _this$intersectionObs8 === void 0 ? void 0 : _this$intersectionObs8.watchAndTag(child, 'mutation:display-contents-children-element');
+              }
+            }
+          } else {
+            var _this$intersectionObs9;
+            (_this$intersectionObs9 = this.intersectionObserver) === null || _this$intersectionObs9 === void 0 ? void 0 : _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
           }
         } else {
-          var _this$intersectionObs9;
-          if (fg('platform_ufo_display_content_track_occurrence')) {
-            trackDisplayContentsOccurrence(addedNode);
+          if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
+            // Check if the target has display:content css property, return array of valid targets
+            const validTargets = checkCssProperty(addedNode);
+            for (const validTarget of validTargets) {
+              var _this$intersectionObs0;
+              (_this$intersectionObs0 = this.intersectionObserver) === null || _this$intersectionObs0 === void 0 ? void 0 : _this$intersectionObs0.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
+            }
+          } else {
+            var _this$intersectionObs1;
+            if (fg('platform_ufo_display_content_track_occurrence')) {
+              trackDisplayContentsOccurrence(addedNode);
+            }
+            (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 ? void 0 : _this$intersectionObs1.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
           }
-          (_this$intersectionObs9 = this.intersectionObserver) === null || _this$intersectionObs9 === void 0 ? void 0 : _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
         }
       }
     });
@@ -209,8 +224,8 @@ export default class ViewportObserver {
       oldValue,
       newValue
     }) => {
-      var _this$intersectionObs0;
-      (_this$intersectionObs0 = this.intersectionObserver) === null || _this$intersectionObs0 === void 0 ? void 0 : _this$intersectionObs0.watchAndTag(target, ({
+      var _this$intersectionObs10;
+      (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 ? void 0 : _this$intersectionObs10.watchAndTag(target, ({
         target,
         rect
       }) => {
@@ -352,12 +367,12 @@ export default class ViewportObserver {
     this.isStarted = true;
   }
   stop() {
-    var _this$mutationObserve2, _this$intersectionObs1, _this$performanceObse2;
+    var _this$mutationObserve2, _this$intersectionObs11, _this$performanceObse2;
     if (!this.isStarted) {
       return;
     }
     (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 ? void 0 : _this$mutationObserve2.disconnect();
-    (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 ? void 0 : _this$intersectionObs1.disconnect();
+    (_this$intersectionObs11 = this.intersectionObserver) === null || _this$intersectionObs11 === void 0 ? void 0 : _this$intersectionObs11.disconnect();
     (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 ? void 0 : _this$performanceObse2.disconnect();
     this.isStarted = false;
     // Clean up caches when stopping

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

@@ -72,7 +72,7 @@ function _createInteractionExtraLogPayload() {
             var revision = _ref.revision;
             return revision === DEFAULT_TTVC_REVISION;
           });
-          if (!(!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined)) {
+          if (!(!(effectiveVCRevisionPayload !== null && effectiveVCRevisionPayload !== void 0 && effectiveVCRevisionPayload.clean) || (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) === undefined || typeof (effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90']) !== 'number' || extraTTAI === undefined || typeof extraTTAI !== 'number' || interaction.errors.length > 0)) {
             _context.next = 23;
             break;
           }

package/dist/esm/vc/index.js CHANGED Viewed

@@ -25,7 +25,7 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
     this.ssrPlaceholderHandler = new SSRPlaceholderHandlers({
       enablePageLayoutPlaceholder: (_opts$ssrEnablePageLa = opts.ssrEnablePageLayoutPlaceholder) !== null && _opts$ssrEnablePageLa !== void 0 ? _opts$ssrEnablePageLa : false
     });
-    if (isVCRevisionEnabled('fy25.03')) {
+    if (isVCRevisionEnabled('fy25.03') || isVCRevisionEnabled('next')) {
       var _opts$ssrEnablePageLa2;
       this.newVCObserver = new VCObserverNew({
         selectorConfig: opts.selectorConfig,

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

@@ -12,6 +12,7 @@ import _getElementName from './get-element-name';
 import VCCalculator_FY25_03 from './metric-calculator/fy25_03';
 import getViewportHeight from './metric-calculator/utils/get-viewport-height';
 import getViewportWidth from './metric-calculator/utils/get-viewport-width';
+import VCNextCalculator from './metric-calculator/vcnext';
 import ViewportObserver from './viewport-observer';
 import WindowEventObserver from './window-event-observer';
 var SSRState = {
@@ -230,7 +231,7 @@ var VCObserverNew = /*#__PURE__*/function () {
     key: "getVCResult",
     value: function () {
       var _getVCResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
-        var start, stop, interactionId, include3p, results, calculator_fy25_03, orderedEntries, fy25_03;
+        var start, stop, interactionId, include3p, results, calculator_fy25_03, orderedEntries, fy25_03, calculator_next, vcNext;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -259,8 +260,30 @@ var VCObserverNew = /*#__PURE__*/function () {
               if (fy25_03) {
                 results.push(fy25_03);
               }
+              // TODO on cleanup: put behind `enabledVCRevisions` config
+              if (!fg('platform_ufo_vcnext_v4_enabled')) {
+                _context.next = 16;
+                break;
+              }
+              calculator_next = new VCNextCalculator();
+              _context.next = 14;
+              return calculator_next.calculate({
+                orderedEntries: orderedEntries,
+                startTime: start,
+                stopTime: stop,
+                interactionId: interactionId,
+                isPostInteraction: this.isPostInteraction,
+                include3p: include3p
+              });
+            case 14:
+              vcNext = _context.sent;
+              if (vcNext) {
+                results.push(vcNext);
+              }
+            case 16:
               return _context.abrupt("return", results);
-            case 11:
+            case 17:
             case "end":
               return _context.stop();
           }

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

@@ -106,8 +106,8 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
     key: "calculateWithDebugInfo",
     value: function () {
       var _calculateWithDebugInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(filteredEntries, startTime, stopTime, isPostInteraction, isVCClean, interactionId, dirtyReason, allEntries, include3p) {
-        var _window, _window2, _window3, _window5;
-        var percentiles, viewportEntries, vcLogs, vcDetails, percentileIndex, entryDataBuffer, _iterator4, _step4, _entry3, time, viewportPercentage, entries, elementNames, previousResult, i, percentile, enhancedVcLogs, shouldCalculate3p, shouldCalculateDebugDetails, sortedVcLogs, maxViewportPercentageAtTime, maxSoFar, _iterator5, _step5, log, getBiggestPreviousViewportPercentage, ignoredEntriesByTime, _iterator6, _step6, _entry4, _ignoredEntriesByTime, _viewportData$rect, _viewportData$previou, viewportData, timestamp, additionalVcLogs, _iterator7, _step7, _step7$value, _timestamp, ignoredEntries, _viewportPercentage, v3RevisionDebugDetails, _activeInteractionId$, activeInteractionId, activeInteraction, pageVisibilityUpToTTAI, isBackgrounded, _window4, _window4$__ufo_devtoo, _window6, _window6$__on_ufo_vc_;
+        var _window, _window2, _window6, _window8;
+        var percentiles, viewportEntries, vcLogs, vcDetails, percentileIndex, entryDataBuffer, _iterator4, _step4, _entry3, time, viewportPercentage, entries, elementNames, previousResult, i, percentile, enhancedVcLogs, shouldCalculate3p, shouldCalculateDebugDetails, _window3, _window4, _window5, sortedVcLogs, maxViewportPercentageAtTime, maxSoFar, _iterator5, _step5, log, getBiggestPreviousViewportPercentage, ignoredEntriesByTime, _iterator6, _step6, _entry4, _ignoredEntriesByTime, _viewportData$rect, _viewportData$previou, viewportData, timestamp, additionalVcLogs, _iterator7, _step7, _step7$value, _timestamp, ignoredEntries, _viewportPercentage, v3RevisionDebugDetails, _activeInteractionId$, activeInteractionId, activeInteraction, pageVisibilityUpToTTAI, isBackgrounded, _window7, _window7$__ufo_devtoo, _window9, _window9$__on_ufo_vc_;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -211,6 +211,9 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
               }) : []; // If 3p metric enabled - calculate the debug details
               shouldCalculate3p = include3p && fg('platform_ufo_enable_ttai_with_3p'); // Only calculate enhanced debug details if devtool callbacks exist
               shouldCalculateDebugDetails = (!isPostInteraction || shouldCalculate3p) && (typeof ((_window = window) === null || _window === void 0 ? void 0 : _window.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.__on_ufo_vc_debug_data_ready) === 'function');
+              if (fg('platform_ufo_fix_post_interaction_check_vc_debug')) {
+                shouldCalculateDebugDetails = !isPostInteraction && (typeof ((_window3 = window) === null || _window3 === void 0 ? void 0 : _window3.__ufo_devtool_onVCRevisionReady__) === 'function' || typeof ((_window4 = window) === null || _window4 === void 0 ? void 0 : _window4.__on_ufo_vc_debug_data_ready) === 'function' || typeof ((_window5 = window) === null || _window5 === void 0 ? void 0 : _window5.__ufo_devtool_vc_3p_debug_data) === 'function');
+              }
               if (shouldCalculateDebugDetails && allEntries && vcLogs) {
                 // Pre-sort vcLogs by time for efficient lookups
                 sortedVcLogs = _toConsumableArray(vcLogs).sort(function (a, b) {
@@ -329,18 +332,18 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
               }
               // Handle devtool callback
-              if (v3RevisionDebugDetails && typeof ((_window3 = window) === null || _window3 === void 0 ? void 0 : _window3.__ufo_devtool_onVCRevisionReady__) === 'function' && !include3p) {
+              if (v3RevisionDebugDetails && typeof ((_window6 = window) === null || _window6 === void 0 ? void 0 : _window6.__ufo_devtool_onVCRevisionReady__) === 'function' && !include3p) {
                 try {
-                  (_window4 = window) === null || _window4 === void 0 || (_window4$__ufo_devtoo = _window4.__ufo_devtool_onVCRevisionReady__) === null || _window4$__ufo_devtoo === void 0 || _window4$__ufo_devtoo.call(_window4, v3RevisionDebugDetails);
+                  (_window7 = window) === null || _window7 === void 0 || (_window7$__ufo_devtoo = _window7.__ufo_devtool_onVCRevisionReady__) === null || _window7$__ufo_devtoo === void 0 || _window7$__ufo_devtoo.call(_window7, v3RevisionDebugDetails);
                 } catch (e) {
                   // if any error communicating with devtool, we don't want to break the app
                   // eslint-disable-next-line no-console
                   console.error('Error in onVCRevisionReady', e);
                 }
               }
-              if (v3RevisionDebugDetails && typeof ((_window5 = window) === null || _window5 === void 0 ? void 0 : _window5.__on_ufo_vc_debug_data_ready) === 'function' && !include3p) {
+              if (v3RevisionDebugDetails && typeof ((_window8 = window) === null || _window8 === void 0 ? void 0 : _window8.__on_ufo_vc_debug_data_ready) === 'function' && !include3p) {
                 try {
-                  (_window6 = window) === null || _window6 === void 0 || (_window6$__on_ufo_vc_ = _window6.__on_ufo_vc_debug_data_ready) === null || _window6$__on_ufo_vc_ === void 0 || _window6$__on_ufo_vc_.call(_window6, v3RevisionDebugDetails);
+                  (_window9 = window) === null || _window9 === void 0 || (_window9$__on_ufo_vc_ = _window9.__on_ufo_vc_debug_data_ready) === null || _window9$__on_ufo_vc_ === void 0 || _window9$__on_ufo_vc_.call(_window9, v3RevisionDebugDetails);
                 } catch (e) {
                   // eslint-disable-next-line no-console
                   console.error('Error in onVCRevisionReady', e);
@@ -356,7 +359,7 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
                 }
               }
               return _context.abrupt("return", vcDetails);
-            case 40:
+            case 41:
             case "end":
               return _context.stop();
           }

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

@@ -37,9 +37,9 @@ export var THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES = ['bis_skin_checked', 'cz-s
 // grammarly extensions
 'data-new-gr-c-s-loaded', 'data-gr-aaa-notch-connection-id', 'data-gr-aaa-loaded'];
 var VCCalculator_FY25_03 = /*#__PURE__*/function (_AbstractVCCalculator) {
-  function VCCalculator_FY25_03() {
+  function VCCalculator_FY25_03(revisionNo) {
     _classCallCheck(this, VCCalculator_FY25_03);
-    return _callSuper(this, VCCalculator_FY25_03, [REVISION_NO]);
+    return _callSuper(this, VCCalculator_FY25_03, [revisionNo !== null && revisionNo !== void 0 ? revisionNo : REVISION_NO]);
   }
   _inherits(VCCalculator_FY25_03, _AbstractVCCalculator);
   return _createClass(VCCalculator_FY25_03, [{

package/dist/esm/vc/vc-observer-new/metric-calculator/vcnext/index.js ADDED Viewed

@@ -0,0 +1,36 @@
+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 _get from "@babel/runtime/helpers/get";
+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; })(); }
+function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+import VCCalculator_FY25_03 from '../fy25_03';
+// NOTE: `next` to be renamed `fy26.04` once stable
+var REVISION_NO = 'next';
+var getConsideredEntryTypes = function getConsideredEntryTypes() {
+  return ['mutation:display-contents-children-element'];
+};
+// NOTE: `VCNext` to be renamed `FY26_04` once stable
+var VCNextCalculator = /*#__PURE__*/function (_VCCalculator_FY25_) {
+  function VCNextCalculator() {
+    _classCallCheck(this, VCNextCalculator);
+    return _callSuper(this, VCNextCalculator, [REVISION_NO]);
+  }
+  _inherits(VCNextCalculator, _VCCalculator_FY25_);
+  return _createClass(VCNextCalculator, [{
+    key: "isEntryIncluded",
+    value: function isEntryIncluded(entry, include3p) {
+      var isEntryIncludedInV3 = _superPropGet(VCNextCalculator, "isEntryIncluded", this, 3)([entry, include3p]);
+      if (isEntryIncludedInV3) {
+        return true;
+      }
+      return getConsideredEntryTypes().includes(entry.data.type);
+    }
+  }]);
+}(VCCalculator_FY25_03);
+export { VCNextCalculator as default };

package/dist/esm/vc/vc-observer-new/viewport-observer/index.js CHANGED Viewed

@@ -117,7 +117,7 @@ var ViewportObserver = /*#__PURE__*/function () {
               _iterator = _createForOfIteratorHelper(addedNodes);
               _context2.prev = 4;
               _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs5, _this$intersectionObs6, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs7, validTargets, _iterator2, _step2, _this$intersectionObs8, validTarget, _this$intersectionObs9;
+                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs5, _this$intersectionObs6, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs7, _window, _iterator2, _step2, child, _this$intersectionObs8, _this$intersectionObs9, validTargets, _iterator3, _step3, _this$intersectionObs0, validTarget, _this$intersectionObs1;
                 return _regeneratorRuntime.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -229,25 +229,45 @@ var ViewportObserver = /*#__PURE__*/function () {
                       (_this$intersectionObs7 = _this.intersectionObserver) === null || _this$intersectionObs7 === void 0 || _this$intersectionObs7.watchAndTag(addedNode, 'mutation:third-party-element');
                       return _context.abrupt("return", 0);
                     case 45:
-                      if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
-                        // Check if the target has display:content css property, return array of valid targets
-                        validTargets = checkCssProperty(addedNode);
-                        _iterator2 = _createForOfIteratorHelper(validTargets);
-                        try {
-                          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                            validTarget = _step2.value;
-                            (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
+                      if (fg('platform_ufo_vcnext_v4_enabled')) {
+                        if (((_window = window) === null || _window === void 0 || (_window = _window.getComputedStyle(addedNode)) === null || _window === void 0 ? void 0 : _window.display) === 'contents') {
+                          _iterator2 = _createForOfIteratorHelper(addedNode.children);
+                          try {
+                            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                              child = _step2.value;
+                              if (child instanceof HTMLElement) {
+                                (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(child, 'mutation:display-contents-children-element');
+                              }
+                            }
+                          } catch (err) {
+                            _iterator2.e(err);
+                          } finally {
+                            _iterator2.f();
                           }
-                        } catch (err) {
-                          _iterator2.e(err);
-                        } finally {
-                          _iterator2.f();
+                        } else {
+                          (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                         }
                       } else {
-                        if (fg('platform_ufo_display_content_track_occurrence')) {
-                          trackDisplayContentsOccurrence(addedNode);
+                        if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
+                          // Check if the target has display:content css property, return array of valid targets
+                          validTargets = checkCssProperty(addedNode);
+                          _iterator3 = _createForOfIteratorHelper(validTargets);
+                          try {
+                            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                              validTarget = _step3.value;
+                              (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
+                            }
+                          } catch (err) {
+                            _iterator3.e(err);
+                          } finally {
+                            _iterator3.f();
+                          }
+                        } else {
+                          if (fg('platform_ufo_display_content_track_occurrence')) {
+                            trackDisplayContentsOccurrence(addedNode);
+                          }
+                          (_this$intersectionObs1 = _this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                         }
-                        (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                       }
                     case 46:
                     case "end":
@@ -294,12 +314,12 @@ var ViewportObserver = /*#__PURE__*/function () {
       };
     }());
     _defineProperty(this, "handleAttributeMutation", function (_ref6) {
-      var _this$intersectionObs0;
+      var _this$intersectionObs10;
       var target = _ref6.target,
         attributeName = _ref6.attributeName,
         oldValue = _ref6.oldValue,
         newValue = _ref6.newValue;
-      (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(target, function (_ref7) {
+      (_this$intersectionObs10 = _this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.watchAndTag(target, function (_ref7) {
         var target = _ref7.target,
           rect = _ref7.rect;
         if (isContainedWithinMediaWrapper(target)) {
@@ -377,11 +397,11 @@ var ViewportObserver = /*#__PURE__*/function () {
     _defineProperty(this, "handleLayoutShift", function (_ref8) {
       var time = _ref8.time,
         changedRects = _ref8.changedRects;
-      var _iterator3 = _createForOfIteratorHelper(changedRects),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(changedRects),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var changedRect = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var changedRect = _step4.value;
           var target = changedRect.node;
           if (target) {
             _this.onChange({
@@ -395,9 +415,9 @@ var ViewportObserver = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
     });
     this.mapVisibleNodeRects = new WeakMap();
@@ -454,12 +474,12 @@ var ViewportObserver = /*#__PURE__*/function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this$mutationObserve2, _this$intersectionObs1, _this$performanceObse2;
+      var _this$mutationObserve2, _this$intersectionObs11, _this$performanceObse2;
       if (!this.isStarted) {
         return;
       }
       (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 || _this$mutationObserve2.disconnect();
-      (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.disconnect();
+      (_this$intersectionObs11 = this.intersectionObserver) === null || _this$intersectionObs11 === void 0 || _this$intersectionObs11.disconnect();
       (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 || _this$performanceObse2.disconnect();
       this.isStarted = false;
       // Clean up caches when stopping

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

@@ -35,7 +35,7 @@ type SegmentThreshold = {
 type Rates = {
     readonly [key: string]: number;
 };
-export type TTVCRevision = 'fy25.01' | 'fy25.02' | 'fy25.03';
+export type TTVCRevision = 'fy25.01' | 'fy25.02' | 'fy25.03' | 'next';
 export declare const DEFAULT_TTVC_REVISION = "fy25.03";
 export declare const UNKNOWN_INTERACTION_RATE = 1000;
 export type ReactHydrationStats = {

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

@@ -91,7 +91,7 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
                 abortedByInteractionName: string | undefined;
                 end: number;
                 start: number;
-                'metric:ttai:3p': number | undefined;
+                'metric:ttai:3p': number;
             };
             'vc:effective:revision': string;
         };

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

@@ -4,7 +4,7 @@ export declare const KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS: string[
 export declare const NON_VISUAL_ARIA_ATTRIBUTES: string[];
 export declare const THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES: string[];
 export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
-    constructor();
+    constructor(revisionNo?: string);
     protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean): boolean;
     protected getVCCleanStatus(filteredEntries: readonly VCObserverEntry[]): {
         isVCClean: boolean;

package/dist/types/vc/vc-observer-new/metric-calculator/vcnext/index.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import type { VCObserverEntry } from '../../types';
+import VCCalculator_FY25_03 from '../fy25_03';
+export default class VCNextCalculator extends VCCalculator_FY25_03 {
+    constructor();
+    protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean): boolean;
+}

package/dist/types/vc/vc-observer-new/types.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ObservedWindowEvent } from './window-event-observer';
-export type VCObserverEntryType = 'mutation:child-element' | 'mutation:remount' | 'mutation:element' | 'mutation:element-replacement' | 'mutation:attribute:no-layout-shift' | 'mutation:attribute:non-visual-style' | 'mutation:attribute' | 'mutation:media' | 'mutation:rll-placeholder' | 'mutation:third-party-element' | 'mutation:ssr-placeholder' | 'layout-shift' | 'window:event' | 'ssr-hydration' | 'unknown';
+export type VCObserverEntryType = 'mutation:child-element' | 'mutation:remount' | 'mutation:element' | 'mutation:element-replacement' | 'mutation:display-contents-children-element' | 'mutation:attribute:no-layout-shift' | 'mutation:attribute:non-visual-style' | 'mutation:attribute' | 'mutation:media' | 'mutation:rll-placeholder' | 'mutation:third-party-element' | 'mutation:ssr-placeholder' | 'layout-shift' | 'window:event' | 'ssr-hydration' | 'unknown';
 export type ViewportEntryData = {
     readonly type: VCObserverEntryType;
     readonly elementName: string;

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

@@ -35,7 +35,7 @@ type SegmentThreshold = {
 type Rates = {
     readonly [key: string]: number;
 };
-export type TTVCRevision = 'fy25.01' | 'fy25.02' | 'fy25.03';
+export type TTVCRevision = 'fy25.01' | 'fy25.02' | 'fy25.03' | 'next';
 export declare const DEFAULT_TTVC_REVISION = "fy25.03";
 export declare const UNKNOWN_INTERACTION_RATE = 1000;
 export type ReactHydrationStats = {

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

@@ -91,7 +91,7 @@ declare function createInteractionExtraLogPayload(interactionId: string, interac
                 abortedByInteractionName: string | undefined;
                 end: number;
                 start: number;
-                'metric:ttai:3p': number | undefined;
+                'metric:ttai:3p': number;
             };
             'vc:effective:revision': string;
         };

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

@@ -4,7 +4,7 @@ export declare const KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS: string[
 export declare const NON_VISUAL_ARIA_ATTRIBUTES: string[];
 export declare const THIRD_PARTY_BROWSER_EXTENSION_ATTRIBUTES: string[];
 export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
-    constructor();
+    constructor(revisionNo?: string);
     protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean): boolean;
     protected getVCCleanStatus(filteredEntries: readonly VCObserverEntry[]): {
         isVCClean: boolean;

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

@@ -0,0 +1,6 @@
+import type { VCObserverEntry } from '../../types';
+import VCCalculator_FY25_03 from '../fy25_03';
+export default class VCNextCalculator extends VCCalculator_FY25_03 {
+    constructor();
+    protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean): boolean;
+}

package/dist/types-ts4.5/vc/vc-observer-new/types.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ObservedWindowEvent } from './window-event-observer';
-export type VCObserverEntryType = 'mutation:child-element' | 'mutation:remount' | 'mutation:element' | 'mutation:element-replacement' | 'mutation:attribute:no-layout-shift' | 'mutation:attribute:non-visual-style' | 'mutation:attribute' | 'mutation:media' | 'mutation:rll-placeholder' | 'mutation:third-party-element' | 'mutation:ssr-placeholder' | 'layout-shift' | 'window:event' | 'ssr-hydration' | 'unknown';
+export type VCObserverEntryType = 'mutation:child-element' | 'mutation:remount' | 'mutation:element' | 'mutation:element-replacement' | 'mutation:display-contents-children-element' | 'mutation:attribute:no-layout-shift' | 'mutation:attribute:non-visual-style' | 'mutation:attribute' | 'mutation:media' | 'mutation:rll-placeholder' | 'mutation:third-party-element' | 'mutation:ssr-placeholder' | 'layout-shift' | 'window:event' | 'ssr-hydration' | 'unknown';
 export type ViewportEntryData = {
     readonly type: VCObserverEntryType;
     readonly elementName: string;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.7.5",
+	"version": "4.8.0",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -84,6 +84,9 @@
 		"platform_ufo_canvas_heatmap_full_precision": {
 			"type": "boolean"
 		},
+		"platform_ufo_vcnext_v4_enabled": {
+			"type": "boolean"
+		},
 		"platform_ufo_enable_minor_interactions": {
 			"type": "boolean"
 		},
@@ -108,6 +111,9 @@
 		"platform_ufo_enable_timeout_config": {
 			"type": "boolean"
 		},
+		"platform_ufo_fix_post_interaction_check_vc_debug": {
+			"type": "boolean"
+		},
 		"platform_ufo_critical_metrics_payload": {
 			"type": "boolean"
 		},