@atlaskit/react-ufo 4.13.1 → 4.14.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.14.1
+
+### Patch Changes
+
+- [`1cd3b31cac6ef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1cd3b31cac6ef) -
+  FG cleanup - platform_ufo_ssr_placeholders_for_display_contents
+
+## 4.14.0
+
+### Minor Changes
+
+- [`55c867098e0ab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/55c867098e0ab) -
+  Added battery info and webdriver
+
 ## 4.13.1
 
 ### Patch Changes

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

@@ -35,6 +35,7 @@ var ssr = _interopRequireWildcard(require("../ssr"));
 var _utils = require("./common/utils");
 var _criticalMetricsPayload = require("./critical-metrics-payload");
 var _addPerformanceMeasures = require("./utils/add-performance-measures");
+var _getBatteryInfo = require("./utils/get-battery-info");
 var _getBrowserMetadata = require("./utils/get-browser-metadata");
 var _getInteractionStatus = _interopRequireDefault(require("./utils/get-interaction-status"));
 var _getMoreAccuratePageVisibilityUpToTtai = require("./utils/get-more-accurate-page-visibility-up-to-ttai");
@@ -397,7 +398,7 @@ function createInteractionMetricsPayload(_x, _x2, _x3, _x4, _x5) {
 function _createInteractionMetricsPayload() {
   _createInteractionMetricsPayload = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(interaction, interactionId, experimental, criticalPayloadCount, vcMetrics) {
     var _window$location, _config$additionalPay;
-    var interactionPayloadStart, config, end, start, ufoName, knownSegments, rate, type, abortReason, routeName, featureFlags, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, responsiveness, unknownElementName, unknownElementHierarchy, hydration, pageVisibilityAtTTI, pageVisibilityAtTTAI, segments, segmentTree, isDetailedPayload, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTI, moreAccuratePageVisibilityAtTTAI, labelStack, getInitialPageLoadSSRMetrics, pageLoadInteractionMetrics, getDetailedInteractionMetrics, getPageLoadDetailedInteractionMetrics, newUFOName, resourceTimings, _yield$Promise$all, _yield$Promise$all2, finalVCMetrics, experimentalMetrics, paintMetrics, getReactHydrationStats, payload;
+    var interactionPayloadStart, config, end, start, ufoName, knownSegments, rate, type, abortReason, routeName, featureFlags, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, responsiveness, unknownElementName, unknownElementHierarchy, hydration, pageVisibilityAtTTI, pageVisibilityAtTTAI, segments, segmentTree, isDetailedPayload, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTI, moreAccuratePageVisibilityAtTTAI, labelStack, getInitialPageLoadSSRMetrics, pageLoadInteractionMetrics, getDetailedInteractionMetrics, getPageLoadDetailedInteractionMetrics, newUFOName, resourceTimings, _yield$Promise$all, _yield$Promise$all2, finalVCMetrics, experimentalMetrics, paintMetrics, batteryInfo, getReactHydrationStats, payload;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -510,15 +511,17 @@ function _createInteractionMetricsPayload() {
           _context.t2 = _context.t1;
           _context.t3 = experimental ? (0, _createExperimentalInteractionMetricsPayload.getExperimentalVCMetrics)(interaction) : Promise.resolve(undefined);
           _context.t4 = (0, _getPaintMetrics.getPaintMetricsToLegacyFormat)(type, end);
-          _context.t5 = [_context.t2, _context.t3, _context.t4];
-          _context.next = 34;
-          return _context.t0.all.call(_context.t0, _context.t5);
-        case 34:
+          _context.t5 = (0, _getBatteryInfo.getBatteryInfoToLegacyFormat)();
+          _context.t6 = [_context.t2, _context.t3, _context.t4, _context.t5];
+          _context.next = 35;
+          return _context.t0.all.call(_context.t0, _context.t6);
+        case 35:
           _yield$Promise$all = _context.sent;
-          _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 3);
+          _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 4);
           finalVCMetrics = _yield$Promise$all2[0];
           experimentalMetrics = _yield$Promise$all2[1];
           paintMetrics = _yield$Promise$all2[2];
+          batteryInfo = _yield$Promise$all2[3];
           if (!experimental) {
             (0, _addPerformanceMeasures.addPerformanceMeasures)(interaction.start, (0, _toConsumableArray2.default)((finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev']) || []));
           }
@@ -537,7 +540,7 @@ function _createInteractionMetricsPayload() {
             source: 'measured',
             tags: ['observability'],
             attributes: {
-              properties: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+              properties: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 // basic
                 'event:hostname': ((_window$location = window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname) || 'unknown',
                 'event:product': config.product,
@@ -556,7 +559,7 @@ function _createInteractionMetricsPayload() {
               }, criticalPayloadCount !== undefined ? {
                 'ufo:multipayload': true,
                 'ufo:criticalPayloadCount': criticalPayloadCount
-              } : {}), (0, _getBrowserMetadata.getBrowserMetadataToLegacyFormat)()), getSSRProperties(type)), getAssetsMetrics(interaction, pageLoadInteractionMetrics === null || pageLoadInteractionMetrics === void 0 ? void 0 : pageLoadInteractionMetrics.SSRDoneTime)), getPPSMetrics(interaction)), paintMetrics), (0, _getNavigationMetrics.getNavigationMetricsToLegacyFormat)(type)), finalVCMetrics), experimentalMetrics), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), getReactHydrationStats()), {}, {
+              } : {}), (0, _getBrowserMetadata.getBrowserMetadataToLegacyFormat)()), batteryInfo), getSSRProperties(type)), getAssetsMetrics(interaction, pageLoadInteractionMetrics === null || pageLoadInteractionMetrics === void 0 ? void 0 : pageLoadInteractionMetrics.SSRDoneTime)), getPPSMetrics(interaction)), paintMetrics), (0, _getNavigationMetrics.getNavigationMetricsToLegacyFormat)(type)), finalVCMetrics), experimentalMetrics), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), getReactHydrationStats()), {}, {
                 interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                   namePrefix: config.namePrefix || '',
                   segmentPrefix: config.segmentPrefix || '',
@@ -603,7 +606,7 @@ function _createInteractionMetricsPayload() {
           }
           payload.attributes.properties['event:sizeInKb'] = (0, _getPayloadSize.default)(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 45:
+        case 47:
         case "end":
           return _context.stop();
       }

package/dist/cjs/create-payload/utils/get-battery-info.js

@@ -0,0 +1,97 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getBatteryInfo;
+exports.getBatteryInfoToLegacyFormat = getBatteryInfoToLegacyFormat;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+// Type definitions for battery info
+// Main function returns compact nested format
+function getBatteryInfo() {
+  return _getBatteryInfo.apply(this, arguments);
+} // Helper function to get battery info in legacy colon format for backward compatibility
+function _getBatteryInfo() {
+  _getBatteryInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var battery;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if ((0, _platformFeatureFlags.fg)('react_ufo_battery_info')) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return", {});
+        case 2:
+          if (!(typeof navigator === 'undefined')) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return", {});
+        case 4:
+          _context.prev = 4;
+          if (!('getBattery' in navigator)) {
+            _context.next = 11;
+            break;
+          }
+          _context.next = 8;
+          return navigator.getBattery();
+        case 8:
+          battery = _context.sent;
+          if (!(battery && typeof battery.level === 'number' && typeof battery.charging === 'boolean')) {
+            _context.next = 11;
+            break;
+          }
+          return _context.abrupt("return", {
+            level: Math.round(battery.level * 100) / 100,
+            // Round to 0.01
+            charging: battery.charging
+          });
+        case 11:
+          _context.next = 15;
+          break;
+        case 13:
+          _context.prev = 13;
+          _context.t0 = _context["catch"](4);
+        case 15:
+          return _context.abrupt("return", {});
+        case 16:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[4, 13]]);
+  }));
+  return _getBatteryInfo.apply(this, arguments);
+}
+function getBatteryInfoToLegacyFormat() {
+  return _getBatteryInfoToLegacyFormat.apply(this, arguments);
+}
+function _getBatteryInfoToLegacyFormat() {
+  _getBatteryInfoToLegacyFormat = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+    var battery, legacyFormat;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return getBatteryInfo();
+        case 2:
+          battery = _context2.sent;
+          legacyFormat = {};
+          if (battery.level !== undefined) {
+            legacyFormat['event:battery:level'] = battery.level;
+          }
+          if (battery.charging !== undefined) {
+            legacyFormat['event:battery:charging'] = battery.charging;
+          }
+          return _context2.abrupt("return", legacyFormat);
+        case 7:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _getBatteryInfoToLegacyFormat.apply(this, arguments);
+}

package/dist/cjs/vc/vc-observer/observers/ssr-placeholders/index.js

@@ -8,7 +8,6 @@ exports.SSRPlaceholderHandlers = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var ANCESTOR_LOOKUP_LIMIT = 10;
 var PAGE_LAYOUT_ID = 'page-layout.root';
 var SSRPlaceholderHandlers = exports.SSRPlaceholderHandlers = /*#__PURE__*/function () {
@@ -291,45 +290,40 @@ var SSRPlaceholderHandlers = exports.SSRPlaceholderHandlers = /*#__PURE__*/funct
   }, {
     key: "getEffectiveBoundingRect",
     value: function getEffectiveBoundingRect(el) {
-      var enableDisplayContentsSupport = (0, _platformFeatureFlags.fg)('platform_ufo_ssr_placeholders_for_display_contents');
+      var computedStyle = window.getComputedStyle(el);
 
-      // Only handle display: contents if feature flag is enabled
-      if (enableDisplayContentsSupport) {
-        var computedStyle = window.getComputedStyle(el);
+      // If element has display: contents, collect bounding rect from children
+      if (computedStyle.display === 'contents') {
+        var children = Array.from(el.children);
+        if (children.length === 0) {
+          // No children, return zero rect
+          return new DOMRect(0, 0, 0, 0);
+        }
 
-        // If element has display: contents, collect bounding rect from children
-        if (computedStyle.display === 'contents') {
-          var children = Array.from(el.children);
-          if (children.length === 0) {
-            // No children, return zero rect
-            return new DOMRect(0, 0, 0, 0);
+        // Calculate union of all children's bounding rects
+        var minX = Infinity;
+        var minY = Infinity;
+        var maxX = -Infinity;
+        var maxY = -Infinity;
+        children.forEach(function (child) {
+          var childRect = child.getBoundingClientRect();
+          // Skip children with zero dimensions (likely also display: contents)
+          if (childRect.width > 0 || childRect.height > 0) {
+            minX = Math.min(minX, childRect.left);
+            minY = Math.min(minY, childRect.top);
+            maxX = Math.max(maxX, childRect.right);
+            maxY = Math.max(maxY, childRect.bottom);
           }
+        });
 
-          // Calculate union of all children's bounding rects
-          var minX = Infinity;
-          var minY = Infinity;
-          var maxX = -Infinity;
-          var maxY = -Infinity;
-          children.forEach(function (child) {
-            var childRect = child.getBoundingClientRect();
-            // Skip children with zero dimensions (likely also display: contents)
-            if (childRect.width > 0 || childRect.height > 0) {
-              minX = Math.min(minX, childRect.left);
-              minY = Math.min(minY, childRect.top);
-              maxX = Math.max(maxX, childRect.right);
-              maxY = Math.max(maxY, childRect.bottom);
-            }
-          });
-
-          // If no children with dimensions found, return zero rect
-          if (minX === Infinity) {
-            return new DOMRect(0, 0, 0, 0);
-          }
-          return new DOMRect(minX, minY, maxX - minX, maxY - minY);
+        // If no children with dimensions found, return zero rect
+        if (minX === Infinity) {
+          return new DOMRect(0, 0, 0, 0);
         }
+        return new DOMRect(minX, minY, maxX - minX, maxY - minY);
       }
 
-      // Normal element or feature flag disabled, return its bounding rect
+      // Normal element, return its bounding rect
       return el.getBoundingClientRect();
     }
   }, {

package/dist/cjs/vc/vc-observer/observers/ssr-placeholders/ssr-scripts/collectSSRPlaceholderDimensions.js

@@ -4,34 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.collectSSRPlaceholderDimensions = collectSSRPlaceholderDimensions;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // lightweight script to scan the SSR response and collect all elements with data-ssr-placeholder attribute
 // and save their size/positions in a map __SSR_PLACEHOLDERS_DIMENSIONS__ on the Window object. Each placeholderId is
 // unique and maps to its corresponding elements bounding client rectangle dimensions.
 function collectSSRPlaceholderDimensions(document, window) {
   var enablePageLayoutPlaceholder = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var enableDisplayContentsSupport = (0, _platformFeatureFlags.fg)('platform_ufo_ssr_placeholders_for_display_contents');
   var ssrPlaceholders = document === null || document === void 0 ? void 0 : document.querySelectorAll('[data-ssr-placeholder]');
   ssrPlaceholders.forEach(function (elem) {
     var placeholderId = elem.getAttribute('data-ssr-placeholder');
     if (placeholderId) {
       window.__SSR_PLACEHOLDERS_DIMENSIONS__ = window.__SSR_PLACEHOLDERS_DIMENSIONS__ || {};
-      if (enableDisplayContentsSupport) {
-        window.__SSR_PLACEHOLDERS_DIMENSIONS__[placeholderId] = getEffectiveBoundingRect(elem, window);
-      } else {
-        window.__SSR_PLACEHOLDERS_DIMENSIONS__[placeholderId] = elem.getBoundingClientRect();
-      }
+      window.__SSR_PLACEHOLDERS_DIMENSIONS__[placeholderId] = getEffectiveBoundingRect(elem, window);
     }
   });
   if (enablePageLayoutPlaceholder) {
     var pageLayoutRoot = document === null || document === void 0 ? void 0 : document.getElementById('unsafe-design-system-page-layout-root');
     if (pageLayoutRoot) {
       window.__SSR_PLACEHOLDERS_DIMENSIONS__ = window.__SSR_PLACEHOLDERS_DIMENSIONS__ || {};
-      if (enableDisplayContentsSupport) {
-        window.__SSR_PLACEHOLDERS_DIMENSIONS__['page-layout.root'] = getEffectiveBoundingRect(pageLayoutRoot, window);
-      } else {
-        window.__SSR_PLACEHOLDERS_DIMENSIONS__['page-layout.root'] = pageLayoutRoot.getBoundingClientRect();
-      }
+      window.__SSR_PLACEHOLDERS_DIMENSIONS__['page-layout.root'] = getEffectiveBoundingRect(pageLayoutRoot, window);
     }
   }
 }