@atlaskit/react-ufo 4.1.5 → 4.1.7

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.1.7
+
+### Patch Changes
+
+- [#190129](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/190129)
+  [`396971b979d5d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/396971b979d5d) -
+  FG cleanup - platform_ufo_ignore_extra_attributes
+- [#190121](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/190121)
+  [`5541b82436020`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5541b82436020) -
+  FG cleanup - platform_ufo_timeout_simplification
+
+## 4.1.6
+
+### Patch Changes
+
+- [#192382](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/192382)
+  [`5f4f054f58647`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5f4f054f58647) -
+  Add hard limit for findReactFiber
+
 ## 4.1.5
 
 ### Patch Changes

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

@@ -73,7 +73,6 @@ var postInteractionLog = exports.postInteractionLog = new _postInteractionLog.de
 var interactionQueue = [];
 var segmentCache = new Map();
 var CLEANUP_TIMEOUT = 60 * 1000;
-var CLEANUP_TIMEOUT_AFTER_APDEX = 15 * 1000;
 var segmentObservers = [];
 function getActiveInteraction() {
   var interactionId = (0, _interactionIdContext.getInteractionId)();
@@ -929,9 +928,6 @@ function addBrowserMetricEvent(event) {
     interaction.legacyMetrics = interaction.legacyMetrics || [];
     interaction.legacyMetrics.push(event);
     if ((interaction.type === 'page_load' || interaction.type === 'transition') && ((_event$config = event.config) === null || _event$config === void 0 ? void 0 : _event$config.type) === 'PAGE_LOAD') {
-      if (!(0, _platformFeatureFlags.fg)('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(interaction.id, interaction.ufoName);
     }
   }
@@ -950,9 +946,6 @@ function addApdexToAll(apdex) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      if (!(0, _platformFeatureFlags.fg)('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(key, interaction.ufoName);
     }
   });
@@ -972,9 +965,6 @@ function addApdex(interactionId, apdexInfo) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      if (!(0, _platformFeatureFlags.fg)('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(interactionId, interaction.ufoName);
     }
   }

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

@@ -56,7 +56,7 @@ var VCCalculator_FY25_03 = exports.default = /*#__PURE__*/function (_AbstractVCC
         if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
           return false;
         }
-        if (attributeName.startsWith('data-test') && (0, _platformFeatureFlags.fg)('platform_ufo_ttvc_exclude_data_test_attribute') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || (attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck') && (0, _platformFeatureFlags.fg)('platform_ufo_ignore_extra_attributes') || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
+        if (attributeName.startsWith('data-test') && (0, _platformFeatureFlags.fg)('platform_ufo_ttvc_exclude_data_test_attribute') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck' || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
           return false;
         }
         return true;

package/dist/cjs/vc/vc-observer-new/viewport-observer/utils/check-within-component-and-extract-child-props.js

@@ -11,6 +11,7 @@ var _findReactFiber = _interopRequireDefault(require("./find-react-fiber"));
 var _getComponentName = _interopRequireDefault(require("./get-component-name"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var DEFAULT_MAX_LEVEL = 20;
 // Using the React Fiber tree to traverse up the DOM and check if a node is within a specific component
 // and extract child component props if needed.
 function checkWithinComponentAndExtractChildProps(node, targetComponentName, childComponentConfig) {
@@ -18,11 +19,13 @@ function checkWithinComponentAndExtractChildProps(node, targetComponentName, chi
   if ((0, _platformFeatureFlags.fg)('platform_ufo_handle_non_react_element_for_3p')) {
     // Walk up the DOM tree to find React fiber (handles non-React-rendered elements)
     var currentElement = node;
-    while (currentElement && !fiber) {
+    var levelsTraversed = 0;
+    while (currentElement && !fiber && levelsTraversed < DEFAULT_MAX_LEVEL) {
       fiber = (0, _findReactFiber.default)(currentElement);
       if (!fiber) {
         currentElement = currentElement.parentElement;
       }
+      levelsTraversed++;
     }
   } else {
     fiber = (0, _findReactFiber.default)(node);

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

@@ -17,7 +17,6 @@ export const postInteractionLog = new PostInteractionLog();
 const interactionQueue = [];
 const segmentCache = new Map();
 const CLEANUP_TIMEOUT = 60 * 1000;
-const CLEANUP_TIMEOUT_AFTER_APDEX = 15 * 1000;
 const segmentObservers = [];
 export function getActiveInteraction() {
   const interactionId = getInteractionId();
@@ -804,9 +803,6 @@ export function addBrowserMetricEvent(event) {
     interaction.legacyMetrics = interaction.legacyMetrics || [];
     interaction.legacyMetrics.push(event);
     if ((interaction.type === 'page_load' || interaction.type === 'transition') && ((_event$config = event.config) === null || _event$config === void 0 ? void 0 : _event$config.type) === 'PAGE_LOAD') {
-      if (!fg('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(interaction.id, interaction.ufoName);
     }
   }
@@ -825,9 +821,6 @@ export function addApdexToAll(apdex) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      if (!fg('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(key, interaction.ufoName);
     }
   });
@@ -847,9 +840,6 @@ export function addApdex(interactionId, apdexInfo) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      if (!fg('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(interactionId, interaction.ufoName);
     }
   }

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

@@ -38,7 +38,7 @@ export default class VCCalculator_FY25_03 extends AbstractVCCalculatorBase {
       if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
         return false;
       }
-      if (attributeName.startsWith('data-test') && fg('platform_ufo_ttvc_exclude_data_test_attribute') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || (attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck') && fg('platform_ufo_ignore_extra_attributes') || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
+      if (attributeName.startsWith('data-test') && fg('platform_ufo_ttvc_exclude_data_test_attribute') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck' || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
         return false;
       }
       return true;

package/dist/es2019/vc/vc-observer-new/viewport-observer/utils/check-within-component-and-extract-child-props.js

@@ -1,7 +1,7 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import findReactFiber from './find-react-fiber';
 import getComponentName from './get-component-name';
-
+const DEFAULT_MAX_LEVEL = 20;
 // Using the React Fiber tree to traverse up the DOM and check if a node is within a specific component
 // and extract child component props if needed.
 export default function checkWithinComponentAndExtractChildProps(node, targetComponentName, childComponentConfig) {
@@ -9,11 +9,13 @@ export default function checkWithinComponentAndExtractChildProps(node, targetCom
   if (fg('platform_ufo_handle_non_react_element_for_3p')) {
     // Walk up the DOM tree to find React fiber (handles non-React-rendered elements)
     let currentElement = node;
-    while (currentElement && !fiber) {
+    let levelsTraversed = 0;
+    while (currentElement && !fiber && levelsTraversed < DEFAULT_MAX_LEVEL) {
       fiber = findReactFiber(currentElement);
       if (!fiber) {
         currentElement = currentElement.parentElement;
       }
+      levelsTraversed++;
     }
   } else {
     fiber = findReactFiber(node);

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

@@ -27,7 +27,6 @@ export var postInteractionLog = new PostInteractionLog();
 var interactionQueue = [];
 var segmentCache = new Map();
 var CLEANUP_TIMEOUT = 60 * 1000;
-var CLEANUP_TIMEOUT_AFTER_APDEX = 15 * 1000;
 var segmentObservers = [];
 export function getActiveInteraction() {
   var interactionId = getInteractionId();
@@ -883,9 +882,6 @@ export function addBrowserMetricEvent(event) {
     interaction.legacyMetrics = interaction.legacyMetrics || [];
     interaction.legacyMetrics.push(event);
     if ((interaction.type === 'page_load' || interaction.type === 'transition') && ((_event$config = event.config) === null || _event$config === void 0 ? void 0 : _event$config.type) === 'PAGE_LOAD') {
-      if (!fg('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(interaction.id, interaction.ufoName);
     }
   }
@@ -904,9 +900,6 @@ export function addApdexToAll(apdex) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      if (!fg('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(key, interaction.ufoName);
     }
   });
@@ -926,9 +919,6 @@ export function addApdex(interactionId, apdexInfo) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      if (!fg('platform_ufo_timeout_simplification')) {
-        interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
-      }
       removeHoldByID(interactionId, interaction.ufoName);
     }
   }

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

@@ -49,7 +49,7 @@ var VCCalculator_FY25_03 = /*#__PURE__*/function (_AbstractVCCalculator) {
         if (!attributeName || KNOWN_ATTRIBUTES_THAT_DOES_NOT_CAUSE_LAYOUT_SHIFTS.includes(attributeName)) {
           return false;
         }
-        if (attributeName.startsWith('data-test') && fg('platform_ufo_ttvc_exclude_data_test_attribute') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || (attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck') && fg('platform_ufo_ignore_extra_attributes') || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
+        if (attributeName.startsWith('data-test') && fg('platform_ufo_ttvc_exclude_data_test_attribute') || attributeName === 'data-aui-version' || attributeName === 'data-testid' || attributeName === 'data-vc' || attributeName === 'data-ssr-placeholder' || attributeName === 'data-ssr-placeholder-replace' || attributeName === 'data-vc-nvs' || attributeName === 'data-media-vc-wrapper' || attributeName === 'data-renderer-start-pos' || attributeName === 'data-table-local-id' || attributeName === 'spellcheck' || attributeName === 'data-auto-scrollable' || attributeName === 'id' || attributeName === 'tabindex' || attributeName === 'data-is-ttvc-ready' || NON_VISUAL_ARIA_ATTRIBUTES.includes(attributeName)) {
           return false;
         }
         return true;

package/dist/esm/vc/vc-observer-new/viewport-observer/utils/check-within-component-and-extract-child-props.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { fg } from '@atlaskit/platform-feature-flags';
 import findReactFiber from './find-react-fiber';
 import getComponentName from './get-component-name';
-
+var DEFAULT_MAX_LEVEL = 20;
 // Using the React Fiber tree to traverse up the DOM and check if a node is within a specific component
 // and extract child component props if needed.
 export default function checkWithinComponentAndExtractChildProps(node, targetComponentName, childComponentConfig) {
@@ -12,11 +12,13 @@ export default function checkWithinComponentAndExtractChildProps(node, targetCom
   if (fg('platform_ufo_handle_non_react_element_for_3p')) {
     // Walk up the DOM tree to find React fiber (handles non-React-rendered elements)
     var currentElement = node;
-    while (currentElement && !fiber) {
+    var levelsTraversed = 0;
+    while (currentElement && !fiber && levelsTraversed < DEFAULT_MAX_LEVEL) {
       fiber = findReactFiber(currentElement);
       if (!fiber) {
         currentElement = currentElement.parentElement;
       }
+      levelsTraversed++;
     }
   } else {
     fiber = findReactFiber(node);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.1.5",
+	"version": "4.1.7",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -165,9 +165,6 @@
 		"platform_ufo_rll_placeholder_ignore": {
 			"type": "boolean"
 		},
-		"platform_ufo_timeout_simplification": {
-			"type": "boolean"
-		},
 		"platform_ufo_enable_timeout_config": {
 			"type": "boolean"
 		},
@@ -177,9 +174,6 @@
 		"platform_ufo_enable_interactivity_jsm": {
 			"type": "boolean"
 		},
-		"platform_ufo_ignore_extra_attributes": {
-			"type": "boolean"
-		},
 		"platform_ufo_exclude_3p_elements_from_ttai": {
 			"type": "boolean"
 		},