@atlaskit/react-ufo 4.5.2 → 4.5.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.5.4
+
+### Patch Changes
+
+- [`f438ecb761bb1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f438ecb761bb1) -
+  Move check for initial page load earlier for React hydration stats
+
+## 4.5.3
+
+### Patch Changes
+
+- [`5c1bb03531687`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c1bb03531687) -
+  FG cleanup - platform_ufo_handle_non_react_element_for_3p
+
 ## 4.5.2
 
 ### Patch Changes

package/dist/cjs/create-payload/index.js

@@ -714,7 +714,7 @@ function _createInteractionMetricsPayload() {
             (0, _addPerformanceMeasures.addPerformanceMeasures)(interaction.start, (0, _toConsumableArray2.default)((finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev']) || []));
           }
           getReactHydrationStats = function getReactHydrationStats() {
-            if (!isPageLoad || !hydration) {
+            if (!hydration) {
               return {};
             }
             return {

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

@@ -696,7 +696,9 @@ function finishInteraction(id, data) {
       data.vc = observer.getVCRawData();
     }
   }
-  data.hydration = (0, _config.getReactHydrationStats)();
+  if (data.type === 'page_load') {
+    data.hydration = (0, _config.getReactHydrationStats)();
+  }
 
   // By this time, stop the post interaction log observer if coinflip rate is 0
   var sanitisedUfoName = (0, _utils.sanitizeUfoName)(data.ufoName);

package/dist/cjs/vc/vc-observer-new/viewport-observer/utils/check-within-component.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.cleanupCaches = cleanupCaches;
 exports.default = checkWithinComponent;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _coinflip = _interopRequireDefault(require("../../../../coinflip"));
 var _checkFiberWithinComponent = _interopRequireDefault(require("./check-fiber-within-component"));
 var _findFiberWithCache = _interopRequireDefault(require("./find-fiber-with-cache"));
-var _findReactFiber = _interopRequireDefault(require("./find-react-fiber"));
 var DEFAULT_MAX_LEVEL = 20;
 
 // Cache cleanup
@@ -37,27 +35,21 @@ function checkWithinComponent(node, targetComponentName, resultCache) {
   }
   var fiber = null;
   var checkedNodes = [];
-  if ((0, _platformFeatureFlags.fg)('platform_ufo_handle_non_react_element_for_3p')) {
-    fiber = (0, _findFiberWithCache.default)(node, DEFAULT_MAX_LEVEL, checkedNodes);
-  } else {
-    fiber = (0, _findReactFiber.default)(node);
-  }
+
+  // Always use cached fiber strategy to handle non-React elements reliably
+  fiber = (0, _findFiberWithCache.default)(node, DEFAULT_MAX_LEVEL, checkedNodes);
   if (!fiber) {
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_handle_non_react_element_for_3p')) {
-      checkedNodes.forEach(function (checkedNode) {
-        resultCache.set(checkedNode, false);
-      });
-    }
+    checkedNodes.forEach(function (checkedNode) {
+      resultCache.set(checkedNode, false);
+    });
     return {
       isWithin: false
     };
   }
   var isWithin = (0, _checkFiberWithinComponent.default)(fiber, targetComponentName, DEFAULT_MAX_LEVEL);
-  if ((0, _platformFeatureFlags.fg)('platform_ufo_handle_non_react_element_for_3p')) {
-    checkedNodes.forEach(function (checkedNode) {
-      resultCache.set(checkedNode, isWithin);
-    });
-  }
+  checkedNodes.forEach(function (checkedNode) {
+    resultCache.set(checkedNode, isWithin);
+  });
   return {
     isWithin: isWithin
   };

package/dist/es2019/create-payload/index.js

@@ -699,7 +699,7 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
     addPerformanceMeasures(interaction.start, [...((finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev']) || [])]);
   }
   const getReactHydrationStats = () => {
-    if (!isPageLoad || !hydration) {
+    if (!hydration) {
       return {};
     }
     return {

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

@@ -614,7 +614,9 @@ function finishInteraction(id, data, endTime = performance.now()) {
       data.vc = observer.getVCRawData();
     }
   }
-  data.hydration = getReactHydrationStats();
+  if (data.type === 'page_load') {
+    data.hydration = getReactHydrationStats();
+  }
 
   // By this time, stop the post interaction log observer if coinflip rate is 0
   const sanitisedUfoName = sanitizeUfoName(data.ufoName);

package/dist/es2019/vc/vc-observer-new/viewport-observer/utils/check-within-component.js

@@ -1,8 +1,6 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../../../../coinflip';
 import checkFiberWithinComponent from './check-fiber-within-component';
 import findFiberWithCache from './find-fiber-with-cache';
-import findReactFiber from './find-react-fiber';
 const DEFAULT_MAX_LEVEL = 20;
 
 // Cache cleanup
@@ -29,27 +27,21 @@ export default function checkWithinComponent(node, targetComponentName, resultCa
   }
   let fiber = null;
   let checkedNodes = [];
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
-  } else {
-    fiber = findReactFiber(node);
-  }
+
+  // Always use cached fiber strategy to handle non-React elements reliably
+  fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
   if (!fiber) {
-    if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-      checkedNodes.forEach(checkedNode => {
-        resultCache.set(checkedNode, false);
-      });
-    }
+    checkedNodes.forEach(checkedNode => {
+      resultCache.set(checkedNode, false);
+    });
     return {
       isWithin: false
     };
   }
   const isWithin = checkFiberWithinComponent(fiber, targetComponentName, DEFAULT_MAX_LEVEL);
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    checkedNodes.forEach(checkedNode => {
-      resultCache.set(checkedNode, isWithin);
-    });
-  }
+  checkedNodes.forEach(checkedNode => {
+    resultCache.set(checkedNode, isWithin);
+  });
   return {
     isWithin
   };

package/dist/esm/create-payload/index.js

@@ -705,7 +705,7 @@ function _createInteractionMetricsPayload() {
             addPerformanceMeasures(interaction.start, _toConsumableArray((finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev']) || []));
           }
           getReactHydrationStats = function getReactHydrationStats() {
-            if (!isPageLoad || !hydration) {
+            if (!hydration) {
               return {};
             }
             return {

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

@@ -650,7 +650,9 @@ function finishInteraction(id, data) {
       data.vc = observer.getVCRawData();
     }
   }
-  data.hydration = getReactHydrationStats();
+  if (data.type === 'page_load') {
+    data.hydration = getReactHydrationStats();
+  }
 
   // By this time, stop the post interaction log observer if coinflip rate is 0
   var sanitisedUfoName = sanitizeUfoName(data.ufoName);

package/dist/esm/vc/vc-observer-new/viewport-observer/utils/check-within-component.js

@@ -1,8 +1,6 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../../../../coinflip';
 import checkFiberWithinComponent from './check-fiber-within-component';
 import findFiberWithCache from './find-fiber-with-cache';
-import findReactFiber from './find-react-fiber';
 var DEFAULT_MAX_LEVEL = 20;
 
 // Cache cleanup
@@ -29,27 +27,21 @@ export default function checkWithinComponent(node, targetComponentName, resultCa
   }
   var fiber = null;
   var checkedNodes = [];
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
-  } else {
-    fiber = findReactFiber(node);
-  }
+
+  // Always use cached fiber strategy to handle non-React elements reliably
+  fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
   if (!fiber) {
-    if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-      checkedNodes.forEach(function (checkedNode) {
-        resultCache.set(checkedNode, false);
-      });
-    }
+    checkedNodes.forEach(function (checkedNode) {
+      resultCache.set(checkedNode, false);
+    });
     return {
       isWithin: false
     };
   }
   var isWithin = checkFiberWithinComponent(fiber, targetComponentName, DEFAULT_MAX_LEVEL);
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    checkedNodes.forEach(function (checkedNode) {
-      resultCache.set(checkedNode, isWithin);
-    });
-  }
+  checkedNodes.forEach(function (checkedNode) {
+    resultCache.set(checkedNode, isWithin);
+  });
   return {
     isWithin: isWithin
   };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.5.2",
+	"version": "4.5.4",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -25,55 +25,6 @@
 	},
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
-	"af:exports": {
-		"./additional-payload": "./src/additional-payload/index.ts",
-		"./bundle-eval-timing": "./src/bundle-eval-timing/index.ts",
-		"./coinflip": "./src/coinflip/index.ts",
-		"./common": "./src/common/index.ts",
-		"./config": "./src/config/index.ts",
-		"./create-experimental-interaction-metrics-payload": "./src/create-experimental-interaction-metrics-payload/index.ts",
-		"./create-payload": "./src/create-payload/index.ts",
-		"./create-post-interaction-log-payload": "./src/create-post-interaction-log-payload/index.ts",
-		"./custom-data": "./src/custom-data/index.ts",
-		"./custom-cohort-data": "./src/custom-cohort-data/index.ts",
-		"./custom-mark": "./src/custom-mark/index.ts",
-		"./custom-spans": "./src/custom-spans/index.ts",
-		"./custom-timings": "./src/custom-timings/index.ts",
-		"./experience-trace-id-context": "./src/experience-trace-id-context/index.ts",
-		"./feature-flags-accessed": "./src/feature-flags-accessed/index.ts",
-		"./generate-id": "./src/generate-id/index.ts",
-		"./global-error-handler": "./src/global-error-handler/index.ts",
-		"./hidden-timing": "./src/hidden-timing/index.ts",
-		"./initial-page-load-extra-timing": "./src/initial-page-load-extra-timing/index.ts",
-		"./interaction-context": "./src/interaction-context/index.ts",
-		"./interaction-id-context": "./src/interaction-id-context/index.ts",
-		"./interaction-ignore": "./src/interaction-ignore/index.ts",
-		"./interaction-metrics": "./src/interaction-metrics/index.ts",
-		"./interaction-metrics-init": "./src/interaction-metrics-init/index.ts",
-		"./label": "./src/label/index.ts",
-		"./load-hold": "./src/load-hold/index.ts",
-		"./placeholder": "./src/placeholder/index.ts",
-		"./resource-timing": "./src/resource-timing/index.ts",
-		"./round-number": "./src/round-number/index.ts",
-		"./route-name": "./src/route-name/index.ts",
-		"./route-name-context": "./src/route-name-context/index.ts",
-		"./segment": "./src/segment/index.ts",
-		"./set-interaction-error": "./src/set-interaction-error/index.ts",
-		"./short-id": "./src/short-id/index.ts",
-		"./ssr": "./src/ssr/index.ts",
-		"./ssr-scripts": "./src/vc/vc-observer/observers/ssr-placeholders/ssr-scripts/index.ts",
-		"./suspense": "./src/suspense/index.ts",
-		"./trace-interaction": "./src/trace-interaction/index.ts",
-		"./trace-pageload": "./src/trace-pageload/index.ts",
-		"./trace-press": "./src/trace-press/index.ts",
-		"./trace-redirect": "./src/trace-redirect/index.ts",
-		"./trace-transition": "./src/trace-transition/index.ts",
-		"./typing-performance-tracing": "./src/typing-performance-tracing/index.ts",
-		"./use-press-tracing": "./src/use-press-tracing/index.ts",
-		"./vc": "./src/vc/index.ts",
-		"./vc-media": "./src/vc/vc-observer/media-wrapper/index.ts",
-		".": "./src/index.ts"
-	},
 	"dependencies": {
 		"@atlaskit/browser-apis": "^0.0.1",
 		"@atlaskit/feature-gate-js-client": "^5.5.0",
@@ -175,9 +126,6 @@
 		"platform_ufo_enable_vc_press_interactions": {
 			"type": "boolean"
 		},
-		"platform_ufo_handle_non_react_element_for_3p": {
-			"type": "boolean"
-		},
 		"platform_ufo_segment_critical_metrics": {
 			"type": "boolean"
 		},