@atlaskit/react-ufo 4.5.5 → 4.5.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.5.7
+
+### Patch Changes
+
+- [`93b3a250fa490`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/93b3a250fa490) -
+  Remove analysis code and add track for display contents occurrence
+
+## 4.5.6
+
+### Patch Changes
+
+- [`ae5b58482107e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ae5b58482107e) -
+  Clean up fg React UFO
+
 ## 4.5.5
 
 ### Patch Changes

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

@@ -47,42 +47,29 @@ function _getVCMetrics() {
           }
           return _context.abrupt("return", {});
         case 4:
-          if (!(0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_press_interactions')) {
-            _context.next = 9;
-            break;
-          }
           if (!(interaction.type !== 'page_load' && interaction.type !== 'transition' && interaction.type !== 'press')) {
-            _context.next = 7;
-            break;
-          }
-          return _context.abrupt("return", {});
-        case 7:
-          _context.next = 11;
-          break;
-        case 9:
-          if (!(interaction.type !== 'page_load' && interaction.type !== 'transition')) {
-            _context.next = 11;
+            _context.next = 6;
             break;
           }
           return _context.abrupt("return", {});
-        case 11:
+        case 6:
           interactionStatus = (0, _getInteractionStatus.default)(interaction);
           pageVisibilityUpToTTAI = (0, _getPageVisibilityUpToTtai.default)(interaction);
           shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible'; // Use per-interaction VC observer if available, otherwise fall back to global
           observer = interaction.vcObserver;
           if (observer) {
-            _context.next = 17;
+            _context.next = 12;
             break;
           }
           return _context.abrupt("return", {});
-        case 17:
+        case 12:
           if (!(!shouldReportVCMetrics && (0, _platformFeatureFlags.fg)('platform_ufo_no_vc_on_aborted'))) {
-            _context.next = 20;
+            _context.next = 15;
             break;
           }
           observer.stop(interaction.ufoName);
           return _context.abrupt("return", {});
-        case 20:
+        case 15:
           isSSREnabled = interaction.type === 'page_load' && ((config === null || config === void 0 ? void 0 : config.ssr) || (config === null || config === void 0 || (_config$vc$ssrWhiteli = config.vc.ssrWhitelist) === null || _config$vc$ssrWhiteli === void 0 ? void 0 : _config$vc$ssrWhiteli.includes(interaction.ufoName)));
           ssr = interaction.type === 'page_load' && isSSREnabled ? {
             ssr: (0, _getSsrDoneTimeValue.default)(config)
@@ -90,7 +77,7 @@ function _getVCMetrics() {
           _interactionMetrics.postInteractionLog.setVCObserverSSRConfig(ssr);
           tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
           prefix = 'ufo';
-          _context.next = 27;
+          _context.next = 22;
           return observer.getVCResult(_objectSpread(_objectSpread({
             start: interaction.start,
             stop: interaction.end,
@@ -105,7 +92,7 @@ function _getVCMetrics() {
           }, ssr), {}, {
             include3p: include3p
           }));
-        case 27:
+        case 22:
           result = _context.sent;
           observer.stop(interaction.ufoName);
           if (!include3p) {
@@ -118,15 +105,15 @@ function _getVCMetrics() {
             return revision === mostRecentVCRevision;
           });
           if (!(!shouldReportVCMetrics || !(mostRecentVCRevisionPayload !== null && mostRecentVCRevisionPayload !== void 0 && mostRecentVCRevisionPayload.clean))) {
-            _context.next = 34;
+            _context.next = 29;
             break;
           }
           return _context.abrupt("return", result);
-        case 34:
+        case 29:
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': mostRecentVCRevisionPayload['metric:vc90']
           }));
-        case 35:
+        case 30:
         case "end":
           return _context.stop();
       }

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

@@ -60,6 +60,7 @@ var _experienceTraceIdContext = require("../experience-trace-id-context");
 var _featureFlagsAccessed = require("../feature-flags-accessed");
 var _interactionIdContext = require("../interaction-id-context");
 var _vc = require("../vc");
+var _trackDisplayContentOccurrence = require("../vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence");
 var _constants = require("./common/constants");
 var _interactionExtraMetrics = _interopRequireDefault(require("./interaction-extra-metrics"));
 var _postInteractionLog = _interopRequireDefault(require("./post-interaction-log"));
@@ -1017,6 +1018,7 @@ function addOnCancelCallback(id, cancelCallback) {
 }
 function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelStack, routeName) {
   var trace = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
+  (0, _trackDisplayContentOccurrence.resetCssIssueOccurrence)();
   postInteractionLog.reset();
   var vcObserver;
   var previousTime = startTime;
@@ -1155,7 +1157,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
       }, interactionId);
     }
   }
-  if (type === 'press' && (0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_press_interactions')) {
+  if (type === 'press') {
     // Use per-interaction VC observer if available, otherwise fall back to global
     var _observer = vcObserver;
     if (_observer) {

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

@@ -13,7 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _checkDisplayContent = require("../viewport-observer/utils/check-display-content");
+var _trackDisplayContentOccurrence = require("../viewport-observer/utils/track-display-content-occurrence");
 var _percentileCalc = require("./percentile-calc");
 var _getViewportHeight = _interopRequireDefault(require("./utils/get-viewport-height"));
 var _getViewportWidth = _interopRequireDefault(require("./utils/get-viewport-width"));
@@ -368,8 +368,8 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
                 vcDetails: vcDetails !== null && vcDetails !== void 0 ? vcDetails : undefined
               };
               result.ratios = this.calculateRatios(filteredEntries);
-              if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_resolution_ttvc_v3')) {
-                result.childrenIgnoredCount = (0, _checkDisplayContent.getInvalidChildrenCount)();
+              if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_track_occurrence')) {
+                result.displayContentsOccurrence = _trackDisplayContentOccurrence.cssIssueOccurrence;
               }
               return _context2.abrupt("return", result);
             case 14:

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

@@ -21,6 +21,7 @@ var _performanceObserver = _interopRequireDefault(require("./performance-observe
 var _checkDisplayContent = _interopRequireDefault(require("./utils/check-display-content"));
 var _checkWithinComponent2 = _interopRequireWildcard(require("./utils/check-within-component"));
 var _isInVcIgnoreIfNoLayoutShiftMarker = _interopRequireDefault(require("./utils/is-in-vc-ignore-if-no-layout-shift-marker"));
+var _trackDisplayContentOccurrence = _interopRequireDefault(require("./utils/track-display-content-occurrence"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -269,6 +270,9 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                           _iterator2.f();
                         }
                       } else {
+                        if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_track_occurrence')) {
+                          (0, _trackDisplayContentOccurrence.default)(addedNode);
+                        }
                         (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                       }
                     case 55:

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

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createIntersectionObserver = createIntersectionObserver;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _checkDisplayContent = require("../utils/check-display-content");
 function isValidEntry(entry) {
   return entry.isIntersecting && entry.intersectionRect.width > 0 && entry.intersectionRect.height > 0;
 }
@@ -21,13 +19,6 @@ function createIntersectionObserver(_ref) {
     var startTime = performance.now();
     entries.forEach(function (entry) {
       if (!(entry.target instanceof HTMLElement) || !isValidEntry(entry)) {
-        // TODO: Remove this logic when analysis is complete
-        if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_resolution_ttvc_v3')) {
-          if (entry.target instanceof HTMLElement && !isValidEntry(entry) && _checkDisplayContent.checkedChildrenCache.get(entry.target) === false) {
-            (0, _checkDisplayContent.incrementCheckedInvalidChildrenCount)();
-            _checkDisplayContent.checkedChildrenCache.set(entry.target, true);
-          }
-        }
         return;
       }
       var mutationTag = null;

package/dist/cjs/vc/vc-observer-new/viewport-observer/utils/check-display-content.js

@@ -3,22 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkedChildrenCache = void 0;
 exports.default = checkCssProperty;
-exports.getInvalidChildrenCount = getInvalidChildrenCount;
-exports.incrementCheckedInvalidChildrenCount = incrementCheckedInvalidChildrenCount;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-// TODO: Remove this cache when analysis is complete - it is used to track whether direct children elements will be ignored by the observer
-var checkedChildrenCache = exports.checkedChildrenCache = new WeakMap();
-var checkedInvalidChildrenCount = 0;
-function incrementCheckedInvalidChildrenCount() {
-  checkedInvalidChildrenCount++;
-}
-function getInvalidChildrenCount() {
-  return checkedInvalidChildrenCount;
-}
 function checkCssProperty(element) {
   var computedStyle = window.getComputedStyle(element);
   if (computedStyle.display === 'contents') {
@@ -30,10 +18,6 @@ function checkCssProperty(element) {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var child = _step.value;
         if (child instanceof HTMLElement) {
-          if (!checkedChildrenCache.has(child)) {
-            // TODO: Remove this cache when analysis is complete
-            checkedChildrenCache.set(child, false);
-          }
           result.push(child);
         }
       }

package/dist/cjs/vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cssIssueOccurrence = void 0;
+exports.default = trackDisplayContentsOccurrence;
+exports.resetCssIssueOccurrence = resetCssIssueOccurrence;
+var _cssIssueOccurrence;
+var cssIssueOccurrence = exports.cssIssueOccurrence = 0;
+function trackDisplayContentsOccurrence(element) {
+  var computedStyle = window.getComputedStyle(element);
+  if (computedStyle.display === 'contents') {
+    _cssIssueOccurrence = cssIssueOccurrence++, exports.cssIssueOccurrence = cssIssueOccurrence, _cssIssueOccurrence;
+  }
+}
+function resetCssIssueOccurrence() {
+  exports.cssIssueOccurrence = cssIssueOccurrence = 0;
+}

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

@@ -10,14 +10,8 @@ async function getVCMetrics(interaction, include3p = false) {
   if (!(config !== null && config !== void 0 && (_config$vc = config.vc) !== null && _config$vc !== void 0 && _config$vc.enabled)) {
     return {};
   }
-  if (fg('platform_ufo_enable_vc_press_interactions')) {
-    if (interaction.type !== 'page_load' && interaction.type !== 'transition' && interaction.type !== 'press') {
-      return {};
-    }
-  } else {
-    if (interaction.type !== 'page_load' && interaction.type !== 'transition') {
-      return {};
-    }
+  if (interaction.type !== 'page_load' && interaction.type !== 'transition' && interaction.type !== 'press') {
+    return {};
   }
   const interactionStatus = getInteractionStatus(interaction);
   const pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);

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

@@ -9,6 +9,7 @@ import { clearActiveTrace } from '../experience-trace-id-context';
 import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature-flags-accessed';
 import { getInteractionId } from '../interaction-id-context';
 import { newVCObserver } from '../vc';
+import { resetCssIssueOccurrence } from '../vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence';
 import { interactions } from './common/constants';
 import InteractionExtraMetrics from './interaction-extra-metrics';
 import PostInteractionLog from './post-interaction-log';
@@ -895,6 +896,7 @@ export function addOnCancelCallback(id, cancelCallback) {
   interaction === null || interaction === void 0 ? void 0 : interaction.cancelCallbacks.push(cancelCallback);
 }
 export function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelStack, routeName, trace = null) {
+  resetCssIssueOccurrence();
   postInteractionLog.reset();
   let vcObserver;
   let previousTime = startTime;
@@ -1033,7 +1035,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
       }, interactionId);
     }
   }
-  if (type === 'press' && fg('platform_ufo_enable_vc_press_interactions')) {
+  if (type === 'press') {
     // Use per-interaction VC observer if available, otherwise fall back to global
     const observer = vcObserver;
     if (observer) {

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

@@ -1,5 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getInvalidChildrenCount } from '../viewport-observer/utils/check-display-content';
+import { cssIssueOccurrence } from '../viewport-observer/utils/track-display-content-occurrence';
 import { calculateTTVCPercentilesWithDebugInfo } from './percentile-calc';
 import getViewportHeight from './utils/get-viewport-height';
 import getViewportWidth from './utils/get-viewport-width';
@@ -261,8 +261,8 @@ export default class AbstractVCCalculatorBase {
       vcDetails: vcDetails !== null && vcDetails !== void 0 ? vcDetails : undefined
     };
     result.ratios = this.calculateRatios(filteredEntries);
-    if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
-      result.childrenIgnoredCount = getInvalidChildrenCount();
+    if (fg('platform_ufo_display_content_track_occurrence')) {
+      result.displayContentsOccurrence = cssIssueOccurrence;
     }
     return result;
   }

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

@@ -9,6 +9,7 @@ import createPerformanceObserver from './performance-observer';
 import checkCssProperty from './utils/check-display-content';
 import checkWithinComponent, { cleanupCaches } from './utils/check-within-component';
 import isInVCIgnoreIfNoLayoutShiftMarker from './utils/is-in-vc-ignore-if-no-layout-shift-marker';
+import trackDisplayContentsOccurrence from './utils/track-display-content-occurrence';
 function isElementVisible(element) {
   if (!(element instanceof HTMLElement)) {
     return true;
@@ -203,6 +204,9 @@ export default class ViewportObserver {
           }
         } else {
           var _this$intersectionObs0;
+          if (fg('platform_ufo_display_content_track_occurrence')) {
+            trackDisplayContentsOccurrence(addedNode);
+          }
           (_this$intersectionObs0 = this.intersectionObserver) === null || _this$intersectionObs0 === void 0 ? void 0 : _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
         }
       }

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

@@ -1,5 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-import { checkedChildrenCache, incrementCheckedInvalidChildrenCount } from '../utils/check-display-content';
 function isValidEntry(entry) {
   return entry.isIntersecting && entry.intersectionRect.width > 0 && entry.intersectionRect.height > 0;
 }
@@ -17,13 +15,6 @@ export function createIntersectionObserver({
     entries.forEach(entry => {
       var _mutationTag;
       if (!(entry.target instanceof HTMLElement) || !isValidEntry(entry)) {
-        // TODO: Remove this logic when analysis is complete
-        if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
-          if (entry.target instanceof HTMLElement && !isValidEntry(entry) && checkedChildrenCache.get(entry.target) === false) {
-            incrementCheckedInvalidChildrenCount();
-            checkedChildrenCache.set(entry.target, true);
-          }
-        }
         return;
       }
       let mutationTag = null;

package/dist/es2019/vc/vc-observer-new/viewport-observer/utils/check-display-content.js

@@ -1,12 +1,3 @@
-// TODO: Remove this cache when analysis is complete - it is used to track whether direct children elements will be ignored by the observer
-export const checkedChildrenCache = new WeakMap();
-let checkedInvalidChildrenCount = 0;
-export function incrementCheckedInvalidChildrenCount() {
-  checkedInvalidChildrenCount++;
-}
-export function getInvalidChildrenCount() {
-  return checkedInvalidChildrenCount;
-}
 export default function checkCssProperty(element) {
   const computedStyle = window.getComputedStyle(element);
   if (computedStyle.display === 'contents') {
@@ -14,10 +5,6 @@ export default function checkCssProperty(element) {
     const result = [];
     for (const child of element.children) {
       if (child instanceof HTMLElement) {
-        if (!checkedChildrenCache.has(child)) {
-          // TODO: Remove this cache when analysis is complete
-          checkedChildrenCache.set(child, false);
-        }
         result.push(child);
       }
     }

package/dist/es2019/vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence.js

@@ -0,0 +1,10 @@
+export let cssIssueOccurrence = 0;
+export default function trackDisplayContentsOccurrence(element) {
+  const computedStyle = window.getComputedStyle(element);
+  if (computedStyle.display === 'contents') {
+    cssIssueOccurrence++;
+  }
+}
+export function resetCssIssueOccurrence() {
+  cssIssueOccurrence = 0;
+}

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

@@ -40,42 +40,29 @@ function _getVCMetrics() {
           }
           return _context.abrupt("return", {});
         case 4:
-          if (!fg('platform_ufo_enable_vc_press_interactions')) {
-            _context.next = 9;
-            break;
-          }
           if (!(interaction.type !== 'page_load' && interaction.type !== 'transition' && interaction.type !== 'press')) {
-            _context.next = 7;
-            break;
-          }
-          return _context.abrupt("return", {});
-        case 7:
-          _context.next = 11;
-          break;
-        case 9:
-          if (!(interaction.type !== 'page_load' && interaction.type !== 'transition')) {
-            _context.next = 11;
+            _context.next = 6;
             break;
           }
           return _context.abrupt("return", {});
-        case 11:
+        case 6:
           interactionStatus = getInteractionStatus(interaction);
           pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
           shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible'; // Use per-interaction VC observer if available, otherwise fall back to global
           observer = interaction.vcObserver;
           if (observer) {
-            _context.next = 17;
+            _context.next = 12;
             break;
           }
           return _context.abrupt("return", {});
-        case 17:
+        case 12:
           if (!(!shouldReportVCMetrics && fg('platform_ufo_no_vc_on_aborted'))) {
-            _context.next = 20;
+            _context.next = 15;
             break;
           }
           observer.stop(interaction.ufoName);
           return _context.abrupt("return", {});
-        case 20:
+        case 15:
           isSSREnabled = interaction.type === 'page_load' && ((config === null || config === void 0 ? void 0 : config.ssr) || (config === null || config === void 0 || (_config$vc$ssrWhiteli = config.vc.ssrWhitelist) === null || _config$vc$ssrWhiteli === void 0 ? void 0 : _config$vc$ssrWhiteli.includes(interaction.ufoName)));
           ssr = interaction.type === 'page_load' && isSSREnabled ? {
             ssr: getSSRDoneTimeValue(config)
@@ -83,7 +70,7 @@ function _getVCMetrics() {
           postInteractionLog.setVCObserverSSRConfig(ssr);
           tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
           prefix = 'ufo';
-          _context.next = 27;
+          _context.next = 22;
           return observer.getVCResult(_objectSpread(_objectSpread({
             start: interaction.start,
             stop: interaction.end,
@@ -98,7 +85,7 @@ function _getVCMetrics() {
           }, ssr), {}, {
             include3p: include3p
           }));
-        case 27:
+        case 22:
           result = _context.sent;
           observer.stop(interaction.ufoName);
           if (!include3p) {
@@ -111,15 +98,15 @@ function _getVCMetrics() {
             return revision === mostRecentVCRevision;
           });
           if (!(!shouldReportVCMetrics || !(mostRecentVCRevisionPayload !== null && mostRecentVCRevisionPayload !== void 0 && mostRecentVCRevisionPayload.clean))) {
-            _context.next = 34;
+            _context.next = 29;
             break;
           }
           return _context.abrupt("return", result);
-        case 34:
+        case 29:
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': mostRecentVCRevisionPayload['metric:vc90']
           }));
-        case 35:
+        case 30:
         case "end":
           return _context.stop();
       }

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

@@ -19,6 +19,7 @@ import { clearActiveTrace } from '../experience-trace-id-context';
 import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature-flags-accessed';
 import { getInteractionId } from '../interaction-id-context';
 import { newVCObserver } from '../vc';
+import { resetCssIssueOccurrence } from '../vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence';
 import { interactions } from './common/constants';
 import InteractionExtraMetrics from './interaction-extra-metrics';
 import PostInteractionLog from './post-interaction-log';
@@ -971,6 +972,7 @@ export function addOnCancelCallback(id, cancelCallback) {
 }
 export function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelStack, routeName) {
   var trace = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
+  resetCssIssueOccurrence();
   postInteractionLog.reset();
   var vcObserver;
   var previousTime = startTime;
@@ -1109,7 +1111,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
       }, interactionId);
     }
   }
-  if (type === 'press' && fg('platform_ufo_enable_vc_press_interactions')) {
+  if (type === 'press') {
     // Use per-interaction VC observer if available, otherwise fall back to global
     var _observer = vcObserver;
     if (_observer) {

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

@@ -11,7 +11,7 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getInvalidChildrenCount } from '../viewport-observer/utils/check-display-content';
+import { cssIssueOccurrence } from '../viewport-observer/utils/track-display-content-occurrence';
 import { calculateTTVCPercentilesWithDebugInfo } from './percentile-calc';
 import getViewportHeight from './utils/get-viewport-height';
 import getViewportWidth from './utils/get-viewport-width';
@@ -362,8 +362,8 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
                 vcDetails: vcDetails !== null && vcDetails !== void 0 ? vcDetails : undefined
               };
               result.ratios = this.calculateRatios(filteredEntries);
-              if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
-                result.childrenIgnoredCount = getInvalidChildrenCount();
+              if (fg('platform_ufo_display_content_track_occurrence')) {
+                result.displayContentsOccurrence = cssIssueOccurrence;
               }
               return _context2.abrupt("return", result);
             case 14:

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

@@ -16,6 +16,7 @@ import createPerformanceObserver from './performance-observer';
 import checkCssProperty from './utils/check-display-content';
 import checkWithinComponent, { cleanupCaches } from './utils/check-within-component';
 import isInVCIgnoreIfNoLayoutShiftMarker from './utils/is-in-vc-ignore-if-no-layout-shift-marker';
+import trackDisplayContentsOccurrence from './utils/track-display-content-occurrence';
 function isElementVisible(element) {
   if (!(element instanceof HTMLElement)) {
     return true;
@@ -260,6 +261,9 @@ var ViewportObserver = /*#__PURE__*/function () {
                           _iterator2.f();
                         }
                       } else {
+                        if (fg('platform_ufo_display_content_track_occurrence')) {
+                          trackDisplayContentsOccurrence(addedNode);
+                        }
                         (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                       }
                     case 55:

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

@@ -1,5 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-import { checkedChildrenCache, incrementCheckedInvalidChildrenCount } from '../utils/check-display-content';
 function isValidEntry(entry) {
   return entry.isIntersecting && entry.intersectionRect.width > 0 && entry.intersectionRect.height > 0;
 }
@@ -15,13 +13,6 @@ export function createIntersectionObserver(_ref) {
     var startTime = performance.now();
     entries.forEach(function (entry) {
       if (!(entry.target instanceof HTMLElement) || !isValidEntry(entry)) {
-        // TODO: Remove this logic when analysis is complete
-        if (fg('platform_ufo_display_content_resolution_ttvc_v3')) {
-          if (entry.target instanceof HTMLElement && !isValidEntry(entry) && checkedChildrenCache.get(entry.target) === false) {
-            incrementCheckedInvalidChildrenCount();
-            checkedChildrenCache.set(entry.target, true);
-          }
-        }
         return;
       }
       var mutationTag = null;

package/dist/esm/vc/vc-observer-new/viewport-observer/utils/check-display-content.js

@@ -1,15 +1,6 @@
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-// TODO: Remove this cache when analysis is complete - it is used to track whether direct children elements will be ignored by the observer
-export var checkedChildrenCache = new WeakMap();
-var checkedInvalidChildrenCount = 0;
-export function incrementCheckedInvalidChildrenCount() {
-  checkedInvalidChildrenCount++;
-}
-export function getInvalidChildrenCount() {
-  return checkedInvalidChildrenCount;
-}
 export default function checkCssProperty(element) {
   var computedStyle = window.getComputedStyle(element);
   if (computedStyle.display === 'contents') {
@@ -21,10 +12,6 @@ export default function checkCssProperty(element) {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var child = _step.value;
         if (child instanceof HTMLElement) {
-          if (!checkedChildrenCache.has(child)) {
-            // TODO: Remove this cache when analysis is complete
-            checkedChildrenCache.set(child, false);
-          }
           result.push(child);
         }
       }

package/dist/esm/vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence.js

@@ -0,0 +1,10 @@
+export var cssIssueOccurrence = 0;
+export default function trackDisplayContentsOccurrence(element) {
+  var computedStyle = window.getComputedStyle(element);
+  if (computedStyle.display === 'contents') {
+    cssIssueOccurrence++;
+  }
+}
+export function resetCssIssueOccurrence() {
+  cssIssueOccurrence = 0;
+}

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

@@ -116,7 +116,7 @@ export type RevisionPayloadEntry = {
     ratios?: VCRatioType;
     abortReason?: VCAbortReason | null;
     abortTimestamp?: number;
-    childrenIgnoredCount?: number;
+    displayContentsOccurrence?: number;
 };
 export type RevisionPayload = RevisionPayloadEntry[];
 export {};

package/dist/types/vc/vc-observer-new/viewport-observer/utils/check-display-content.d.ts

@@ -1,4 +1 @@
-export declare const checkedChildrenCache: WeakMap<HTMLElement, boolean>;
-export declare function incrementCheckedInvalidChildrenCount(): void;
-export declare function getInvalidChildrenCount(): number;
 export default function checkCssProperty(element: HTMLElement): Element[];

package/dist/types/vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence.d.ts

@@ -0,0 +1,3 @@
+export declare let cssIssueOccurrence: number;
+export default function trackDisplayContentsOccurrence(element: HTMLElement): void;
+export declare function resetCssIssueOccurrence(): void;

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

@@ -116,7 +116,7 @@ export type RevisionPayloadEntry = {
     ratios?: VCRatioType;
     abortReason?: VCAbortReason | null;
     abortTimestamp?: number;
-    childrenIgnoredCount?: number;
+    displayContentsOccurrence?: number;
 };
 export type RevisionPayload = RevisionPayloadEntry[];
 export {};

package/dist/types-ts4.5/vc/vc-observer-new/viewport-observer/utils/check-display-content.d.ts

@@ -1,4 +1 @@
-export declare const checkedChildrenCache: WeakMap<HTMLElement, boolean>;
-export declare function incrementCheckedInvalidChildrenCount(): void;
-export declare function getInvalidChildrenCount(): number;
 export default function checkCssProperty(element: HTMLElement): Element[];

package/dist/types-ts4.5/vc/vc-observer-new/viewport-observer/utils/track-display-content-occurrence.d.ts

@@ -0,0 +1,3 @@
+export declare let cssIssueOccurrence: number;
+export default function trackDisplayContentsOccurrence(element: HTMLElement): void;
+export declare function resetCssIssueOccurrence(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.5.5",
+	"version": "4.5.7",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -123,7 +123,7 @@
 		"platform_ufo_exclude_3p_elements_from_ttvc": {
 			"type": "boolean"
 		},
-		"platform_ufo_enable_vc_press_interactions": {
+		"platform_ufo_add_type_for_3p_segments": {
 			"type": "boolean"
 		},
 		"platform_ufo_segment_critical_metrics": {
@@ -149,6 +149,9 @@
 		},
 		"platform_ufo_exclude_3p_extensions_from_ttvc": {
 			"type": "boolean"
+		},
+		"platform_ufo_display_content_track_occurrence": {
+			"type": "boolean"
 		}
 	}
 }