@atlaskit/react-ufo 4.11.4 → 4.11.6

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.11.6
+
+### Patch Changes
+
+- [`b629e44ac5c35`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b629e44ac5c35) -
+  Do not send prior fg for press interactions
+
+## 4.11.5
+
+### Patch Changes
+
+- [`c7f300b3eed72`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c7f300b3eed72) -
+  FG cleanup of display contents tracking flags
+
 ## 4.11.4
 
 ### Patch Changes

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

@@ -60,7 +60,6 @@ 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"));
@@ -1010,7 +1009,6 @@ 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)();
   interactionExtraMetrics.reset();
   postInteractionLog.reset();
   var vcObserver;
@@ -1047,9 +1045,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
     };
     vcObserver = (0, _vc.newVCObserver)(vcOptions);
   }
-
-  // Create per-interaction VC observer when feature flag is enabled
-
+  var priorAccessedFg = type === 'press' && (0, _platformFeatureFlags.fg)('platform_ufo_drop_prior_fg_interactions') ? {} : Object.fromEntries(_featureFlagsAccessed.allFeatureFlagsAccessed);
   var metrics = {
     id: interactionId,
     start: startTime,
@@ -1081,7 +1077,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
     labelStack: labelStack,
     routeName: routeName !== null && routeName !== void 0 ? routeName : ufoName,
     featureFlags: addFeatureFlagsToInteraction ? {
-      prior: Object.fromEntries(_featureFlagsAccessed.allFeatureFlagsAccessed),
+      prior: priorAccessedFg,
       during: {}
     } : undefined,
     knownSegments: [],

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

@@ -13,7 +13,6 @@ 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 _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"));
@@ -419,11 +418,8 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
               if (isPostInteraction) {
                 result.labelStacks = this.getLabelStacks(filteredEntries);
               }
-              if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_track_occurrence')) {
-                result.displayContentsOccurrence = _trackDisplayContentOccurrence.cssIssueOccurrence;
-              }
               return _context2.abrupt("return", result);
-            case 18:
+            case 17:
             case "end":
               return _context2.stop();
           }

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

@@ -19,14 +19,12 @@ var _rllPlaceholders = require("../../vc-observer/observers/rll-placeholders");
 var _intersectionObserver = require("./intersection-observer");
 var _mutationObserver = _interopRequireDefault(require("./mutation-observer"));
 var _performanceObserver = _interopRequireDefault(require("./performance-observer"));
-var _checkDisplayContent = _interopRequireDefault(require("./utils/check-display-content"));
 var _checkWithinComponent2 = _interopRequireWildcard(require("./utils/check-within-component"));
 var _getMutatedElements = require("./utils/get-mutated-elements");
 var _isElementVisible = require("./utils/is-element-visible");
 var _isInVcIgnoreIfNoLayoutShiftMarker = _interopRequireDefault(require("./utils/is-in-vc-ignore-if-no-layout-shift-marker"));
 var _isSameRectDimensions = require("./utils/is-same-rect-dimensions");
 var _isSameRectSize = require("./utils/is-same-rect-size");
-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; } }
@@ -101,7 +99,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, _iterator2, _step2, _step2$value, isDisplayContentsElementChildren, element, _this$intersectionObs8, _this$intersectionObs9, validTargets, _iterator3, _step3, _this$intersectionObs0, validTarget, _this$intersectionObs1;
+                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, _iterator2, _step2, _step2$value, isDisplayContentsElementChildren, element, _this$intersectionObs8, _this$intersectionObs9, _this$intersectionObs0;
                 return _regenerator.default.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -230,26 +228,7 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                           _iterator2.f();
                         }
                       } else {
-                        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$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                       }
                     case 46:
                     case "end":
@@ -296,12 +275,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
       };
     }());
     (0, _defineProperty2.default)(this, "handleAttributeMutation", function (_ref6) {
-      var _this$intersectionObs10;
+      var _this$intersectionObs1;
       var target = _ref6.target,
         attributeName = _ref6.attributeName,
         oldValue = _ref6.oldValue,
         newValue = _ref6.newValue;
-      (_this$intersectionObs10 = _this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.watchAndTag(target, function (_ref7) {
+      (_this$intersectionObs1 = _this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.watchAndTag(target, function (_ref7) {
         var target = _ref7.target,
           rect = _ref7.rect;
         if ((0, _vcUtils.isContainedWithinMediaWrapper)(target)) {
@@ -378,11 +357,11 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "handleLayoutShift", function (_ref8) {
       var time = _ref8.time,
         changedRects = _ref8.changedRects;
-      var _iterator4 = _createForOfIteratorHelper(changedRects),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(changedRects),
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var changedRect = _step4.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var changedRect = _step3.value;
           var target = changedRect.node;
           if (target) {
             if ((0, _platformFeatureFlags.fg)('platform_ufo_vc_next_filter_ls_entries_same_rect')) {
@@ -408,9 +387,9 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
     });
     this.mapVisibleNodeRects = new WeakMap();
@@ -467,12 +446,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this$mutationObserve2, _this$intersectionObs11, _this$performanceObse2;
+      var _this$mutationObserve2, _this$intersectionObs10, _this$performanceObse2;
       if (!this.isStarted) {
         return;
       }
       (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 || _this$mutationObserve2.disconnect();
-      (_this$intersectionObs11 = this.intersectionObserver) === null || _this$intersectionObs11 === void 0 || _this$intersectionObs11.disconnect();
+      (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.disconnect();
       (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 || _this$performanceObse2.disconnect();
       this.isStarted = false;
       // Clean up caches when stopping

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

@@ -9,7 +9,6 @@ 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';
@@ -889,7 +888,6 @@ 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();
   interactionExtraMetrics.reset();
   postInteractionLog.reset();
   let vcObserver;
@@ -926,9 +924,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     };
     vcObserver = newVCObserver(vcOptions);
   }
-
-  // Create per-interaction VC observer when feature flag is enabled
-
+  const priorAccessedFg = type === 'press' && fg('platform_ufo_drop_prior_fg_interactions') ? {} : Object.fromEntries(allFeatureFlagsAccessed);
   const metrics = {
     id: interactionId,
     start: startTime,
@@ -960,7 +956,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     labelStack,
     routeName: routeName !== null && routeName !== void 0 ? routeName : ufoName,
     featureFlags: addFeatureFlagsToInteraction ? {
-      prior: Object.fromEntries(allFeatureFlagsAccessed),
+      prior: priorAccessedFg,
       during: {}
     } : undefined,
     knownSegments: [],

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

@@ -1,5 +1,4 @@
 import { fg } from '@atlaskit/platform-feature-flags';
-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';
@@ -304,9 +303,6 @@ export default class AbstractVCCalculatorBase {
     if (isPostInteraction) {
       result.labelStacks = this.getLabelStacks(filteredEntries);
     }
-    if (fg('platform_ufo_display_content_track_occurrence')) {
-      result.displayContentsOccurrence = cssIssueOccurrence;
-    }
     return result;
   }
 }

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

@@ -7,14 +7,12 @@ import { RLLPlaceholderHandlers } from '../../vc-observer/observers/rll-placehol
 import { createIntersectionObserver } from './intersection-observer';
 import createMutationObserver from './mutation-observer';
 import createPerformanceObserver from './performance-observer';
-import checkCssProperty from './utils/check-display-content';
 import checkWithinComponent, { cleanupCaches } from './utils/check-within-component';
 import { getMutatedElements } from './utils/get-mutated-elements';
 import { isElementVisible } from './utils/is-element-visible';
 import isInVCIgnoreIfNoLayoutShiftMarker from './utils/is-in-vc-ignore-if-no-layout-shift-marker';
 import { isSameRectDimensions } from './utils/is-same-rect-dimensions';
 import { isSameRectSize } from './utils/is-same-rect-size';
-import trackDisplayContentsOccurrence from './utils/track-display-content-occurrence';
 const createElementMutationsWatcher = removedNodeRects => ({
   target,
   rect
@@ -176,20 +174,8 @@ export default class ViewportObserver {
             }
           }
         } else {
-          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));
-          }
+          var _this$intersectionObs0;
+          (_this$intersectionObs0 = this.intersectionObserver) === null || _this$intersectionObs0 === void 0 ? void 0 : _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
         }
       }
     });
@@ -199,8 +185,8 @@ export default class ViewportObserver {
       oldValue,
       newValue
     }) => {
-      var _this$intersectionObs10;
-      (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 ? void 0 : _this$intersectionObs10.watchAndTag(target, ({
+      var _this$intersectionObs1;
+      (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 ? void 0 : _this$intersectionObs1.watchAndTag(target, ({
         target,
         rect
       }) => {
@@ -353,12 +339,12 @@ export default class ViewportObserver {
     this.isStarted = true;
   }
   stop() {
-    var _this$mutationObserve2, _this$intersectionObs11, _this$performanceObse2;
+    var _this$mutationObserve2, _this$intersectionObs10, _this$performanceObse2;
     if (!this.isStarted) {
       return;
     }
     (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 ? void 0 : _this$mutationObserve2.disconnect();
-    (_this$intersectionObs11 = this.intersectionObserver) === null || _this$intersectionObs11 === void 0 ? void 0 : _this$intersectionObs11.disconnect();
+    (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 ? void 0 : _this$intersectionObs10.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/interaction-metrics/index.js

@@ -19,7 +19,6 @@ 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';
@@ -964,7 +963,6 @@ 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();
   interactionExtraMetrics.reset();
   postInteractionLog.reset();
   var vcObserver;
@@ -1001,9 +999,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     };
     vcObserver = newVCObserver(vcOptions);
   }
-
-  // Create per-interaction VC observer when feature flag is enabled
-
+  var priorAccessedFg = type === 'press' && fg('platform_ufo_drop_prior_fg_interactions') ? {} : Object.fromEntries(allFeatureFlagsAccessed);
   var metrics = {
     id: interactionId,
     start: startTime,
@@ -1035,7 +1031,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     labelStack: labelStack,
     routeName: routeName !== null && routeName !== void 0 ? routeName : ufoName,
     featureFlags: addFeatureFlagsToInteraction ? {
-      prior: Object.fromEntries(allFeatureFlagsAccessed),
+      prior: priorAccessedFg,
       during: {}
     } : undefined,
     knownSegments: [],

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

@@ -11,7 +11,6 @@ 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 { 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';
@@ -413,11 +412,8 @@ var AbstractVCCalculatorBase = /*#__PURE__*/function () {
               if (isPostInteraction) {
                 result.labelStacks = this.getLabelStacks(filteredEntries);
               }
-              if (fg('platform_ufo_display_content_track_occurrence')) {
-                result.displayContentsOccurrence = cssIssueOccurrence;
-              }
               return _context2.abrupt("return", result);
-            case 18:
+            case 17:
             case "end":
               return _context2.stop();
           }

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

@@ -14,14 +14,12 @@ import { RLLPlaceholderHandlers } from '../../vc-observer/observers/rll-placehol
 import { createIntersectionObserver } from './intersection-observer';
 import createMutationObserver from './mutation-observer';
 import createPerformanceObserver from './performance-observer';
-import checkCssProperty from './utils/check-display-content';
 import checkWithinComponent, { cleanupCaches } from './utils/check-within-component';
 import { getMutatedElements } from './utils/get-mutated-elements';
 import { isElementVisible } from './utils/is-element-visible';
 import isInVCIgnoreIfNoLayoutShiftMarker from './utils/is-in-vc-ignore-if-no-layout-shift-marker';
 import { isSameRectDimensions } from './utils/is-same-rect-dimensions';
 import { isSameRectSize } from './utils/is-same-rect-size';
-import trackDisplayContentsOccurrence from './utils/track-display-content-occurrence';
 var createElementMutationsWatcher = function createElementMutationsWatcher(removedNodeRects) {
   return function (_ref) {
     var target = _ref.target,
@@ -92,7 +90,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, _iterator2, _step2, _step2$value, isDisplayContentsElementChildren, element, _this$intersectionObs8, _this$intersectionObs9, validTargets, _iterator3, _step3, _this$intersectionObs0, validTarget, _this$intersectionObs1;
+                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, _iterator2, _step2, _step2$value, isDisplayContentsElementChildren, element, _this$intersectionObs8, _this$intersectionObs9, _this$intersectionObs0;
                 return _regeneratorRuntime.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -221,26 +219,7 @@ var ViewportObserver = /*#__PURE__*/function () {
                           _iterator2.f();
                         }
                       } else {
-                        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$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                       }
                     case 46:
                     case "end":
@@ -287,12 +266,12 @@ var ViewportObserver = /*#__PURE__*/function () {
       };
     }());
     _defineProperty(this, "handleAttributeMutation", function (_ref6) {
-      var _this$intersectionObs10;
+      var _this$intersectionObs1;
       var target = _ref6.target,
         attributeName = _ref6.attributeName,
         oldValue = _ref6.oldValue,
         newValue = _ref6.newValue;
-      (_this$intersectionObs10 = _this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.watchAndTag(target, function (_ref7) {
+      (_this$intersectionObs1 = _this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.watchAndTag(target, function (_ref7) {
         var target = _ref7.target,
           rect = _ref7.rect;
         if (isContainedWithinMediaWrapper(target)) {
@@ -369,11 +348,11 @@ var ViewportObserver = /*#__PURE__*/function () {
     _defineProperty(this, "handleLayoutShift", function (_ref8) {
       var time = _ref8.time,
         changedRects = _ref8.changedRects;
-      var _iterator4 = _createForOfIteratorHelper(changedRects),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(changedRects),
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var changedRect = _step4.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var changedRect = _step3.value;
           var target = changedRect.node;
           if (target) {
             if (fg('platform_ufo_vc_next_filter_ls_entries_same_rect')) {
@@ -399,9 +378,9 @@ var ViewportObserver = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
     });
     this.mapVisibleNodeRects = new WeakMap();
@@ -458,12 +437,12 @@ var ViewportObserver = /*#__PURE__*/function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this$mutationObserve2, _this$intersectionObs11, _this$performanceObse2;
+      var _this$mutationObserve2, _this$intersectionObs10, _this$performanceObse2;
       if (!this.isStarted) {
         return;
       }
       (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 || _this$mutationObserve2.disconnect();
-      (_this$intersectionObs11 = this.intersectionObserver) === null || _this$intersectionObs11 === void 0 || _this$intersectionObs11.disconnect();
+      (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.disconnect();
       (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 || _this$performanceObse2.disconnect();
       this.isStarted = false;
       // Clean up caches when stopping

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

@@ -128,7 +128,6 @@ export type RevisionPayloadEntry = {
     labelStacks?: VCLabelStacks;
     abortReason?: VCAbortReason | null;
     abortTimestamp?: number;
-    displayContentsOccurrence?: number;
 };
 export type RevisionPayload = RevisionPayloadEntry[];
 export {};

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

@@ -128,7 +128,6 @@ export type RevisionPayloadEntry = {
     labelStacks?: VCLabelStacks;
     abortReason?: VCAbortReason | null;
     abortTimestamp?: number;
-    displayContentsOccurrence?: number;
 };
 export type RevisionPayload = RevisionPayloadEntry[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.11.4",
+	"version": "4.11.6",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -136,9 +136,6 @@
 		"platform_ufo_add_segments_count_threshold": {
 			"type": "boolean"
 		},
-		"platform_ufo_display_content_resolution_ttvc_v3": {
-			"type": "boolean"
-		},
 		"platform_ufo_segment_unmount_count": {
 			"type": "boolean"
 		},
@@ -151,9 +148,6 @@
 		"platform_ufo_enable_late_holds_post_interaction": {
 			"type": "boolean"
 		},
-		"platform_ufo_display_content_track_occurrence": {
-			"type": "boolean"
-		},
 		"platform_ufo_enable_late_mutation_label_stacks": {
 			"type": "boolean"
 		},
@@ -174,6 +168,9 @@
 		},
 		"platform_report_ssr_ratio_in_v3": {
 			"type": "boolean"
+		},
+		"platform_ufo_drop_prior_fg_interactions": {
+			"type": "boolean"
 		}
 	}
 }

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

@@ -1,32 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = checkCssProperty;
-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; }
-function checkCssProperty(element) {
-  var computedStyle = window.getComputedStyle(element);
-  if (computedStyle.display === 'contents') {
-    // If display is 'contents', we return the direct children of the element
-    var result = [];
-    var _iterator = _createForOfIteratorHelper(element.children),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var child = _step.value;
-        if (child instanceof HTMLElement) {
-          result.push(child);
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    return result;
-  }
-  return [element];
-}

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

@@ -1,19 +0,0 @@
-"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/vc/vc-observer-new/viewport-observer/utils/check-display-content.js

@@ -1,14 +0,0 @@
-export default function checkCssProperty(element) {
-  const computedStyle = window.getComputedStyle(element);
-  if (computedStyle.display === 'contents') {
-    // If display is 'contents', we return the direct children of the element
-    const result = [];
-    for (const child of element.children) {
-      if (child instanceof HTMLElement) {
-        result.push(child);
-      }
-    }
-    return result;
-  }
-  return [element];
-}

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

@@ -1,10 +0,0 @@
-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/vc/vc-observer-new/viewport-observer/utils/check-display-content.js

@@ -1,26 +0,0 @@
-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; }
-export default function checkCssProperty(element) {
-  var computedStyle = window.getComputedStyle(element);
-  if (computedStyle.display === 'contents') {
-    // If display is 'contents', we return the direct children of the element
-    var result = [];
-    var _iterator = _createForOfIteratorHelper(element.children),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var child = _step.value;
-        if (child instanceof HTMLElement) {
-          result.push(child);
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    return result;
-  }
-  return [element];
-}

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

@@ -1,10 +0,0 @@
-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/vc/vc-observer-new/viewport-observer/utils/check-display-content.d.ts

@@ -1 +0,0 @@
-export default function checkCssProperty(element: HTMLElement): Element[];

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

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

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

@@ -1 +0,0 @@
-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

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