@atlaskit/mention 30.1.7 → 30.1.9

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/mention
 
+## 30.1.9
+
+### Patch Changes
+
+- [`7375271ebdd21`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7375271ebdd21) -
+  Add an explicit error fallback to the mention UFO boundary while preserving retries on parent
+  updates and UFO failure reporting.
+
+  Replace mention analytics HOCs with hook wrappers while preserving event decoration and forwarded
+  refs.
+
+  Use the scoped React.JSX namespace for element type annotations.
+
+## 30.1.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 30.1.7
 
 ### Patch Changes

package/dist/cjs/api/MentionResource.js

@@ -38,7 +38,7 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
-var _utilServiceSupport = require("@atlaskit/util-service-support");
+var _constants = require("@atlaskit/util-service-support/constants");
 var _isAppMention = require("../is-app-mention");
 var _isTeamMention = require("../is-team-mention");
 var _types = require("../types");
@@ -287,7 +287,7 @@ var MentionResource = exports.MentionResource = /*#__PURE__*/function (_Abstract
               });
               _context2.prev = 1;
               _context2.next = 2;
-              return _utilServiceSupport.utils.requestService(this.config, options);
+              return _constants.utils.requestService(this.config, options);
             case 2:
               result = _context2.sent;
               this._notifyAnalyticsListeners(_analytics.SLI_EVENT_TYPE, _types.SliNames.INITIAL_STATE, _types.Actions.SUCCEEDED);
@@ -337,7 +337,7 @@ var MentionResource = exports.MentionResource = /*#__PURE__*/function (_Abstract
               });
               _context3.prev = 1;
               _context3.next = 2;
-              return _utilServiceSupport.utils.requestService(this.config, options);
+              return _constants.utils.requestService(this.config, options);
             case 2:
               result = _context3.sent;
               this._notifyAnalyticsListeners(_analytics.SLI_EVENT_TYPE, _types.SliNames.SEARCH, _types.Actions.SUCCEEDED);

package/dist/cjs/api/TeamMentionResource.js

@@ -15,7 +15,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _utilServiceSupport = require("@atlaskit/util-service-support");
+var _constants = require("@atlaskit/util-service-support/constants");
 var _types = require("../types");
 var _logger = _interopRequireDefault(require("../util/logger"));
 var _analytics = require("./../util/analytics");
@@ -84,7 +84,7 @@ var TeamMentionResource = exports.default = /*#__PURE__*/function (_MentionResou
                   headers: configHeaders
                 }
               });
-              getTeamsPromise = _utilServiceSupport.utils.requestService(this.teamMentionConfig, options);
+              getTeamsPromise = _constants.utils.requestService(this.teamMentionConfig, options);
               this.handleBothRequests(emptyQuery, getUserPromise, getTeamsPromise);
             case 1:
             case "end":
@@ -237,7 +237,7 @@ var TeamMentionResource = exports.default = /*#__PURE__*/function (_MentionResou
               });
               _context3.prev = 1;
               _context3.next = 2;
-              return _utilServiceSupport.utils.requestService(this.teamMentionConfig, options);
+              return _constants.utils.requestService(this.teamMentionConfig, options);
             case 2:
               teamResult = _context3.sent;
               this._notifyAnalyticsListeners(_analytics.SLI_EVENT_TYPE, _types.SliNames.SEARCH_TEAM, _types.Actions.SUCCEEDED);

package/dist/cjs/components/Mention/index.js

@@ -18,16 +18,14 @@ Object.defineProperty(exports, "UNKNOWN_USER_ID", {
   }
 });
 exports.default = void 0;
-var _withAnalyticsEvents = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsEvents"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireDefault(require("react"));
+var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
+var _usePatchedProps2 = require("@atlaskit/analytics-next/usePatchedProps");
 var _fireAnalyticsMentionEvent = require("../../util/fire-analytics-mention-event");
 var _MentionInternal = require("./MentionInternal");
 var _constants = require("../../_constants");
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
-/**
- * @jsxRuntime classic
- * @jsx jsx
- * @jsxFrag React.Fragment
- */
 /* eslint-disable @atlaskit/design-system/no-deprecated-imports, @typescript-eslint/no-restricted-types -- Preserve existing mention implementation while focus-ring usage is reviewed separately. */
 
 var ANALYTICS_HOVER_DELAY = exports.ANALYTICS_HOVER_DELAY = 1000;
@@ -36,7 +34,7 @@ var ANALYTICS_HOVER_DELAY = exports.ANALYTICS_HOVER_DELAY = 1000;
  * @deprecated Use `import { UNKNOWN_USER_ID } from '@atlaskit/mention/constants'` instead.
  */
 
-var MentionWithAnalytics = (0, _withAnalyticsEvents.default)({
+var mentionEventMap = {
   onClick: function onClick(createEvent, props) {
     var id = props.id,
       text = props.text,
@@ -51,10 +49,21 @@ var MentionWithAnalytics = (0, _withAnalyticsEvents.default)({
     var event = (0, _fireAnalyticsMentionEvent.fireAnalyticsMentionEvent)(createEvent)('mention', 'hovered', text, id, accessLevel);
     return event;
   }
-})(_MentionInternal.MentionInternal);
+};
 
 // oxlint-disable-next-line eslint/no-redeclare
-var Mention = MentionWithAnalytics;
+var Mention = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  // Keep the existing event decoration, including the analytics argument passed to callbacks.
+  var _usePatchedProps = (0, _usePatchedProps2.usePatchedProps)(mentionEventMap, props),
+    patchedEventProps = _usePatchedProps.patchedEventProps;
+  return /*#__PURE__*/_react.default.createElement(_MentionInternal.MentionInternal, (0, _extends2.default)({}, props, patchedEventProps, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+Mention.displayName = 'Mention';
 var _default = exports.default = Mention;
 /**
  * @deprecated Use `import { MentionInternal } from '@atlaskit/mention/mention'` instead.

package/dist/cjs/components/Mention/ufoExperiences.js

@@ -10,6 +10,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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _concurrentExperience = require("@atlaskit/ufo/concurrent-experience");
 var _experienceTypes = require("@atlaskit/ufo/experience-types");
@@ -24,8 +25,17 @@ var mentionRenderedUfoExperience = exports.mentionRenderedUfoExperience = new _c
 });
 var UfoErrorBoundary = exports.UfoErrorBoundary = /*#__PURE__*/function (_React$Component) {
   function UfoErrorBoundary() {
+    var _this;
     (0, _classCallCheck2.default)(this, UfoErrorBoundary);
-    return _callSuper(this, UfoErrorBoundary, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, UfoErrorBoundary, [].concat(args));
+    (0, _defineProperty2.default)(_this, "state", {
+      hasError: false,
+      previousProps: _this.props
+    });
+    return _this;
   }
   (0, _inherits2.default)(UfoErrorBoundary, _React$Component);
   return (0, _createClass2.default)(UfoErrorBoundary, [{
@@ -36,7 +46,24 @@ var UfoErrorBoundary = exports.UfoErrorBoundary = /*#__PURE__*/function (_React$
   }, {
     key: "render",
     value: function render() {
-      return this.props.children;
+      return this.state.hasError ? null : this.props.children;
+    }
+  }], [{
+    key: "getDerivedStateFromProps",
+    value: function getDerivedStateFromProps(props, state) {
+      // Preserve the original boundary's retry on parent updates, even when children are memoized.
+      // Error recovery uses the same props, so it must retain the fallback instead of retrying.
+      return props !== state.previousProps ? {
+        hasError: false,
+        previousProps: props
+      } : null;
+    }
+  }, {
+    key: "getDerivedStateFromError",
+    value: function getDerivedStateFromError() {
+      return {
+        hasError: true
+      };
     }
   }]);
 }(_react.default.Component);

package/dist/cjs/components/MentionListError/index.js

@@ -12,11 +12,15 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _react = _interopRequireDefault(require("react"));
 var _heading = _interopRequireDefault(require("@atlaskit/heading/heading"));
-var _primitives = require("@atlaskit/primitives");
+var _stack = require("@atlaskit/primitives/stack");
+var _text = require("@atlaskit/primitives/text");
+var _xcss = require("@atlaskit/primitives/xcss/xcss");
 var _i18n = require("../../util/i18n");
 var _GenericErrorIllustration = require("./GenericErrorIllustration");
 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; })(); } // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 var advisedActionMessages = {
   '401': _i18n.LoginAgain,
   '403': _i18n.DifferentText,
@@ -33,17 +37,17 @@ var MentionListError = exports.default = /*#__PURE__*/function (_React$PureCompo
     value: function render() {
       var error = this.props.error;
       var ErrorMessage = MentionListError.getAdvisedActionMessage(error);
-      return /*#__PURE__*/_react.default.createElement(_primitives.Stack, {
+      return /*#__PURE__*/_react.default.createElement(_stack.Stack, {
         space: "space.400",
         alignBlock: "center",
         alignInline: "center",
         xcss: mentionListErrorStyles
-      }, /*#__PURE__*/_react.default.createElement(_GenericErrorIllustration.GenericErrorIllustration, null), /*#__PURE__*/_react.default.createElement(_primitives.Stack, {
+      }, /*#__PURE__*/_react.default.createElement(_GenericErrorIllustration.GenericErrorIllustration, null), /*#__PURE__*/_react.default.createElement(_stack.Stack, {
         space: "space.100"
       }, /*#__PURE__*/_react.default.createElement(_heading.default, {
         size: "xsmall",
         as: "div"
-      }, /*#__PURE__*/_react.default.createElement(_i18n.DefaultHeadline, null)), /*#__PURE__*/_react.default.createElement(_primitives.Text, {
+      }, /*#__PURE__*/_react.default.createElement(_i18n.DefaultHeadline, null)), /*#__PURE__*/_react.default.createElement(_text.Text, {
         as: "p",
         color: "color.text.subtle"
       }, /*#__PURE__*/_react.default.createElement(ErrorMessage, null))));
@@ -65,7 +69,7 @@ var MentionListError = exports.default = /*#__PURE__*/function (_React$PureCompo
     }
   }]);
 }(_react.default.PureComponent);
-var mentionListErrorStyles = (0, _primitives.xcss)({
+var mentionListErrorStyles = (0, _xcss.xcss)({
   paddingBlock: 'space.500',
   textAlign: 'center'
 });

package/dist/cjs/components/MentionPicker/MentionPicker.js

@@ -13,7 +13,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _compiled = require("@atlaskit/primitives/compiled");
+var _text = require("@atlaskit/primitives/compiled/text");
 var _fireAnalyticsMentionTypeaheadEvent = require("../../util/fire-analytics-mention-typeahead-event");
 var _id = _interopRequireDefault(require("../../util/id"));
 var _logger = _interopRequireDefault(require("../../util/logger"));
@@ -188,7 +188,7 @@ var MentionPicker = exports.MentionPicker = /*#__PURE__*/function (_React$PureCo
         query: query,
         ref: this.handleMentionListRef
       });
-      var infoContent = info && !visible ? /*#__PURE__*/_react.default.createElement(_styles.MentionPickerInfoStyle, null, /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+      var infoContent = info && !visible ? /*#__PURE__*/_react.default.createElement(_styles.MentionPickerInfoStyle, null, /*#__PURE__*/_react.default.createElement(_text.Text, {
         as: "p"
       }, info)) : null;
       var content;

package/dist/cjs/components/MentionPicker/index.js

@@ -5,15 +5,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.MentionPickerWithAnalytics = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _withAnalyticsEvents = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsEvents"));
+var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
 var _MentionPicker = require("./MentionPicker");
 var MentionPickerWithIntl = (0, _reactIntl.injectIntl)(_MentionPicker.MentionPicker, {
   forwardRef: true
 });
 
 // oxlint-disable-next-line eslint/no-redeclare
-var MentionPickerWithAnalytics = exports.MentionPickerWithAnalytics = (0, _withAnalyticsEvents.default)({})(MentionPickerWithIntl);
+var MentionPickerWithAnalytics = exports.MentionPickerWithAnalytics = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  return /*#__PURE__*/_react.default.createElement(MentionPickerWithIntl, (0, _extends2.default)({}, props, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+MentionPickerWithAnalytics.displayName = 'MentionPickerWithAnalytics';
 
 // Merges with the `const` above so that `MentionPickerWithAnalytics` is usable in a type
 // position as the component instance type (e.g. for refs). Both halves of a declaration

package/dist/cjs/components/ResourcedMentionList/index.js

@@ -5,8 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _withAnalyticsEvents = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsEvents"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireDefault(require("react"));
+var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
 var _ResourcedMentionListWithoutAnalytics = require("./ResourcedMentionListWithoutAnalytics");
 // oxlint-disable-next-line eslint/no-redeclare
-var ResourcedMentionList = (0, _withAnalyticsEvents.default)({})(_ResourcedMentionListWithoutAnalytics.ResourcedMentionListWithoutAnalytics);
+var ResourcedMentionList = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  return /*#__PURE__*/_react.default.createElement(_ResourcedMentionListWithoutAnalytics.ResourcedMentionListWithoutAnalytics, (0, _extends2.default)({}, props, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+ResourcedMentionList.displayName = 'ResourcedMentionList';
 var _default = exports.default = ResourcedMentionList;

package/dist/cjs/util/package-version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.packageVersion = void 0;
-var packageVersion = exports.packageVersion = "30.1.6";
+var packageVersion = exports.packageVersion = "30.1.8";

package/dist/es2019/api/MentionResource.js

@@ -1,7 +1,7 @@
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
 
 import debounce from 'lodash/debounce';
-import { utils as serviceUtils } from '@atlaskit/util-service-support';
+import { utils as serviceUtils } from '@atlaskit/util-service-support/constants';
 import { isAppMention } from '../is-app-mention';
 import { isTeamMention } from '../is-team-mention';
 import { MentionNameStatus, SliNames, Actions } from '../types';

package/dist/es2019/api/TeamMentionResource.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { utils as serviceUtils } from '@atlaskit/util-service-support';
+import { utils as serviceUtils } from '@atlaskit/util-service-support/constants';
 import { UserType, UserAccessLevel, SliNames, Actions } from '../types';
 import debug from '../util/logger';
 import { SLI_EVENT_TYPE } from './../util/analytics';

package/dist/es2019/components/Mention/index.js

@@ -1,12 +1,10 @@
+import _extends from "@babel/runtime/helpers/extends";
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
-/**
- * @jsxRuntime classic
- * @jsx jsx
- * @jsxFrag React.Fragment
- */
 /* eslint-disable @atlaskit/design-system/no-deprecated-imports, @typescript-eslint/no-restricted-types -- Preserve existing mention implementation while focus-ring usage is reviewed separately. */
 
-import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
+import React from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
+import { usePatchedProps } from '@atlaskit/analytics-next/usePatchedProps';
 import { fireAnalyticsMentionEvent } from '../../util/fire-analytics-mention-event';
 import { MentionInternal } from './MentionInternal';
 export const ANALYTICS_HOVER_DELAY = 1000;
@@ -15,7 +13,7 @@ export const ANALYTICS_HOVER_DELAY = 1000;
  * @deprecated Use `import { UNKNOWN_USER_ID } from '@atlaskit/mention/constants'` instead.
  */
 export { UNKNOWN_USER_ID } from '../../_constants';
-const MentionWithAnalytics = withAnalyticsEvents({
+const mentionEventMap = {
   onClick: (createEvent, props) => {
     const {
       id,
@@ -34,10 +32,23 @@ const MentionWithAnalytics = withAnalyticsEvents({
     const event = fireAnalyticsMentionEvent(createEvent)('mention', 'hovered', text, id, accessLevel);
     return event;
   }
-})(MentionInternal);
+};
 
 // oxlint-disable-next-line eslint/no-redeclare
-const Mention = MentionWithAnalytics;
+const Mention = /*#__PURE__*/React.forwardRef((props, ref) => {
+  const {
+    createAnalyticsEvent
+  } = useAnalyticsEvents();
+  // Keep the existing event decoration, including the analytics argument passed to callbacks.
+  const {
+    patchedEventProps
+  } = usePatchedProps(mentionEventMap, props);
+  return /*#__PURE__*/React.createElement(MentionInternal, _extends({}, props, patchedEventProps, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+Mention.displayName = 'Mention';
 export default Mention;
 
 /**

package/dist/es2019/components/Mention/ufoExperiences.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { ConcurrentExperience } from '@atlaskit/ufo/concurrent-experience';
 import { ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo/experience-types';
@@ -9,10 +10,30 @@ export const mentionRenderedUfoExperience = new ConcurrentExperience('mention-re
   performanceType: ExperiencePerformanceTypes.PageSegmentLoad
 });
 export class UfoErrorBoundary extends React.Component {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "state", {
+      hasError: false,
+      previousProps: this.props
+    });
+  }
+  static getDerivedStateFromProps(props, state) {
+    // Preserve the original boundary's retry on parent updates, even when children are memoized.
+    // Error recovery uses the same props, so it must retain the fallback instead of retrying.
+    return props !== state.previousProps ? {
+      hasError: false,
+      previousProps: props
+    } : null;
+  }
+  static getDerivedStateFromError() {
+    return {
+      hasError: true
+    };
+  }
   componentDidCatch() {
     mentionRenderedUfoExperience.getInstance(this.props.id).failure();
   }
   render() {
-    return this.props.children;
+    return this.state.hasError ? null : this.props.children;
   }
 }

package/dist/es2019/components/MentionListError/index.js

@@ -1,7 +1,11 @@
 import React from 'react';
 import Heading from '@atlaskit/heading/heading';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
-import { Stack, Text, xcss } from '@atlaskit/primitives';
+import { Stack } from '@atlaskit/primitives/stack';
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
+import { Text } from '@atlaskit/primitives/text';
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
+import { xcss } from '@atlaskit/primitives/xcss/xcss';
 import { DefaultAdvisedAction, DefaultHeadline, DifferentText, LoginAgain } from '../../util/i18n';
 import { GenericErrorIllustration } from './GenericErrorIllustration';
 const advisedActionMessages = {

package/dist/es2019/components/MentionPicker/MentionPicker.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { IntlProvider } from 'react-intl';
-import { Text } from '@atlaskit/primitives/compiled';
+import { Text } from '@atlaskit/primitives/compiled/text';
 import { fireAnalyticsMentionTypeaheadEvent } from '../../util/fire-analytics-mention-typeahead-event';
 import uniqueId from '../../util/id';
 import debug from '../../util/logger';

package/dist/es2019/components/MentionPicker/index.js

@@ -1,12 +1,23 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
 import { injectIntl } from 'react-intl';
-import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { MentionPicker } from './MentionPicker';
 const MentionPickerWithIntl = injectIntl(MentionPicker, {
   forwardRef: true
 });
 
 // oxlint-disable-next-line eslint/no-redeclare
-export const MentionPickerWithAnalytics = withAnalyticsEvents({})(MentionPickerWithIntl);
+export const MentionPickerWithAnalytics = /*#__PURE__*/React.forwardRef((props, ref) => {
+  const {
+    createAnalyticsEvent
+  } = useAnalyticsEvents();
+  return /*#__PURE__*/React.createElement(MentionPickerWithIntl, _extends({}, props, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+MentionPickerWithAnalytics.displayName = 'MentionPickerWithAnalytics';
 
 // Merges with the `const` above so that `MentionPickerWithAnalytics` is usable in a type
 // position as the component instance type (e.g. for refs). Both halves of a declaration

package/dist/es2019/components/ResourcedMentionList/index.js

@@ -1,5 +1,16 @@
-import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { ResourcedMentionListWithoutAnalytics } from './ResourcedMentionListWithoutAnalytics';
 // oxlint-disable-next-line eslint/no-redeclare
-const ResourcedMentionList = withAnalyticsEvents({})(ResourcedMentionListWithoutAnalytics);
+const ResourcedMentionList = /*#__PURE__*/React.forwardRef((props, ref) => {
+  const {
+    createAnalyticsEvent
+  } = useAnalyticsEvents();
+  return /*#__PURE__*/React.createElement(ResourcedMentionListWithoutAnalytics, _extends({}, props, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+ResourcedMentionList.displayName = 'ResourcedMentionList';
 export default ResourcedMentionList;

package/dist/es2019/util/package-version.js

@@ -1 +1 @@
-export const packageVersion = "30.1.6";
+export const packageVersion = "30.1.8";

package/dist/esm/api/MentionResource.js

@@ -13,7 +13,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
 
 import debounce from 'lodash/debounce';
-import { utils as serviceUtils } from '@atlaskit/util-service-support';
+import { utils as serviceUtils } from '@atlaskit/util-service-support/constants';
 import { isAppMention } from '../is-app-mention';
 import { isTeamMention } from '../is-team-mention';
 import { MentionNameStatus, SliNames, Actions } from '../types';

package/dist/esm/api/TeamMentionResource.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; })(); }
 function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
-import { utils as serviceUtils } from '@atlaskit/util-service-support';
+import { utils as serviceUtils } from '@atlaskit/util-service-support/constants';
 import { UserType, UserAccessLevel, SliNames, Actions } from '../types';
 import debug from '../util/logger';
 import { SLI_EVENT_TYPE } from './../util/analytics';

package/dist/esm/components/Mention/index.js

@@ -1,12 +1,10 @@
+import _extends from "@babel/runtime/helpers/extends";
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
-/**
- * @jsxRuntime classic
- * @jsx jsx
- * @jsxFrag React.Fragment
- */
 /* eslint-disable @atlaskit/design-system/no-deprecated-imports, @typescript-eslint/no-restricted-types -- Preserve existing mention implementation while focus-ring usage is reviewed separately. */
 
-import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
+import React from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
+import { usePatchedProps } from '@atlaskit/analytics-next/usePatchedProps';
 import { fireAnalyticsMentionEvent } from '../../util/fire-analytics-mention-event';
 import { MentionInternal } from './MentionInternal';
 export var ANALYTICS_HOVER_DELAY = 1000;
@@ -15,7 +13,7 @@ export var ANALYTICS_HOVER_DELAY = 1000;
  * @deprecated Use `import { UNKNOWN_USER_ID } from '@atlaskit/mention/constants'` instead.
  */
 export { UNKNOWN_USER_ID } from '../../_constants';
-var MentionWithAnalytics = withAnalyticsEvents({
+var mentionEventMap = {
   onClick: function onClick(createEvent, props) {
     var id = props.id,
       text = props.text,
@@ -30,10 +28,21 @@ var MentionWithAnalytics = withAnalyticsEvents({
     var event = fireAnalyticsMentionEvent(createEvent)('mention', 'hovered', text, id, accessLevel);
     return event;
   }
-})(MentionInternal);
+};
 
 // oxlint-disable-next-line eslint/no-redeclare
-var Mention = MentionWithAnalytics;
+var Mention = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _useAnalyticsEvents = useAnalyticsEvents(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  // Keep the existing event decoration, including the analytics argument passed to callbacks.
+  var _usePatchedProps = usePatchedProps(mentionEventMap, props),
+    patchedEventProps = _usePatchedProps.patchedEventProps;
+  return /*#__PURE__*/React.createElement(MentionInternal, _extends({}, props, patchedEventProps, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+Mention.displayName = 'Mention';
 export default Mention;
 
 /**

package/dist/esm/components/Mention/ufoExperiences.js

@@ -3,6 +3,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 React from 'react';
@@ -17,8 +18,17 @@ export var mentionRenderedUfoExperience = new ConcurrentExperience('mention-rend
 });
 export var UfoErrorBoundary = /*#__PURE__*/function (_React$Component) {
   function UfoErrorBoundary() {
+    var _this;
     _classCallCheck(this, UfoErrorBoundary);
-    return _callSuper(this, UfoErrorBoundary, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, UfoErrorBoundary, [].concat(args));
+    _defineProperty(_this, "state", {
+      hasError: false,
+      previousProps: _this.props
+    });
+    return _this;
   }
   _inherits(UfoErrorBoundary, _React$Component);
   return _createClass(UfoErrorBoundary, [{
@@ -29,7 +39,24 @@ export var UfoErrorBoundary = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      return this.props.children;
+      return this.state.hasError ? null : this.props.children;
+    }
+  }], [{
+    key: "getDerivedStateFromProps",
+    value: function getDerivedStateFromProps(props, state) {
+      // Preserve the original boundary's retry on parent updates, even when children are memoized.
+      // Error recovery uses the same props, so it must retain the fallback instead of retrying.
+      return props !== state.previousProps ? {
+        hasError: false,
+        previousProps: props
+      } : null;
+    }
+  }, {
+    key: "getDerivedStateFromError",
+    value: function getDerivedStateFromError() {
+      return {
+        hasError: true
+      };
     }
   }]);
 }(React.Component);

package/dist/esm/components/MentionListError/index.js

@@ -8,7 +8,11 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React from 'react';
 import Heading from '@atlaskit/heading/heading';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
-import { Stack, Text, xcss } from '@atlaskit/primitives';
+import { Stack } from '@atlaskit/primitives/stack';
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
+import { Text } from '@atlaskit/primitives/text';
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
+import { xcss } from '@atlaskit/primitives/xcss/xcss';
 import { DefaultAdvisedAction, DefaultHeadline, DifferentText, LoginAgain } from '../../util/i18n';
 import { GenericErrorIllustration } from './GenericErrorIllustration';
 var advisedActionMessages = {

package/dist/esm/components/MentionPicker/MentionPicker.js

@@ -8,7 +8,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import { IntlProvider } from 'react-intl';
-import { Text } from '@atlaskit/primitives/compiled';
+import { Text } from '@atlaskit/primitives/compiled/text';
 import { fireAnalyticsMentionTypeaheadEvent } from '../../util/fire-analytics-mention-typeahead-event';
 import uniqueId from '../../util/id';
 import debug from '../../util/logger';

package/dist/esm/components/MentionPicker/index.js

@@ -1,12 +1,22 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
 import { injectIntl } from 'react-intl';
-import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { MentionPicker } from './MentionPicker';
 var MentionPickerWithIntl = injectIntl(MentionPicker, {
   forwardRef: true
 });
 
 // oxlint-disable-next-line eslint/no-redeclare
-export var MentionPickerWithAnalytics = withAnalyticsEvents({})(MentionPickerWithIntl);
+export var MentionPickerWithAnalytics = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _useAnalyticsEvents = useAnalyticsEvents(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  return /*#__PURE__*/React.createElement(MentionPickerWithIntl, _extends({}, props, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+MentionPickerWithAnalytics.displayName = 'MentionPickerWithAnalytics';
 
 // Merges with the `const` above so that `MentionPickerWithAnalytics` is usable in a type
 // position as the component instance type (e.g. for refs). Both halves of a declaration

package/dist/esm/components/ResourcedMentionList/index.js

@@ -1,5 +1,15 @@
-import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { ResourcedMentionListWithoutAnalytics } from './ResourcedMentionListWithoutAnalytics';
 // oxlint-disable-next-line eslint/no-redeclare
-var ResourcedMentionList = withAnalyticsEvents({})(ResourcedMentionListWithoutAnalytics);
+var ResourcedMentionList = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _useAnalyticsEvents = useAnalyticsEvents(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  return /*#__PURE__*/React.createElement(ResourcedMentionListWithoutAnalytics, _extends({}, props, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    ref: ref
+  }));
+});
+ResourcedMentionList.displayName = 'ResourcedMentionList';
 export default ResourcedMentionList;

package/dist/esm/util/package-version.js

@@ -1 +1 @@
-export var packageVersion = "30.1.6";
+export var packageVersion = "30.1.8";

package/dist/types/components/LockCircleIcon/index.d.ts

@@ -1,7 +1,8 @@
+import type * as React from 'react';
 import { type LazyExoticComponent } from 'react';
 import type { NewCoreIconProps } from '@atlaskit/icon/types';
 declare const AsyncLockCircleIcon: LazyExoticComponent<{
-    (props: NewCoreIconProps): JSX.Element;
+    (props: NewCoreIconProps): React.JSX.Element;
     displayName: string;
 }>;
 export default AsyncLockCircleIcon;

package/dist/types/components/Mention/index.d.ts

@@ -1,10 +1,5 @@
-/**
- * @jsxRuntime classic
- * @jsx jsx
- * @jsxFrag React.Fragment
- */
 import React from 'react';
-import { type WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
+import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { type MentionEventHandler } from '../../types';
 import { MentionInternal } from './MentionInternal';
 export declare const ANALYTICS_HOVER_DELAY = 1000;

package/dist/types/components/Mention/ufoExperiences.d.ts

@@ -1,9 +1,18 @@
 import React from 'react';
 import { ConcurrentExperience } from '@atlaskit/ufo/concurrent-experience';
 export declare const mentionRenderedUfoExperience: ConcurrentExperience;
-export declare class UfoErrorBoundary extends React.Component<React.PropsWithChildren<{
+type Props = React.PropsWithChildren<{
     id: string;
-}>> {
+}>;
+type State = {
+    hasError: boolean;
+    previousProps: Props;
+};
+export declare class UfoErrorBoundary extends React.Component<Props, State> {
+    state: State;
+    static getDerivedStateFromProps(props: Props, state: State): State | null;
+    static getDerivedStateFromError(): Partial<State>;
     componentDidCatch(): void;
     render(): React.ReactNode;
 }
+export {};

package/dist/types/components/MentionPicker/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { type IntlShape, type WithIntlProps } from 'react-intl';
-import { type WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
+import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { type MentionProvider } from '../../api/MentionResource';
 import { type PresenceProvider } from '../../api/PresenceResource';
 import { type OnMentionEvent } from '../../types';

package/dist/types/components/ResourcedMentionList/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { type WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
+import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { type MentionProvider } from '../../api/MentionResource';
 import { type PresenceProvider } from '../../api/PresenceResource';
 import { type MentionDescription, type OnMentionEvent } from '../../types';

package/docs/1-in-editor.tsx

@@ -1,6 +1,6 @@
 import Link from '@atlaskit/link/link';
 import React from 'react';
-import { Text } from '@atlaskit/primitives/compiled';
+import { Text } from '@atlaskit/primitives/compiled/text';
 import { md, Example, code, AtlassianInternalWarning } from '@atlaskit/docs';
 
 import MentionWithEditorExample from '../examples/14-mention-with-editor-extending-abstract-mention-resource';

package/package.json

@@ -45,7 +45,7 @@
 		"@atlaskit/skeleton": "^4.4.0",
 		"@atlaskit/tag": "^17.0.0",
 		"@atlaskit/teams-avatar": "^4.1.0",
-		"@atlaskit/tmp-editor-statsig": "^228.0.0",
+		"@atlaskit/tmp-editor-statsig": "^229.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/ufo": "^2.0.0",
@@ -124,5 +124,5 @@
 		"*.compiled.css"
 	],
 	"types": "dist/types/index.d.ts",
-	"version": "30.1.7"
+	"version": "30.1.9"
 }