@atlaskit/editor-plugin-mentions 18.2.9 → 18.3.0

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @atlaskit/editor-plugin-mentions
 
+## 18.3.0
+
+### Minor Changes
+
+- [`5a0128690a065`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5a0128690a065) -
+  Add mention avatars to Rovo editor and renderer surfaces behind
+  platform_editor_rovo_editor_mention_node_avatar
+
+### Patch Changes
+
+- Updated dependencies
+
+## 18.2.10
+
+### Patch Changes
+
+- [`0927c3666c010`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0927c3666c010) -
+  Upgrade `uuid` from `3.x` to `11.1.1` to remediate GHSA-w5hq-g745-h8pq / SNYK-JS-UUID-16133035.
+
+  `uuid@11` removed the deep subpath exports (`uuid/v4`, `uuid/v1`, `uuid/v5`) and the default
+  export, so all internal call sites were migrated to named imports:
+
+  ```diff
+  -import uuid from 'uuid/v4';
+  +import { v4 as uuid } from 'uuid';
+
+  -import uuid from 'uuid';
+  +import { v4 as uuid } from 'uuid';
+  ```
+
+  With the exception of `@atlassian/integrations` (below), this is an internal implementation change
+  only - no public API, export, or entrypoint changed. UUID generation behaviour is unchanged
+  (`uuid@3`'s default export was already `v4`).
+
+  `@atlassian/integrations` declares `uuid` as a peer dependency, so its declared range moved from
+  `^3.1.0` to `^11.1.1`. That is a peer dependency declaration change, hence `minor` rather than
+  `patch` for that package.
+
+  The following `platform/packages/ai-mate` packages were also touched, but are all `private: true`
+  and so are intentionally not listed in the frontmatter above:
+  - `@atlassian/csm-assistance-service` - bumped its explicit `uuid` dependency from `npm:^9.0.0` to
+    `npm:^11.1.1` (`9.0.1` is also within the advisory's affected range).
+  - `@atlassian/csm-guidance-config` - example helper only, migrated to the named `uuid` import.
+  - `@atlassian/csm-ui-components` - example helper only, migrated to the named `uuid` import.
+
+- Updated dependencies
+
 ## 18.2.9
 
 ### Patch Changes

package/dist/cjs/editor-commands/index.js

@@ -1,11 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertMention = exports.createSingleMentionFragment = void 0;
-var _uuid = _interopRequireDefault(require("uuid"));
+var _uuid = require("uuid");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _resource = require("@atlaskit/mention/resource");
@@ -49,7 +48,7 @@ var createSingleMentionFragment = exports.createSingleMentionFragment = function
       accessLevel: accessLevel,
       userType: userType === 'DEFAULT' ? null : userType,
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-      localId: localId !== null && localId !== void 0 ? localId : (0, _uuid.default)()
+      localId: localId !== null && localId !== void 0 ? localId : (0, _uuid.v4)()
     }, null, annotationMarksForPos);
     var space = schema.text(' ', annotationMarksForPos);
     return _model.Fragment.from([mentionNode, space]);

package/dist/cjs/mentionsPlugin.js

@@ -12,7 +12,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _uuid = _interopRequireDefault(require("uuid"));
+var _uuid = require("uuid");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
@@ -91,7 +91,7 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref3) {
   var options = _ref3.config,
     api = _ref3.api;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-  var sessionId = (0, _uuid.default)();
+  var sessionId = (0, _uuid.v4)();
   var previousMediaProvider;
   var fireEvent = function fireEvent(payload, channel) {
     var _api$analytics;

package/dist/cjs/nodeviews/disabledTooltipRenderer.js

@@ -12,7 +12,7 @@ var _runtime = require("@compiled/react/runtime");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _bindEventListener = require("bind-event-listener");
-var _v = _interopRequireDefault(require("uuid/v4"));
+var _uuid = require("uuid");
 var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- mirror existing renderer pattern
@@ -155,7 +155,7 @@ var disabledTooltipRenderer = exports.disabledTooltipRenderer = function disable
   var chipElement = _ref5.chipElement,
     portalProviderAPI = _ref5.portalProviderAPI;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- mirror existing renderer pattern
-  var key = (0, _v.default)();
+  var key = (0, _uuid.v4)();
   var currentTooltip;
   var listeners = new Set();
   var broadcast = function broadcast() {

package/dist/cjs/nodeviews/profileCardRenderer.js

@@ -8,7 +8,7 @@ exports.profileCardRenderer = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _bindEventListener = require("bind-event-listener");
-var _v = _interopRequireDefault(require("uuid/v4"));
+var _uuid = require("uuid");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
@@ -32,7 +32,7 @@ var profileCardRenderer = exports.profileCardRenderer = function profileCardRend
   var renderingProfileCard = false;
   var navigatingToProfile = false;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-  var key = (0, _v.default)();
+  var key = (0, _uuid.v4)();
   var cleanupSelection;
   var removeProfileCard = function removeProfileCard() {
     var _cleanupSelection;

package/dist/cjs/pm-plugins/main.js

@@ -43,7 +43,7 @@ var ACTIONS = exports.ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "18.2.8";
+var PACKAGE_VERSION = "18.2.10";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/cjs/providers/mention-node-data-provider.js

@@ -42,6 +42,20 @@ var toMentionNode = function toMentionNode(_ref) {
 var isMentionNode = function isMentionNode(node) {
   return node.type === 'mention' && node.attrs !== undefined && 'id' in node.attrs && typeof node.attrs.id === 'string';
 };
+var SUBSCRIPTION_KEY_PREFIX = 'mention-node-data-provider';
+var subscriptionKeyCounter = 0;
+var cacheMentionData = function cacheMentionData(cache, mentions) {
+  mentions.forEach(function (mention) {
+    if (mention.isPlaceholder || !mention.avatarUrl) {
+      cache.delete(mention.id);
+      return;
+    }
+    cache.set(mention.id, {
+      avatarUrl: mention.avatarUrl,
+      appType: mention.appType
+    });
+  });
+};
 
 /**
  * Page-scoped data provider for mention avatars.
@@ -59,6 +73,9 @@ var isMentionNode = function isMentionNode(node) {
  * invoked. A Relay adapter can query `users(accountIds:)`, then map each user's
  * `picture` and app type to a `MentionNodeData` record keyed by account ID. The
  * resolved result is cached by the underlying `NodeDataProvider`.
+ *
+ * Products that already have a `MentionProvider` result stream can call `connect`
+ * so emitted mention results populate a synchronous avatar cache.
  */
 var MentionNodeDataProvider = exports.MentionNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
   function MentionNodeDataProvider(fetchMentionNodeData) {
@@ -67,6 +84,11 @@ var MentionNodeDataProvider = exports.MentionNodeDataProvider = /*#__PURE__*/fun
     (0, _classCallCheck2.default)(this, MentionNodeDataProvider);
     _this = _callSuper(this, MentionNodeDataProvider);
     (0, _defineProperty2.default)(_this, "name", 'mentionNodeDataProvider');
+    (0, _defineProperty2.default)(_this, "abortControllerRef", {
+      current: new AbortController()
+    });
+    (0, _defineProperty2.default)(_this, "emittedMentionCache", new Map());
+    (0, _defineProperty2.default)(_this, "subscriptionKey", "".concat(SUBSCRIPTION_KEY_PREFIX, ":").concat(++subscriptionKeyCounter));
     (0, _defineProperty2.default)(_this, "queuedFetches", []);
     (0, _defineProperty2.default)(_this, "isFlushScheduled", false);
     _this.fetchMentionNodeData = fetchMentionNodeData;
@@ -118,8 +140,7 @@ var MentionNodeDataProvider = exports.MentionNodeDataProvider = /*#__PURE__*/fun
   }, {
     key: "getMentionData",
     value: function getMentionData(mention, callback) {
-      var _this$resolveMentionN;
-      var resolvedData = (_this$resolveMentionN = this.resolveMentionNodeData) === null || _this$resolveMentionN === void 0 ? void 0 : _this$resolveMentionN.call(this, mention);
+      var resolvedData = this.resolveMentionNodeDataFromCache(mention);
       if (resolvedData) {
         callback({
           data: enrichMentionNodeData(mention, resolvedData)
@@ -131,20 +152,59 @@ var MentionNodeDataProvider = exports.MentionNodeDataProvider = /*#__PURE__*/fun
   }, {
     key: "getMentionDataFromCache",
     value: function getMentionDataFromCache(mention) {
-      var _this$resolveMentionN2, _this$getNodeDataFrom;
-      var resolvedData = (_this$resolveMentionN2 = this.resolveMentionNodeData) === null || _this$resolveMentionN2 === void 0 ? void 0 : _this$resolveMentionN2.call(this, mention);
+      var _this$getNodeDataFrom;
+      var resolvedData = this.resolveMentionNodeDataFromCache(mention);
       if (resolvedData) {
         return enrichMentionNodeData(mention, resolvedData);
       }
       var data = (_this$getNodeDataFrom = this.getNodeDataFromCache(toMentionNode(mention))) === null || _this$getNodeDataFrom === void 0 ? void 0 : _this$getNodeDataFrom.data;
       return data ? enrichMentionNodeData(mention, data) : undefined;
     }
+  }, {
+    key: "connect",
+    value: function connect(mentionResource) {
+      var _this2 = this;
+      if (this.lastMentionResource && this.lastMentionResource !== mentionResource) {
+        this.emittedMentionCache.clear();
+        this.resetCache();
+      }
+      this.lastMentionResource = mentionResource;
+      if (this.abortControllerRef.current.signal.aborted) {
+        this.abortControllerRef.current = new AbortController();
+      }
+      var isDisconnected = false;
+      var subscribedMentionProvider;
+      void mentionResource.then(function (mentionProvider) {
+        if (isDisconnected) {
+          return;
+        }
+        subscribedMentionProvider = mentionProvider;
+        mentionProvider.subscribe(_this2.subscriptionKey, function (mentions) {
+          cacheMentionData(_this2.emittedMentionCache, mentions);
+        });
+      }).catch(function () {
+        return undefined;
+      });
+      return function () {
+        var _subscribedMentionPro;
+        isDisconnected = true;
+        _this2.abortControllerRef.current.abort();
+        (_subscribedMentionPro = subscribedMentionProvider) === null || _subscribedMentionPro === void 0 || _subscribedMentionPro.unsubscribe(_this2.subscriptionKey);
+        subscribedMentionProvider = undefined;
+      };
+    }
+  }, {
+    key: "resolveMentionNodeDataFromCache",
+    value: function resolveMentionNodeDataFromCache(mention) {
+      var _this$resolveMentionN, _this$resolveMentionN2;
+      return (_this$resolveMentionN = (_this$resolveMentionN2 = this.resolveMentionNodeData) === null || _this$resolveMentionN2 === void 0 ? void 0 : _this$resolveMentionN2.call(this, mention)) !== null && _this$resolveMentionN !== void 0 ? _this$resolveMentionN : this.emittedMentionCache.get(mention.id);
+    }
   }, {
     key: "enqueueFetch",
     value: function enqueueFetch(accountIds) {
-      var _this2 = this;
+      var _this3 = this;
       var result = new Promise(function (resolve, reject) {
-        _this2.queuedFetches.push({
+        _this3.queuedFetches.push({
           accountIds: accountIds,
           reject: reject,
           resolve: resolve
@@ -153,7 +213,7 @@ var MentionNodeDataProvider = exports.MentionNodeDataProvider = /*#__PURE__*/fun
       if (!this.isFlushScheduled) {
         this.isFlushScheduled = true;
         void Promise.resolve().then(function () {
-          return _this2.flushFetches();
+          return _this3.flushFetches();
         });
       }
       return result;
@@ -174,7 +234,7 @@ var MentionNodeDataProvider = exports.MentionNodeDataProvider = /*#__PURE__*/fun
               })));
               _context2.prev = 1;
               _context2.next = 2;
-              return this.fetchMentionNodeData(accountIds);
+              return this.fetchMentionNodeData(accountIds, this.abortControllerRef.current.signal);
             case 2:
               data = _context2.sent;
               queuedFetches.forEach(function (_ref4) {

package/dist/cjs/ui/type-ahead/index.js

@@ -11,7 +11,7 @@ exports.mentionToTypeaheadItem = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
-var _uuid = _interopRequireDefault(require("uuid"));
+var _uuid = require("uuid");
 var _messages = require("@atlaskit/editor-common/messages");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _model = require("@atlaskit/editor-prosemirror/model");
@@ -283,7 +283,7 @@ var buildNodesForTeamMention = function buildNodesForTeamMention(schema, selecte
       accessLevel: accessLevel,
       userType: 'DEFAULT',
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-      localId: (0, _uuid.default)()
+      localId: (0, _uuid.v4)()
     });
     inlineNodes.push(userMentionNode);
     // should not add empty space after the last user mention.
@@ -378,7 +378,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
     showAgentMentionsLabsLozenge = _ref0$showAgentMentio === void 0 ? false : _ref0$showAgentMentio,
     profilecardProvider = _ref0.profilecardProvider;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-  var sessionId = (0, _uuid.default)();
+  var sessionId = (0, _uuid.v4)();
   var firstQueryWithoutResults = null;
   var lastTypeAheadQuery = '';
   var subscriptionKeys = new Set();
@@ -423,7 +423,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         contextIdentifierProvider = _ref10.contextIdentifierProvider;
       return new Promise(function (resolve, reject) {
         // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-        var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.default)());
+        var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.v4)());
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
           var resultQuery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
           var stats = arguments.length > 2 ? arguments[2] : undefined;
@@ -589,7 +589,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }
 
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-      var mentionLocalId = (0, _uuid.default)();
+      var mentionLocalId = (0, _uuid.v4)();
       if (handleMentionsChanged) {
         var mentionChange = _objectSpread({
           id: id,
@@ -612,7 +612,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }), query, contextIdentifierProvider, taskListId, taskItemId, isAgentMentionSelection, enableAgentSectioning));
 
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-      sessionId = (0, _uuid.default)();
+      sessionId = (0, _uuid.v4)();
       if (mentionProvider && (0, _utils3.isTeamType)(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
@@ -679,7 +679,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       subscriptionKeys.clear();
 
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-      sessionId = (0, _uuid.default)();
+      sessionId = (0, _uuid.v4)();
     }
   };
 
@@ -717,7 +717,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       contextIdentifierProvider = _ref16.contextIdentifierProvider;
 
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-    var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.default)());
+    var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.v4)());
     var initialResolve = null;
     var initialReject = null;
     var initialResolved = false;

package/dist/es2019/editor-commands/index.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isResolvingMentionProvider } from '@atlaskit/mention/resource';

package/dist/es2019/mentionsPlugin.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages, mentionMessages } from '@atlaskit/editor-common/messages';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';

package/dist/es2019/nodeviews/disabledTooltipRenderer.js

@@ -4,7 +4,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useState } from 'react';
 import { bindAll } from 'bind-event-listener';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- mirror existing renderer pattern
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 const styles = {
   hiddenTrigger: "_1e0cglyw"

package/dist/es2019/nodeviews/profileCardRenderer.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { bind } from 'bind-event-listener';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findChildrenByAttr } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';

package/dist/es2019/pm-plugins/main.js

@@ -32,7 +32,7 @@ export const ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "18.2.8";
+const PACKAGE_VERSION = "18.2.10";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

package/dist/es2019/providers/mention-node-data-provider.js

@@ -20,6 +20,20 @@ const toMentionNode = ({
   type: 'mention'
 });
 const isMentionNode = node => node.type === 'mention' && node.attrs !== undefined && 'id' in node.attrs && typeof node.attrs.id === 'string';
+const SUBSCRIPTION_KEY_PREFIX = 'mention-node-data-provider';
+let subscriptionKeyCounter = 0;
+const cacheMentionData = (cache, mentions) => {
+  mentions.forEach(mention => {
+    if (mention.isPlaceholder || !mention.avatarUrl) {
+      cache.delete(mention.id);
+      return;
+    }
+    cache.set(mention.id, {
+      avatarUrl: mention.avatarUrl,
+      appType: mention.appType
+    });
+  });
+};
 
 /**
  * Page-scoped data provider for mention avatars.
@@ -37,11 +51,19 @@ const isMentionNode = node => node.type === 'mention' && node.attrs !== undefine
  * invoked. A Relay adapter can query `users(accountIds:)`, then map each user's
  * `picture` and app type to a `MentionNodeData` record keyed by account ID. The
  * resolved result is cached by the underlying `NodeDataProvider`.
+ *
+ * Products that already have a `MentionProvider` result stream can call `connect`
+ * so emitted mention results populate a synchronous avatar cache.
  */
 export class MentionNodeDataProvider extends NodeDataProvider {
   constructor(fetchMentionNodeData, resolveMentionNodeData = undefined) {
     super();
     _defineProperty(this, "name", 'mentionNodeDataProvider');
+    _defineProperty(this, "abortControllerRef", {
+      current: new AbortController()
+    });
+    _defineProperty(this, "emittedMentionCache", new Map());
+    _defineProperty(this, "subscriptionKey", `${SUBSCRIPTION_KEY_PREFIX}:${++subscriptionKeyCounter}`);
     _defineProperty(this, "queuedFetches", []);
     _defineProperty(this, "isFlushScheduled", false);
     this.fetchMentionNodeData = fetchMentionNodeData;
@@ -63,8 +85,7 @@ export class MentionNodeDataProvider extends NodeDataProvider {
     }) => enrichMentionNodeData(attrs, dataByAccountId[attrs.id]));
   }
   getMentionData(mention, callback) {
-    var _this$resolveMentionN;
-    const resolvedData = (_this$resolveMentionN = this.resolveMentionNodeData) === null || _this$resolveMentionN === void 0 ? void 0 : _this$resolveMentionN.call(this, mention);
+    const resolvedData = this.resolveMentionNodeDataFromCache(mention);
     if (resolvedData) {
       callback({
         data: enrichMentionNodeData(mention, resolvedData)
@@ -74,14 +95,46 @@ export class MentionNodeDataProvider extends NodeDataProvider {
     this.getData(toMentionNode(mention), callback);
   }
   getMentionDataFromCache(mention) {
-    var _this$resolveMentionN2, _this$getNodeDataFrom;
-    const resolvedData = (_this$resolveMentionN2 = this.resolveMentionNodeData) === null || _this$resolveMentionN2 === void 0 ? void 0 : _this$resolveMentionN2.call(this, mention);
+    var _this$getNodeDataFrom;
+    const resolvedData = this.resolveMentionNodeDataFromCache(mention);
     if (resolvedData) {
       return enrichMentionNodeData(mention, resolvedData);
     }
     const data = (_this$getNodeDataFrom = this.getNodeDataFromCache(toMentionNode(mention))) === null || _this$getNodeDataFrom === void 0 ? void 0 : _this$getNodeDataFrom.data;
     return data ? enrichMentionNodeData(mention, data) : undefined;
   }
+  connect(mentionResource) {
+    if (this.lastMentionResource && this.lastMentionResource !== mentionResource) {
+      this.emittedMentionCache.clear();
+      this.resetCache();
+    }
+    this.lastMentionResource = mentionResource;
+    if (this.abortControllerRef.current.signal.aborted) {
+      this.abortControllerRef.current = new AbortController();
+    }
+    let isDisconnected = false;
+    let subscribedMentionProvider;
+    void mentionResource.then(mentionProvider => {
+      if (isDisconnected) {
+        return;
+      }
+      subscribedMentionProvider = mentionProvider;
+      mentionProvider.subscribe(this.subscriptionKey, mentions => {
+        cacheMentionData(this.emittedMentionCache, mentions);
+      });
+    }).catch(() => undefined);
+    return () => {
+      var _subscribedMentionPro;
+      isDisconnected = true;
+      this.abortControllerRef.current.abort();
+      (_subscribedMentionPro = subscribedMentionProvider) === null || _subscribedMentionPro === void 0 ? void 0 : _subscribedMentionPro.unsubscribe(this.subscriptionKey);
+      subscribedMentionProvider = undefined;
+    };
+  }
+  resolveMentionNodeDataFromCache(mention) {
+    var _this$resolveMentionN, _this$resolveMentionN2;
+    return (_this$resolveMentionN = (_this$resolveMentionN2 = this.resolveMentionNodeData) === null || _this$resolveMentionN2 === void 0 ? void 0 : _this$resolveMentionN2.call(this, mention)) !== null && _this$resolveMentionN !== void 0 ? _this$resolveMentionN : this.emittedMentionCache.get(mention.id);
+  }
   enqueueFetch(accountIds) {
     const result = new Promise((resolve, reject) => {
       this.queuedFetches.push({
@@ -102,7 +155,7 @@ export class MentionNodeDataProvider extends NodeDataProvider {
     this.queuedFetches = [];
     const accountIds = Array.from(new Set(queuedFetches.flatMap(request => request.accountIds)));
     try {
-      const data = await this.fetchMentionNodeData(accountIds);
+      const data = await this.fetchMentionNodeData(accountIds, this.abortControllerRef.current.signal);
       queuedFetches.forEach(({
         resolve
       }) => resolve(data));

package/dist/es2019/ui/type-ahead/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { mentionMessages } from '@atlaskit/editor-common/messages';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';

package/dist/esm/editor-commands/index.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isResolvingMentionProvider } from '@atlaskit/mention/resource';

package/dist/esm/mentionsPlugin.js

@@ -8,7 +8,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages, mentionMessages } from '@atlaskit/editor-common/messages';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';

package/dist/esm/nodeviews/disabledTooltipRenderer.js

@@ -5,7 +5,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useState } from 'react';
 import { bindAll } from 'bind-event-listener';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- mirror existing renderer pattern
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 var styles = {
   hiddenTrigger: "_1e0cglyw"

package/dist/esm/nodeviews/profileCardRenderer.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { bind } from 'bind-event-listener';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findChildrenByAttr } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';

package/dist/esm/pm-plugins/main.js

@@ -35,7 +35,7 @@ export var ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "18.2.8";
+var PACKAGE_VERSION = "18.2.10";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/esm/providers/mention-node-data-provider.js

@@ -35,6 +35,20 @@ var toMentionNode = function toMentionNode(_ref) {
 var isMentionNode = function isMentionNode(node) {
   return node.type === 'mention' && node.attrs !== undefined && 'id' in node.attrs && typeof node.attrs.id === 'string';
 };
+var SUBSCRIPTION_KEY_PREFIX = 'mention-node-data-provider';
+var subscriptionKeyCounter = 0;
+var cacheMentionData = function cacheMentionData(cache, mentions) {
+  mentions.forEach(function (mention) {
+    if (mention.isPlaceholder || !mention.avatarUrl) {
+      cache.delete(mention.id);
+      return;
+    }
+    cache.set(mention.id, {
+      avatarUrl: mention.avatarUrl,
+      appType: mention.appType
+    });
+  });
+};
 
 /**
  * Page-scoped data provider for mention avatars.
@@ -52,6 +66,9 @@ var isMentionNode = function isMentionNode(node) {
  * invoked. A Relay adapter can query `users(accountIds:)`, then map each user's
  * `picture` and app type to a `MentionNodeData` record keyed by account ID. The
  * resolved result is cached by the underlying `NodeDataProvider`.
+ *
+ * Products that already have a `MentionProvider` result stream can call `connect`
+ * so emitted mention results populate a synchronous avatar cache.
  */
 export var MentionNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
   function MentionNodeDataProvider(fetchMentionNodeData) {
@@ -60,6 +77,11 @@ export var MentionNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
     _classCallCheck(this, MentionNodeDataProvider);
     _this = _callSuper(this, MentionNodeDataProvider);
     _defineProperty(_this, "name", 'mentionNodeDataProvider');
+    _defineProperty(_this, "abortControllerRef", {
+      current: new AbortController()
+    });
+    _defineProperty(_this, "emittedMentionCache", new Map());
+    _defineProperty(_this, "subscriptionKey", "".concat(SUBSCRIPTION_KEY_PREFIX, ":").concat(++subscriptionKeyCounter));
     _defineProperty(_this, "queuedFetches", []);
     _defineProperty(_this, "isFlushScheduled", false);
     _this.fetchMentionNodeData = fetchMentionNodeData;
@@ -111,8 +133,7 @@ export var MentionNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
   }, {
     key: "getMentionData",
     value: function getMentionData(mention, callback) {
-      var _this$resolveMentionN;
-      var resolvedData = (_this$resolveMentionN = this.resolveMentionNodeData) === null || _this$resolveMentionN === void 0 ? void 0 : _this$resolveMentionN.call(this, mention);
+      var resolvedData = this.resolveMentionNodeDataFromCache(mention);
       if (resolvedData) {
         callback({
           data: enrichMentionNodeData(mention, resolvedData)
@@ -124,20 +145,59 @@ export var MentionNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
   }, {
     key: "getMentionDataFromCache",
     value: function getMentionDataFromCache(mention) {
-      var _this$resolveMentionN2, _this$getNodeDataFrom;
-      var resolvedData = (_this$resolveMentionN2 = this.resolveMentionNodeData) === null || _this$resolveMentionN2 === void 0 ? void 0 : _this$resolveMentionN2.call(this, mention);
+      var _this$getNodeDataFrom;
+      var resolvedData = this.resolveMentionNodeDataFromCache(mention);
       if (resolvedData) {
         return enrichMentionNodeData(mention, resolvedData);
       }
       var data = (_this$getNodeDataFrom = this.getNodeDataFromCache(toMentionNode(mention))) === null || _this$getNodeDataFrom === void 0 ? void 0 : _this$getNodeDataFrom.data;
       return data ? enrichMentionNodeData(mention, data) : undefined;
     }
+  }, {
+    key: "connect",
+    value: function connect(mentionResource) {
+      var _this2 = this;
+      if (this.lastMentionResource && this.lastMentionResource !== mentionResource) {
+        this.emittedMentionCache.clear();
+        this.resetCache();
+      }
+      this.lastMentionResource = mentionResource;
+      if (this.abortControllerRef.current.signal.aborted) {
+        this.abortControllerRef.current = new AbortController();
+      }
+      var isDisconnected = false;
+      var subscribedMentionProvider;
+      void mentionResource.then(function (mentionProvider) {
+        if (isDisconnected) {
+          return;
+        }
+        subscribedMentionProvider = mentionProvider;
+        mentionProvider.subscribe(_this2.subscriptionKey, function (mentions) {
+          cacheMentionData(_this2.emittedMentionCache, mentions);
+        });
+      }).catch(function () {
+        return undefined;
+      });
+      return function () {
+        var _subscribedMentionPro;
+        isDisconnected = true;
+        _this2.abortControllerRef.current.abort();
+        (_subscribedMentionPro = subscribedMentionProvider) === null || _subscribedMentionPro === void 0 || _subscribedMentionPro.unsubscribe(_this2.subscriptionKey);
+        subscribedMentionProvider = undefined;
+      };
+    }
+  }, {
+    key: "resolveMentionNodeDataFromCache",
+    value: function resolveMentionNodeDataFromCache(mention) {
+      var _this$resolveMentionN, _this$resolveMentionN2;
+      return (_this$resolveMentionN = (_this$resolveMentionN2 = this.resolveMentionNodeData) === null || _this$resolveMentionN2 === void 0 ? void 0 : _this$resolveMentionN2.call(this, mention)) !== null && _this$resolveMentionN !== void 0 ? _this$resolveMentionN : this.emittedMentionCache.get(mention.id);
+    }
   }, {
     key: "enqueueFetch",
     value: function enqueueFetch(accountIds) {
-      var _this2 = this;
+      var _this3 = this;
       var result = new Promise(function (resolve, reject) {
-        _this2.queuedFetches.push({
+        _this3.queuedFetches.push({
           accountIds: accountIds,
           reject: reject,
           resolve: resolve
@@ -146,7 +206,7 @@ export var MentionNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
       if (!this.isFlushScheduled) {
         this.isFlushScheduled = true;
         void Promise.resolve().then(function () {
-          return _this2.flushFetches();
+          return _this3.flushFetches();
         });
       }
       return result;
@@ -167,7 +227,7 @@ export var MentionNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
               })));
               _context2.prev = 1;
               _context2.next = 2;
-              return this.fetchMentionNodeData(accountIds);
+              return this.fetchMentionNodeData(accountIds, this.abortControllerRef.current.signal);
             case 2:
               data = _context2.sent;
               queuedFetches.forEach(function (_ref4) {

package/dist/esm/ui/type-ahead/index.js

@@ -8,7 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { mentionMessages } from '@atlaskit/editor-common/messages';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';

package/dist/types/providers/mention-node-data-provider.d.ts

@@ -1,9 +1,10 @@
 import type { MentionDefinition } from '@atlaskit/adf-schema/mention';
 import type { MentionNodeDataCallback, MentionNodeDataIdentifier, MentionNodeDataProvider as MentionNodeDataProviderContract } from '@atlaskit/editor-common/mention';
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
+import type { MentionProvider } from '@atlaskit/mention/resource';
 import type { MentionNodeData } from '@atlaskit/mention/types';
 import { NodeDataProvider } from '@atlaskit/node-data-provider/node-data-provider';
-export type FetchMentionNodeData = (accountIds: string[]) => Promise<Record<string, MentionNodeData>>;
+export type FetchMentionNodeData = (accountIds: string[], signal?: AbortSignal) => Promise<Record<string, MentionNodeData>>;
 export type ResolveMentionNodeData = (mention: MentionNodeDataIdentifier) => MentionNodeData | undefined;
 /**
  * Page-scoped data provider for mention avatars.
@@ -21,11 +22,18 @@ export type ResolveMentionNodeData = (mention: MentionNodeDataIdentifier) => Men
  * invoked. A Relay adapter can query `users(accountIds:)`, then map each user's
  * `picture` and app type to a `MentionNodeData` record keyed by account ID. The
  * resolved result is cached by the underlying `NodeDataProvider`.
+ *
+ * Products that already have a `MentionProvider` result stream can call `connect`
+ * so emitted mention results populate a synchronous avatar cache.
  */
 export declare class MentionNodeDataProvider extends NodeDataProvider<MentionDefinition, MentionNodeData> implements MentionNodeDataProviderContract {
     private readonly fetchMentionNodeData;
     private readonly resolveMentionNodeData;
     readonly name = "mentionNodeDataProvider";
+    private readonly abortControllerRef;
+    private readonly emittedMentionCache;
+    private readonly subscriptionKey;
+    private lastMentionResource;
     private queuedFetches;
     private isFlushScheduled;
     constructor(fetchMentionNodeData: FetchMentionNodeData, resolveMentionNodeData?: ResolveMentionNodeData | undefined);
@@ -34,6 +42,8 @@ export declare class MentionNodeDataProvider extends NodeDataProvider<MentionDef
     fetchNodesData(nodes: MentionDefinition[]): Promise<MentionNodeData[]>;
     getMentionData(mention: MentionNodeDataIdentifier, callback: MentionNodeDataCallback): void;
     getMentionDataFromCache(mention: MentionNodeDataIdentifier): MentionNodeData | undefined;
+    connect(mentionResource: Promise<MentionProvider>): () => void;
+    private resolveMentionNodeDataFromCache;
     private enqueueFetch;
     private flushFetches;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "18.2.9",
+	"version": "18.3.0",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -56,10 +56,10 @@
 		"bind-event-listener": "^3.0.0",
 		"focus-trap": "^2.4.5",
 		"react-loadable": "^5.1.0",
-		"uuid": "^3.1.0"
+		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.13.0",
+		"@atlaskit/editor-common": "^120.14.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"