@atlaskit/media-card 79.11.0 → 79.11.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/media-card
 
+## 79.11.2
+
+### Patch Changes
+
+- [`8eb08479e0602`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8eb08479e0602) -
+  Fixes the start time of the interaction relying on the UFO interaction start as opposed to
+  navigationTime and fixed the event emmission for path based routes
+- Updated dependencies
+
+## 79.11.1
+
+### Patch Changes
+
+- [`6a82d7964a37b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6a82d7964a37b) -
+  Icon entrypoint migration
+- Updated dependencies
+
 ## 79.11.0
 
 ### Minor Changes

package/dist/cjs/card/ui/actionsBar/cardActions/cardActionsDropdownMenu.js

@@ -10,7 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
-var _showMoreHorizontalMore = _interopRequireDefault(require("@atlaskit/icon/core/migration/show-more-horizontal--more"));
+var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
 var _dropdownMenu = _interopRequireWildcard(require("@atlaskit/dropdown-menu"));
 var _analytics = require("../../../../utils/analytics");
 var _cardActionButton = require("./cardActionButton");
@@ -80,7 +80,7 @@ var CardActionsDropdownMenu = exports.CardActionsDropdownMenu = function CardAct
             }, createAnalyticsEvent);
             _onClick === null || _onClick === void 0 || _onClick(e);
           }
-        }, providedProps), /*#__PURE__*/_react.default.createElement(_showMoreHorizontalMore.default, {
+        }, providedProps), /*#__PURE__*/_react.default.createElement(_showMoreHorizontal.default, {
           color: "currentColor",
           spacing: "spacious",
           label: "more"

package/dist/cjs/card/ui/tickBox/tickBox.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TickBox = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _checkMarkCheck = _interopRequireDefault(require("@atlaskit/icon/core/migration/check-mark--check"));
+var _checkMark = _interopRequireDefault(require("@atlaskit/icon/core/check-mark"));
 var _tickBoxWrapper = require("./tickBoxWrapper");
 var TickBox = exports.TickBox = function TickBox(_ref) {
   var selected = _ref.selected;
   return /*#__PURE__*/_react.default.createElement(_tickBoxWrapper.TickBoxWrapper, {
     selected: selected
-  }, /*#__PURE__*/_react.default.createElement(_checkMarkCheck.default, {
+  }, /*#__PURE__*/_react.default.createElement(_checkMark.default, {
     color: "currentColor",
     label: "tick",
     size: "small"

package/dist/cjs/card/ui/titleBox/failedTitleBox.js

@@ -10,7 +10,7 @@ require("./failedTitleBox.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
-var _statusWarningEditorWarning = _interopRequireDefault(require("@atlaskit/icon/core/migration/status-warning--editor-warning"));
+var _statusWarning = _interopRequireDefault(require("@atlaskit/icon/core/status-warning"));
 var _mediaUi = require("@atlaskit/media-ui");
 var _colors = require("@atlaskit/theme/colors");
 var _titleBoxComponents = require("./titleBoxComponents");
@@ -21,7 +21,7 @@ var FailedTitleBox = exports.FailedTitleBox = function FailedTitleBox(_ref) {
     customMessage = _ref$customMessage === void 0 ? _mediaUi.messages.failed_to_load : _ref$customMessage;
   return /*#__PURE__*/_react.default.createElement(_titleBoxComponents.TitleBoxWrapper, {
     breakpoint: breakpoint
-  }, /*#__PURE__*/_react.default.createElement(_titleBoxComponents.ErrorMessageWrapper, null, /*#__PURE__*/_react.default.createElement(_statusWarningEditorWarning.default, {
+  }, /*#__PURE__*/_react.default.createElement(_titleBoxComponents.ErrorMessageWrapper, null, /*#__PURE__*/_react.default.createElement(_statusWarning.default, {
     label: 'Warning',
     LEGACY_size: 'small',
     LEGACY_margin: "0 ".concat("var(--ds-space-negative-025, -2px)"),

package/dist/cjs/card/ui/titleBox/titleBox.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.TitleBox = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
-var _lockLockedLockFilled = _interopRequireDefault(require("@atlaskit/icon/core/migration/lock-locked--lock-filled"));
+var _lockLocked = _interopRequireDefault(require("@atlaskit/icon/core/lock-locked"));
 var _truncateText = require("@atlaskit/media-ui/truncateText");
 var _formatDate = require("@atlaskit/media-ui/formatDate");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -38,7 +38,7 @@ var TitleBox = exports.TitleBox = (0, _reactIntlNext.injectIntl)(function (_ref)
     // that can cause a late mutation in the attachments strip view
     ,
     suppressHydrationWarning: (0, _platformFeatureFlags.fg)('jfp-magma-fix-attachments-hydration-error') ? true : false
-  }, createdAt !== undefined && isValidTimestamp(createdAt) ? (0, _formatDate.formatDate)(createdAt, (_intl$locale = intl === null || intl === void 0 ? void 0 : intl.locale) !== null && _intl$locale !== void 0 ? _intl$locale : 'en') : placeholderText), titleBoxIcon === 'LockFilledIcon' && /*#__PURE__*/_react.default.createElement(_titleBoxComponents.TitleBoxIcon, null, /*#__PURE__*/_react.default.createElement(_lockLockedLockFilled.default, {
+  }, createdAt !== undefined && isValidTimestamp(createdAt) ? (0, _formatDate.formatDate)(createdAt, (_intl$locale = intl === null || intl === void 0 ? void 0 : intl.locale) !== null && _intl$locale !== void 0 ? _intl$locale : 'en') : placeholderText), titleBoxIcon === 'LockFilledIcon' && /*#__PURE__*/_react.default.createElement(_titleBoxComponents.TitleBoxIcon, null, /*#__PURE__*/_react.default.createElement(_lockLocked.default, {
     color: "currentColor",
     label: "",
     LEGACY_size: "small",

package/dist/cjs/card/ui/unhandledErrorCard/unhandledErrorCard-compiled.js

@@ -17,7 +17,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _statusWarningEditorWarning = _interopRequireDefault(require("@atlaskit/icon/core/migration/status-warning--editor-warning"));
+var _statusWarning = _interopRequireDefault(require("@atlaskit/icon/core/status-warning"));
 var _colors = require("@atlaskit/theme/colors");
 var _utils = require("../../../utils");
 var _contentLoadingErrorMessage = require("./contentLoadingErrorMessage");
@@ -75,7 +75,7 @@ var UnhandledErrorCard = exports.UnhandledErrorCard = /*#__PURE__*/function (_Co
           "--_1jkcdu5": (0, _runtime.ix)("var(--ds-background-neutral, ".concat(_colors.N20, ")")),
           "--_i2cu7k": (0, _runtime.ix)("var(--ds-text-subtle, ".concat(_colors.N800, ")"))
         })
-      }, /*#__PURE__*/React.createElement(_statusWarningEditorWarning.default, {
+      }, /*#__PURE__*/React.createElement(_statusWarning.default, {
         label: "Error",
         color: "var(--ds-icon-warning, ".concat(_colors.Y500, ")"),
         LEGACY_size: "medium",

package/dist/cjs/inline/mediaInlineAnalyticsErrorBoundary.js

@@ -14,7 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _colors = require("@atlaskit/theme/colors");
-var _statusWarningWarning = _interopRequireDefault(require("@atlaskit/icon/core/migration/status-warning--warning"));
+var _statusWarning = _interopRequireDefault(require("@atlaskit/icon/core/status-warning"));
 var _analytics = require("../utils/analytics");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -68,7 +68,7 @@ var ErrorBoundaryComponent = function ErrorBoundaryComponent(_ref) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     _react.default.createElement("span", {
       style: style
-    }, /*#__PURE__*/_react.default.createElement(_statusWarningWarning.default, {
+    }, /*#__PURE__*/_react.default.createElement(_statusWarning.default, {
       LEGACY_margin: "0 ".concat("var(--ds-space-negative-050, -4px)", " 0 0"),
       label: "error",
       LEGACY_size: "small",

package/dist/cjs/utils/lightCards/errorIcon/index.js

@@ -13,7 +13,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _react2 = require("react");
-var _statusWarningEditorWarning = _interopRequireDefault(require("@atlaskit/icon/core/migration/status-warning--editor-warning"));
+var _statusWarning = _interopRequireDefault(require("@atlaskit/icon/core/status-warning"));
 var _styles = require("./styles");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
@@ -34,7 +34,7 @@ var ErrorIcon = exports.ErrorIcon = /*#__PURE__*/function (_Component) {
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
         (0, _react.jsx)("div", {
           css: _styles.errorIconWrapperStyles
-        }, (0, _react.jsx)(_statusWarningEditorWarning.default, {
+        }, (0, _react.jsx)(_statusWarning.default, {
           color: "currentColor",
           label: "Error",
           LEGACY_size: size

package/dist/cjs/utils/mediaPerformanceObserver/durationMetrics.js

@@ -9,8 +9,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 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 getStartedAt = function getStartedAt(entry, navigationTime) {
-  return entry.startTime - ((navigationTime === null || navigationTime === void 0 ? void 0 : navigationTime.domContentLoadedEventEnd) || 0);
+var getStartedAt = function getStartedAt(entry, interactionStartTime) {
+  return entry.startTime - interactionStartTime;
 };
 var getCommonMetrics = function getCommonMetrics(entry) {
   return {
@@ -85,10 +85,10 @@ var calculateCommonDurations = function calculateCommonDurations(metrics) {
     return [key, end - start];
   }));
 };
-var createMediaDurationMetrics = exports.createMediaDurationMetrics = function createMediaDurationMetrics(entry, navigationTime) {
+var createMediaDurationMetrics = exports.createMediaDurationMetrics = function createMediaDurationMetrics(entry, interactionStartTime) {
   var _entry$serverTiming$f, _entry$serverTiming$f2;
   return _objectSpread(_objectSpread({
-    startedAt: getStartedAt(entry, navigationTime),
+    startedAt: getStartedAt(entry, interactionStartTime),
     /**
      * Performance resource timing data regarding the loading of an
      * application's resources as described in
@@ -141,11 +141,17 @@ var filterCommonMetrics = function filterCommonMetrics(metrics) {
     return !!marks;
   }));
 };
-var createUfoDurationMetrics = exports.createUfoDurationMetrics = function createUfoDurationMetrics(entry, navigationTime) {
+var createUfoDurationMetrics = exports.createUfoDurationMetrics = function createUfoDurationMetrics(entry, interactionStartTime) {
+  // Calculate timing relative to UFO interaction start time
+  // For page_load: interactionStartTime = 0 (relative to page navigation)
+  // For transitions: interactionStartTime = performance.now() when transition started
+  // This ensures metrics work correctly for both initial loads and SPA soft redirects
+  var relativeStartTime = entry.startTime - interactionStartTime;
   return _objectSpread({
     resourceTiming: {
-      start: getStartedAt(entry, navigationTime),
-      end: entry.responseEnd
+      start: relativeStartTime,
+      end: entry.responseEnd,
+      size: entry.transferSize
     }
   }, filterCommonMetrics(getCommonMetrics(entry)));
 };

package/dist/cjs/utils/mediaPerformanceObserver/mediaPerformanceObserver.js

@@ -8,12 +8,17 @@ exports.startResourceObserver = exports.setAnalyticsContext = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/media-common/analytics");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _interactionMetrics = require("@atlaskit/react-ufo/interaction-metrics");
 var _durationMetrics = require("./durationMetrics");
 var _ufo = require("./ufo");
 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 MEDIA_CARD_PERF_STATE_KEY = '__mediaCardPerfState_asflkajsdflja';
-var urlRegex = /https:\/\/(?:media\.(?:dev|staging|prod)\.atl-paas\.net|api\.media\.atlassian\.com|media-cdn(?:\.stg\.|\.)atlassian\.com)\/file\/([^/]+)\/image.*[?&]source=mediaCard/;
+// this should fire around 10% of the time
+var shouldSamplePerfObserver = function shouldSamplePerfObserver() {
+  return Math.random() < 0.1;
+};
+var urlRegex = /(?:https:\/\/(?:media\.(?:dev|staging|prod)\.atl-paas\.net|api\.media\.atlassian\.com|media-cdn(?:\.stg\.|\.)atlassian\.com)\/|media-api\/)file\/([^/]+)\/image.*[?&]source=mediaCard/;
 var clientIdParamRegex = /[?&]clientId=([^&]+)/;
 var ssrParamRegex = /[?&]token=([^&]+)/;
 var createAndGetResourceObserver = function createAndGetResourceObserver() {
@@ -25,11 +30,17 @@ var createAndGetResourceObserver = function createAndGetResourceObserver() {
       var matchClientId = entry.name.match(clientIdParamRegex);
       var matchSSR = entry.name.match(ssrParamRegex);
       if (matchFileId && (_window$MEDIA_CARD_PE = window[MEDIA_CARD_PERF_STATE_KEY]) !== null && _window$MEDIA_CARD_PE !== void 0 && _window$MEDIA_CARD_PE.mediaCardCreateAnalyticsEvent) {
+        var _interaction$start;
         var fileId = matchFileId[1];
         var clientId = matchClientId === null || matchClientId === void 0 ? void 0 : matchClientId[1];
         var ssr = matchSSR ? 'server' : undefined;
-        var navigationTime = performance.getEntriesByType('navigation')[0];
-        var mediaDurationMetrics = (0, _durationMetrics.createMediaDurationMetrics)(entry, navigationTime);
+
+        // Get UFO interaction start time for proper timing in SPAs
+        // For page_load: start = 0 (relative to page navigation)
+        // For transitions: start = performance.now() when transition started
+        var interaction = (0, _interactionMetrics.getActiveInteraction)();
+        var interactionStartTime = (_interaction$start = interaction === null || interaction === void 0 ? void 0 : interaction.start) !== null && _interaction$start !== void 0 ? _interaction$start : 0;
+        var mediaDurationMetrics = (0, _durationMetrics.createMediaDurationMetrics)(entry, interactionStartTime);
         var event = window[MEDIA_CARD_PERF_STATE_KEY].mediaCardCreateAnalyticsEvent({
           eventType: 'operational',
           action: 'succeeded',
@@ -43,9 +54,11 @@ var createAndGetResourceObserver = function createAndGetResourceObserver() {
             }
           }, mediaDurationMetrics)
         });
-        event.fire(_analytics.ANALYTICS_MEDIA_CHANNEL);
+        if (shouldSamplePerfObserver()) {
+          event.fire(_analytics.ANALYTICS_MEDIA_CHANNEL);
+        }
         if ((0, _platformFeatureFlags.fg)('platform_media_card_ufo_network_metrics')) {
-          var ufoDurationMetrics = (0, _durationMetrics.createUfoDurationMetrics)(entry, navigationTime);
+          var ufoDurationMetrics = (0, _durationMetrics.createUfoDurationMetrics)(entry, interactionStartTime);
           var endpointName = 'image';
           (0, _ufo.sendUfoDurationMetrics)(ufoDurationMetrics, endpointName);
         }

package/dist/es2019/card/ui/actionsBar/cardActions/cardActionsDropdownMenu.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
-import MoreIcon from '@atlaskit/icon/core/migration/show-more-horizontal--more';
+import MoreIcon from '@atlaskit/icon/core/show-more-horizontal';
 import DropdownMenu, { DropdownItemGroup, DropdownItem } from '@atlaskit/dropdown-menu';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createAndFireMediaCardEvent, fireMediaCardEvent } from '../../../../utils/analytics';

package/dist/es2019/card/ui/tickBox/tickBox.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import TickIcon from '@atlaskit/icon/core/migration/check-mark--check';
+import TickIcon from '@atlaskit/icon/core/check-mark';
 import { TickBoxWrapper } from './tickBoxWrapper';
 export const TickBox = ({
   selected

package/dist/es2019/card/ui/titleBox/failedTitleBox.js

@@ -3,7 +3,7 @@ import "./failedTitleBox.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
-import EditorWarningIcon from '@atlaskit/icon/core/migration/status-warning--editor-warning';
+import EditorWarningIcon from '@atlaskit/icon/core/status-warning';
 import { messages } from '@atlaskit/media-ui';
 import { R300 } from '@atlaskit/theme/colors';
 import { ErrorMessageWrapper, TitleBoxWrapper } from './titleBoxComponents';

package/dist/es2019/card/ui/titleBox/titleBox.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import LockFilledIcon from '@atlaskit/icon/core/migration/lock-locked--lock-filled';
+import LockFilledIcon from '@atlaskit/icon/core/lock-locked';
 import { Truncate } from '@atlaskit/media-ui/truncateText';
 import { formatDate } from '@atlaskit/media-ui/formatDate';
 import { fg } from '@atlaskit/platform-feature-flags';

package/dist/es2019/card/ui/unhandledErrorCard/unhandledErrorCard-compiled.js

@@ -3,7 +3,7 @@ import "./unhandledErrorCard-compiled.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { Component } from 'react';
-import WarningIcon from '@atlaskit/icon/core/migration/status-warning--editor-warning';
+import WarningIcon from '@atlaskit/icon/core/status-warning';
 import { N20, N800, Y500 } from '@atlaskit/theme/colors';
 import { defaultImageCardDimensions } from '../../../utils';
 import { ContentLoadingErrorMessage } from './contentLoadingErrorMessage';

package/dist/es2019/inline/mediaInlineAnalyticsErrorBoundary.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { B300, R300, N30A, N900 } from '@atlaskit/theme/colors';
-import WarningIcon from '@atlaskit/icon/core/migration/status-warning--warning';
+import WarningIcon from '@atlaskit/icon/core/status-warning';
 import { fireMediaCardEvent } from '../utils/analytics';
 const ErrorBoundaryComponent = ({
   message,

package/dist/es2019/utils/lightCards/errorIcon/index.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { Component } from 'react';
-import WarningIcon from '@atlaskit/icon/core/migration/status-warning--editor-warning';
+import WarningIcon from '@atlaskit/icon/core/status-warning';
 import { errorIconWrapperStyles } from './styles';
 export class ErrorIcon extends Component {
   render() {

package/dist/es2019/utils/mediaPerformanceObserver/durationMetrics.js

@@ -1,4 +1,4 @@
-const getStartedAt = (entry, navigationTime) => entry.startTime - ((navigationTime === null || navigationTime === void 0 ? void 0 : navigationTime.domContentLoadedEventEnd) || 0);
+const getStartedAt = (entry, interactionStartTime) => entry.startTime - interactionStartTime;
 const getCommonMetrics = entry => ({
   tcpHandshakeTime: {
     end: entry.connectEnd,
@@ -67,10 +67,10 @@ const calculateCommonDurations = metrics => Object.fromEntries(Object.entries(me
   } = marks;
   return [key, end - start];
 }));
-export const createMediaDurationMetrics = (entry, navigationTime) => {
+export const createMediaDurationMetrics = (entry, interactionStartTime) => {
   var _entry$serverTiming$f, _entry$serverTiming$f2;
   return {
-    startedAt: getStartedAt(entry, navigationTime),
+    startedAt: getStartedAt(entry, interactionStartTime),
     /**
      * Performance resource timing data regarding the loading of an
      * application's resources as described in
@@ -120,11 +120,17 @@ export const createMediaDurationMetrics = (entry, navigationTime) => {
   };
 };
 const filterCommonMetrics = metrics => Object.fromEntries(Object.entries(metrics).filter(([, marks]) => !!marks));
-export const createUfoDurationMetrics = (entry, navigationTime) => {
+export const createUfoDurationMetrics = (entry, interactionStartTime) => {
+  // Calculate timing relative to UFO interaction start time
+  // For page_load: interactionStartTime = 0 (relative to page navigation)
+  // For transitions: interactionStartTime = performance.now() when transition started
+  // This ensures metrics work correctly for both initial loads and SPA soft redirects
+  const relativeStartTime = entry.startTime - interactionStartTime;
   return {
     resourceTiming: {
-      start: getStartedAt(entry, navigationTime),
-      end: entry.responseEnd
+      start: relativeStartTime,
+      end: entry.responseEnd,
+      size: entry.transferSize
     },
     ...filterCommonMetrics(getCommonMetrics(entry))
   };

package/dist/es2019/utils/mediaPerformanceObserver/mediaPerformanceObserver.js

@@ -1,9 +1,12 @@
 import { ANALYTICS_MEDIA_CHANNEL } from '@atlaskit/media-common/analytics';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { createMediaDurationMetrics, createUfoDurationMetrics } from './durationMetrics';
 import { sendUfoDurationMetrics } from './ufo';
 const MEDIA_CARD_PERF_STATE_KEY = '__mediaCardPerfState_asflkajsdflja';
-const urlRegex = /https:\/\/(?:media\.(?:dev|staging|prod)\.atl-paas\.net|api\.media\.atlassian\.com|media-cdn(?:\.stg\.|\.)atlassian\.com)\/file\/([^/]+)\/image.*[?&]source=mediaCard/;
+// this should fire around 10% of the time
+const shouldSamplePerfObserver = () => Math.random() < 0.1;
+const urlRegex = /(?:https:\/\/(?:media\.(?:dev|staging|prod)\.atl-paas\.net|api\.media\.atlassian\.com|media-cdn(?:\.stg\.|\.)atlassian\.com)\/|media-api\/)file\/([^/]+)\/image.*[?&]source=mediaCard/;
 const clientIdParamRegex = /[?&]clientId=([^&]+)/;
 const ssrParamRegex = /[?&]token=([^&]+)/;
 const createAndGetResourceObserver = () => {
@@ -15,11 +18,17 @@ const createAndGetResourceObserver = () => {
       const matchClientId = entry.name.match(clientIdParamRegex);
       const matchSSR = entry.name.match(ssrParamRegex);
       if (matchFileId && (_window$MEDIA_CARD_PE = window[MEDIA_CARD_PERF_STATE_KEY]) !== null && _window$MEDIA_CARD_PE !== void 0 && _window$MEDIA_CARD_PE.mediaCardCreateAnalyticsEvent) {
+        var _interaction$start;
         const fileId = matchFileId[1];
         const clientId = matchClientId === null || matchClientId === void 0 ? void 0 : matchClientId[1];
         const ssr = matchSSR ? 'server' : undefined;
-        const navigationTime = performance.getEntriesByType('navigation')[0];
-        const mediaDurationMetrics = createMediaDurationMetrics(entry, navigationTime);
+
+        // Get UFO interaction start time for proper timing in SPAs
+        // For page_load: start = 0 (relative to page navigation)
+        // For transitions: start = performance.now() when transition started
+        const interaction = getActiveInteraction();
+        const interactionStartTime = (_interaction$start = interaction === null || interaction === void 0 ? void 0 : interaction.start) !== null && _interaction$start !== void 0 ? _interaction$start : 0;
+        const mediaDurationMetrics = createMediaDurationMetrics(entry, interactionStartTime);
         const event = window[MEDIA_CARD_PERF_STATE_KEY].mediaCardCreateAnalyticsEvent({
           eventType: 'operational',
           action: 'succeeded',
@@ -34,9 +43,11 @@ const createAndGetResourceObserver = () => {
             ...mediaDurationMetrics
           }
         });
-        event.fire(ANALYTICS_MEDIA_CHANNEL);
+        if (shouldSamplePerfObserver()) {
+          event.fire(ANALYTICS_MEDIA_CHANNEL);
+        }
         if (fg('platform_media_card_ufo_network_metrics')) {
-          const ufoDurationMetrics = createUfoDurationMetrics(entry, navigationTime);
+          const ufoDurationMetrics = createUfoDurationMetrics(entry, interactionStartTime);
           const endpointName = 'image';
           sendUfoDurationMetrics(ufoDurationMetrics, endpointName);
         }

package/dist/esm/card/ui/actionsBar/cardActions/cardActionsDropdownMenu.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["triggerRef", "isSelected", "testId", "onClick"];
 import React from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
-import MoreIcon from '@atlaskit/icon/core/migration/show-more-horizontal--more';
+import MoreIcon from '@atlaskit/icon/core/show-more-horizontal';
 import DropdownMenu, { DropdownItemGroup, DropdownItem } from '@atlaskit/dropdown-menu';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createAndFireMediaCardEvent, fireMediaCardEvent } from '../../../../utils/analytics';

package/dist/esm/card/ui/tickBox/tickBox.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import TickIcon from '@atlaskit/icon/core/migration/check-mark--check';
+import TickIcon from '@atlaskit/icon/core/check-mark';
 import { TickBoxWrapper } from './tickBoxWrapper';
 export var TickBox = function TickBox(_ref) {
   var selected = _ref.selected;

package/dist/esm/card/ui/titleBox/failedTitleBox.js

@@ -3,7 +3,7 @@ import "./failedTitleBox.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
-import EditorWarningIcon from '@atlaskit/icon/core/migration/status-warning--editor-warning';
+import EditorWarningIcon from '@atlaskit/icon/core/status-warning';
 import { messages } from '@atlaskit/media-ui';
 import { R300 } from '@atlaskit/theme/colors';
 import { ErrorMessageWrapper, TitleBoxWrapper } from './titleBoxComponents';

package/dist/esm/card/ui/titleBox/titleBox.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import LockFilledIcon from '@atlaskit/icon/core/migration/lock-locked--lock-filled';
+import LockFilledIcon from '@atlaskit/icon/core/lock-locked';
 import { Truncate } from '@atlaskit/media-ui/truncateText';
 import { formatDate } from '@atlaskit/media-ui/formatDate';
 import { fg } from '@atlaskit/platform-feature-flags';

package/dist/esm/card/ui/unhandledErrorCard/unhandledErrorCard-compiled.js

@@ -13,7 +13,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { Component } from 'react';
-import WarningIcon from '@atlaskit/icon/core/migration/status-warning--editor-warning';
+import WarningIcon from '@atlaskit/icon/core/status-warning';
 import { N20, N800, Y500 } from '@atlaskit/theme/colors';
 import { defaultImageCardDimensions } from '../../../utils';
 import { ContentLoadingErrorMessage } from './contentLoadingErrorMessage';

package/dist/esm/inline/mediaInlineAnalyticsErrorBoundary.js

@@ -11,7 +11,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { B300, R300, N30A, N900 } from '@atlaskit/theme/colors';
-import WarningIcon from '@atlaskit/icon/core/migration/status-warning--warning';
+import WarningIcon from '@atlaskit/icon/core/status-warning';
 import { fireMediaCardEvent } from '../utils/analytics';
 var ErrorBoundaryComponent = function ErrorBoundaryComponent(_ref) {
   var message = _ref.message,

package/dist/esm/utils/lightCards/errorIcon/index.js

@@ -13,7 +13,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { Component } from 'react';
-import WarningIcon from '@atlaskit/icon/core/migration/status-warning--editor-warning';
+import WarningIcon from '@atlaskit/icon/core/status-warning';
 import { errorIconWrapperStyles } from './styles';
 export var ErrorIcon = /*#__PURE__*/function (_Component) {
   function ErrorIcon() {

package/dist/esm/utils/mediaPerformanceObserver/durationMetrics.js

@@ -2,8 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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) { _defineProperty(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 getStartedAt = function getStartedAt(entry, navigationTime) {
-  return entry.startTime - ((navigationTime === null || navigationTime === void 0 ? void 0 : navigationTime.domContentLoadedEventEnd) || 0);
+var getStartedAt = function getStartedAt(entry, interactionStartTime) {
+  return entry.startTime - interactionStartTime;
 };
 var getCommonMetrics = function getCommonMetrics(entry) {
   return {
@@ -78,10 +78,10 @@ var calculateCommonDurations = function calculateCommonDurations(metrics) {
     return [key, end - start];
   }));
 };
-export var createMediaDurationMetrics = function createMediaDurationMetrics(entry, navigationTime) {
+export var createMediaDurationMetrics = function createMediaDurationMetrics(entry, interactionStartTime) {
   var _entry$serverTiming$f, _entry$serverTiming$f2;
   return _objectSpread(_objectSpread({
-    startedAt: getStartedAt(entry, navigationTime),
+    startedAt: getStartedAt(entry, interactionStartTime),
     /**
      * Performance resource timing data regarding the loading of an
      * application's resources as described in
@@ -134,11 +134,17 @@ var filterCommonMetrics = function filterCommonMetrics(metrics) {
     return !!marks;
   }));
 };
-export var createUfoDurationMetrics = function createUfoDurationMetrics(entry, navigationTime) {
+export var createUfoDurationMetrics = function createUfoDurationMetrics(entry, interactionStartTime) {
+  // Calculate timing relative to UFO interaction start time
+  // For page_load: interactionStartTime = 0 (relative to page navigation)
+  // For transitions: interactionStartTime = performance.now() when transition started
+  // This ensures metrics work correctly for both initial loads and SPA soft redirects
+  var relativeStartTime = entry.startTime - interactionStartTime;
   return _objectSpread({
     resourceTiming: {
-      start: getStartedAt(entry, navigationTime),
-      end: entry.responseEnd
+      start: relativeStartTime,
+      end: entry.responseEnd,
+      size: entry.transferSize
     }
   }, filterCommonMetrics(getCommonMetrics(entry)));
 };

package/dist/esm/utils/mediaPerformanceObserver/mediaPerformanceObserver.js

@@ -3,10 +3,15 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import { ANALYTICS_MEDIA_CHANNEL } from '@atlaskit/media-common/analytics';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { createMediaDurationMetrics, createUfoDurationMetrics } from './durationMetrics';
 import { sendUfoDurationMetrics } from './ufo';
 var MEDIA_CARD_PERF_STATE_KEY = '__mediaCardPerfState_asflkajsdflja';
-var urlRegex = /https:\/\/(?:media\.(?:dev|staging|prod)\.atl-paas\.net|api\.media\.atlassian\.com|media-cdn(?:\.stg\.|\.)atlassian\.com)\/file\/([^/]+)\/image.*[?&]source=mediaCard/;
+// this should fire around 10% of the time
+var shouldSamplePerfObserver = function shouldSamplePerfObserver() {
+  return Math.random() < 0.1;
+};
+var urlRegex = /(?:https:\/\/(?:media\.(?:dev|staging|prod)\.atl-paas\.net|api\.media\.atlassian\.com|media-cdn(?:\.stg\.|\.)atlassian\.com)\/|media-api\/)file\/([^/]+)\/image.*[?&]source=mediaCard/;
 var clientIdParamRegex = /[?&]clientId=([^&]+)/;
 var ssrParamRegex = /[?&]token=([^&]+)/;
 var createAndGetResourceObserver = function createAndGetResourceObserver() {
@@ -18,11 +23,17 @@ var createAndGetResourceObserver = function createAndGetResourceObserver() {
       var matchClientId = entry.name.match(clientIdParamRegex);
       var matchSSR = entry.name.match(ssrParamRegex);
       if (matchFileId && (_window$MEDIA_CARD_PE = window[MEDIA_CARD_PERF_STATE_KEY]) !== null && _window$MEDIA_CARD_PE !== void 0 && _window$MEDIA_CARD_PE.mediaCardCreateAnalyticsEvent) {
+        var _interaction$start;
         var fileId = matchFileId[1];
         var clientId = matchClientId === null || matchClientId === void 0 ? void 0 : matchClientId[1];
         var ssr = matchSSR ? 'server' : undefined;
-        var navigationTime = performance.getEntriesByType('navigation')[0];
-        var mediaDurationMetrics = createMediaDurationMetrics(entry, navigationTime);
+
+        // Get UFO interaction start time for proper timing in SPAs
+        // For page_load: start = 0 (relative to page navigation)
+        // For transitions: start = performance.now() when transition started
+        var interaction = getActiveInteraction();
+        var interactionStartTime = (_interaction$start = interaction === null || interaction === void 0 ? void 0 : interaction.start) !== null && _interaction$start !== void 0 ? _interaction$start : 0;
+        var mediaDurationMetrics = createMediaDurationMetrics(entry, interactionStartTime);
         var event = window[MEDIA_CARD_PERF_STATE_KEY].mediaCardCreateAnalyticsEvent({
           eventType: 'operational',
           action: 'succeeded',
@@ -36,9 +47,11 @@ var createAndGetResourceObserver = function createAndGetResourceObserver() {
             }
           }, mediaDurationMetrics)
         });
-        event.fire(ANALYTICS_MEDIA_CHANNEL);
+        if (shouldSamplePerfObserver()) {
+          event.fire(ANALYTICS_MEDIA_CHANNEL);
+        }
         if (fg('platform_media_card_ufo_network_metrics')) {
-          var ufoDurationMetrics = createUfoDurationMetrics(entry, navigationTime);
+          var ufoDurationMetrics = createUfoDurationMetrics(entry, interactionStartTime);
           var endpointName = 'image';
           sendUfoDurationMetrics(ufoDurationMetrics, endpointName);
         }

package/dist/types/utils/mediaPerformanceObserver/durationMetrics.d.ts

@@ -5,7 +5,7 @@ export type UfoDurationMetrics = Record<string, {
     end?: number;
     size?: number;
 }>;
-export declare const createMediaDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, navigationTime: PerformanceNavigationTiming | undefined) => {
+export declare const createMediaDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, interactionStartTime: number) => {
     /**
      * The user agent string for the current browser
      * Read more: https://developer.mozilla.org/en-US/docs/Web/API/Navigator/userAgent
@@ -40,4 +40,4 @@ export declare const createMediaDurationMetrics: (entry: ExperimentalPerformance
     browserCacheHit: boolean;
     nextHopProtocol: string;
 };
-export declare const createUfoDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, navigationTime: PerformanceNavigationTiming | undefined) => UfoDurationMetrics;
+export declare const createUfoDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, interactionStartTime: number) => UfoDurationMetrics;

package/dist/types-ts4.5/utils/mediaPerformanceObserver/durationMetrics.d.ts

@@ -5,7 +5,7 @@ export type UfoDurationMetrics = Record<string, {
     end?: number;
     size?: number;
 }>;
-export declare const createMediaDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, navigationTime: PerformanceNavigationTiming | undefined) => {
+export declare const createMediaDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, interactionStartTime: number) => {
     /**
      * The user agent string for the current browser
      * Read more: https://developer.mozilla.org/en-US/docs/Web/API/Navigator/userAgent
@@ -40,4 +40,4 @@ export declare const createMediaDurationMetrics: (entry: ExperimentalPerformance
     browserCacheHit: boolean;
     nextHopProtocol: string;
 };
-export declare const createUfoDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, navigationTime: PerformanceNavigationTiming | undefined) => UfoDurationMetrics;
+export declare const createUfoDurationMetrics: (entry: ExperimentalPerformanceResourceTiming, interactionStartTime: number) => UfoDurationMetrics;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-card",
-	"version": "79.11.0",
+	"version": "79.11.2",
 	"description": "Includes all media card related components, CardView, CardViewSmall, Card...",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -34,7 +34,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
-		"@atlaskit/icon": "^29.2.0",
+		"@atlaskit/icon": "^29.3.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/media-client": "^35.7.0",
 		"@atlaskit/media-client-react": "^4.1.0",
@@ -44,11 +44,11 @@
 		"@atlaskit/media-ui": "^28.7.0",
 		"@atlaskit/media-viewer": "^52.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^16.4.0",
+		"@atlaskit/primitives": "^17.0.0",
 		"@atlaskit/react-ufo": "^4.16.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tokens": "^8.6.0",
+		"@atlaskit/tokens": "^9.0.0",
 		"@atlaskit/tooltip": "^20.11.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -71,8 +71,8 @@
 		"@af/integration-testing": "workspace:^",
 		"@atlaskit/analytics-listeners": "^9.1.0",
 		"@atlaskit/analytics-namespaced-context": "^7.2.0",
-		"@atlaskit/form": "^15.0.0",
-		"@atlaskit/inline-message": "^15.4.0",
+		"@atlaskit/form": "^15.2.0",
+		"@atlaskit/inline-message": "^15.5.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-picker": "^70.1.0",
 		"@atlaskit/media-state": "^1.8.0",