@atlaskit/editor-plugin-mentions 2.10.9 → 2.11.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-mentions
 
+## 2.11.0
+
+### Minor Changes
+
+- [#99344](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99344)
+  [`fbeb84f180cd2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fbeb84f180cd2) -
+  Added optional `isEligibleXProductUserInvite` and `inviteXProductUser` props which will be used in
+  CCEDITIONS-4746 (x-product-user-invite experiment). Project poster link -
+  https://hello.atlassian.net/wiki/spaces/CV1/pages/3685626022/Project+poster+-+Cross+Product+User+Search+Invites
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.10.9
 
 ### Patch Changes

package/dist/cjs/mentionsPlugin.js

@@ -5,13 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mentionsPlugin = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireDefault(require("react"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _key = require("./pm-plugins/key");
 var _main = require("./pm-plugins/main");
 var _SecondaryToolbarComponent = require("./ui/SecondaryToolbarComponent");
@@ -22,6 +25,7 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
   var options = _ref.config,
     api = _ref.api;
   var sessionId = (0, _uuid.default)();
+  var previousMediaProvider;
   var fireEvent = function fireEvent(payload, channel) {
     var _api$analytics;
     var fireAnalyticsEvent = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.fireAnalyticsEvent;
@@ -53,7 +57,12 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
       return [{
         name: 'mention',
         plugin: function plugin(pmPluginFactoryParams) {
-          return (0, _main.createMentionPlugin)(pmPluginFactoryParams, fireEvent, options);
+          return (0, _main.createMentionPlugin)({
+            pmPluginFactoryParams: pmPluginFactoryParams,
+            fireEvent: fireEvent,
+            options: options,
+            api: api
+          });
         }
       }];
     },
@@ -79,7 +88,51 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
         if (options !== null && options !== void 0 && options.handleMentionsChanged) {
           options.handleMentionsChanged(mentionChanges);
         }
-      }
+      },
+      setProvider: function () {
+        var _setProvider = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(providerPromise) {
+          var _api$core$actions$exe;
+          var provider;
+          return _regenerator.default.wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if ((0, _platformFeatureFlags.fg)('platform_editor_mention_provider_via_plugin_config')) {
+                  _context.next = 2;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 2:
+                _context.next = 4;
+                return providerPromise;
+              case 4:
+                provider = _context.sent;
+                if (!(previousMediaProvider === provider)) {
+                  _context.next = 7;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 7:
+                previousMediaProvider = provider;
+                return _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref3) {
+                  var tr = _ref3.tr;
+                  return tr.setMeta(_key.mentionPluginKey, {
+                    action: _main.ACTIONS.SET_PROVIDER,
+                    params: {
+                      provider: provider
+                    }
+                  });
+                })) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false);
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function setProvider(_x) {
+          return _setProvider.apply(this, arguments);
+        }
+        return setProvider;
+      }()
     },
     getSharedState: function getSharedState(editorState) {
       if (!editorState) {
@@ -91,8 +144,8 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
       });
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref3) {
-        var formatMessage = _ref3.formatMessage;
+      quickInsert: function quickInsert(_ref4) {
+        var formatMessage = _ref4.formatMessage;
         return [{
           id: 'mention',
           title: formatMessage(_messages.toolbarInsertBlockMessages.mention),

package/dist/cjs/nodeviews/mention.js

@@ -6,25 +6,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MentionNodeView = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _Mention = require("../ui/Mention");
 var MentionNodeView = exports.MentionNodeView = function MentionNodeView(props) {
-  var providerFactory = props.providerFactory;
+  var providerFactory = props.providerFactory,
+    pluginInjectionApi = props.pluginInjectionApi;
   var _props$node$attrs = props.node.attrs,
     id = _props$node$attrs.id,
     text = _props$node$attrs.text,
     accessLevel = _props$node$attrs.accessLevel,
     localId = _props$node$attrs.localId;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['mention']),
+    mentionState = _useSharedPluginState.mentionState;
+  var mentionProvider = mentionState === null || mentionState === void 0 ? void 0 : mentionState.mentionProvider;
   var renderAssistiveTextWithProviders = function renderAssistiveTextWithProviders(providers) {
     var _props$options;
-    var _ref = providers,
-      mentionProvider = _ref.mentionProvider;
+    var mentionProviderPromise = mentionProvider ? Promise.resolve(mentionProvider) : providers.mentionProvider;
     var profilecardProvider = (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.profilecardProvider;
     return /*#__PURE__*/_react.default.createElement(_Mention.Mention, {
       id: id,
       text: text,
       accessLevel: accessLevel,
-      mentionProvider: mentionProvider,
+      mentionProvider: mentionProviderPromise,
       profilecardProvider: profilecardProvider,
       localId: localId
     });

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ACTIONS = void 0;
 exports.createMentionPlugin = createMentionPlugin;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -19,11 +20,11 @@ var _key = require("./key");
 var _utils2 = require("./utils");
 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 ACTIONS = {
+var ACTIONS = exports.ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "2.10.9";
+var PACKAGE_VERSION = "2.11.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -37,7 +38,11 @@ var setProvider = function setProvider(provider) {
     return true;
   };
 };
-function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
+function createMentionPlugin(_ref) {
+  var pmPluginFactoryParams = _ref.pmPluginFactoryParams,
+    fireEvent = _ref.fireEvent,
+    options = _ref.options,
+    api = _ref.api;
   var mentionProvider;
   var sendAnalytics = function sendAnalytics(event, actionSubject, action, attributes
   // Ignored via go/ees005
@@ -68,12 +73,12 @@ function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, oldState, newState) {
-        var _ref = tr.getMeta(_key.mentionPluginKey) || {
+        var _ref2 = tr.getMeta(_key.mentionPluginKey) || {
             action: null,
             params: null
           },
-          action = _ref.action,
-          params = _ref.params;
+          action = _ref2.action,
+          params = _ref2.params;
         var hasNewPluginState = false;
         var newPluginState = pluginState;
         var hasPositionChanged = oldState.selection.from !== newState.selection.from || oldState.selection.to !== newState.selection.to;
@@ -104,6 +109,7 @@ function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
           Component: _mention.MentionNodeView,
           extraComponentProps: {
             providerFactory: pmPluginFactoryParams.providerFactory,
+            pluginInjectionApi: api,
             options: options
           }
         })
@@ -148,7 +154,12 @@ function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
         }
         return;
       };
-      pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
+      var providerViaConfig = (0, _platformFeatureFlags.fg)('platform_editor_mention_provider_via_plugin_config');
+      if (providerViaConfig && options !== null && options !== void 0 && options.mentionProvider) {
+        providerHandler('mentionProvider', options === null || options === void 0 ? void 0 : options.mentionProvider);
+      } else {
+        pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
+      }
       return {
         destroy: function destroy() {
           if (pmPluginFactoryParams.providerFactory) {
@@ -163,16 +174,16 @@ function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
           if (options !== null && options !== void 0 && options.handleMentionsChanged && (0, _platformFeatureFlags.fg)('confluence_updated_mentions_livepages')) {
             var mentionSchema = newState.schema.nodes.mention;
             var mentionNodesBefore = (0, _utils.findChildrenByType)(prevState.doc, mentionSchema);
-            var mentionLocalIdsAfter = new Set((0, _utils.findChildrenByType)(newState.doc, mentionSchema).map(function (_ref2) {
-              var node = _ref2.node;
+            var mentionLocalIdsAfter = new Set((0, _utils.findChildrenByType)(newState.doc, mentionSchema).map(function (_ref3) {
+              var node = _ref3.node;
               return node.attrs.localId;
             }));
             if (mentionNodesBefore.length > mentionLocalIdsAfter.size) {
-              var deletedMentions = mentionNodesBefore.filter(function (_ref3) {
-                var node = _ref3.node;
-                return !mentionLocalIdsAfter.has(node.attrs.localId);
-              }).map(function (_ref4) {
+              var deletedMentions = mentionNodesBefore.filter(function (_ref4) {
                 var node = _ref4.node;
+                return !mentionLocalIdsAfter.has(node.attrs.localId);
+              }).map(function (_ref5) {
+                var node = _ref5.node;
                 return {
                   type: 'deleted',
                   id: node.attrs.id,

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

@@ -299,7 +299,8 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         name = _item$mention.name,
         nickname = _item$mention.nickname,
         accessLevel = _item$mention.accessLevel,
-        userType = _item$mention.userType;
+        userType = _item$mention.userType,
+        isXProductUser = _item$mention.isXProductUser;
       var trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
       var renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
       var _ref10 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
@@ -356,6 +357,9 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       if (mentionProvider && (0, _utils4.isTeamType)(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
+      if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
+        mentionProvider.inviteXProductUser(id);
+      }
 
       // Don't insert into document if document data is sanitized.
       var text = sanitizePrivateContent ? '' : "@".concat(renderName);

package/dist/es2019/mentionsPlugin.js

@@ -4,8 +4,9 @@ import { mention } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconMention } from '@atlaskit/editor-common/quick-insert';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { mentionPluginKey } from './pm-plugins/key';
-import { createMentionPlugin } from './pm-plugins/main';
+import { ACTIONS, createMentionPlugin } from './pm-plugins/main';
 import { SecondaryToolbarComponent } from './ui/SecondaryToolbarComponent';
 import { createTypeAheadConfig } from './ui/type-ahead';
 const mentionsPlugin = ({
@@ -13,6 +14,7 @@ const mentionsPlugin = ({
   api
 }) => {
   const sessionId = uuid();
+  let previousMediaProvider;
   const fireEvent = (payload, channel) => {
     var _api$analytics, _api$analytics$action;
     const fireAnalyticsEvent = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.fireAnalyticsEvent;
@@ -43,7 +45,12 @@ const mentionsPlugin = ({
     pmPlugins() {
       return [{
         name: 'mention',
-        plugin: pmPluginFactoryParams => createMentionPlugin(pmPluginFactoryParams, fireEvent, options)
+        plugin: pmPluginFactoryParams => createMentionPlugin({
+          pmPluginFactoryParams,
+          fireEvent,
+          options,
+          api
+        })
       }];
     },
     secondaryToolbarComponent({
@@ -69,6 +76,26 @@ const mentionsPlugin = ({
         if (options !== null && options !== void 0 && options.handleMentionsChanged) {
           options.handleMentionsChanged(mentionChanges);
         }
+      },
+      setProvider: async providerPromise => {
+        var _api$core$actions$exe;
+        if (!fg('platform_editor_mention_provider_via_plugin_config')) {
+          return false;
+        }
+        const provider = await providerPromise;
+        // Prevent someone trying to set the exact same provider twice for performance reasons
+        if (previousMediaProvider === provider) {
+          return false;
+        }
+        previousMediaProvider = provider;
+        return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(({
+          tr
+        }) => tr.setMeta(mentionPluginKey, {
+          action: ACTIONS.SET_PROVIDER,
+          params: {
+            provider
+          }
+        }))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
       }
     },
     getSharedState(editorState) {

package/dist/es2019/nodeviews/mention.js

@@ -1,9 +1,11 @@
 import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { Mention } from '../ui/Mention';
 export const MentionNodeView = props => {
   const {
-    providerFactory
+    providerFactory,
+    pluginInjectionApi
   } = props;
   const {
     id,
@@ -11,17 +13,19 @@ export const MentionNodeView = props => {
     accessLevel,
     localId
   } = props.node.attrs;
+  const {
+    mentionState
+  } = useSharedPluginState(pluginInjectionApi, ['mention']);
+  const mentionProvider = mentionState === null || mentionState === void 0 ? void 0 : mentionState.mentionProvider;
   const renderAssistiveTextWithProviders = providers => {
     var _props$options;
-    const {
-      mentionProvider
-    } = providers;
+    const mentionProviderPromise = mentionProvider ? Promise.resolve(mentionProvider) : providers.mentionProvider;
     const profilecardProvider = (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.profilecardProvider;
     return /*#__PURE__*/React.createElement(Mention, {
       id: id,
       text: text,
       accessLevel: accessLevel,
-      mentionProvider: mentionProvider,
+      mentionProvider: mentionProviderPromise,
       profilecardProvider: profilecardProvider,
       localId: localId
     });

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

@@ -9,11 +9,11 @@ import { MentionNodeView } from '../nodeviews/mention';
 import { MENTION_PROVIDER_REJECTED, MENTION_PROVIDER_UNDEFINED } from '../types';
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
-const ACTIONS = {
+export const ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER'
 };
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "2.10.9";
+const PACKAGE_VERSION = "2.11.0";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {
@@ -25,7 +25,12 @@ const setProvider = provider => (state, dispatch) => {
   }
   return true;
 };
-export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
+export function createMentionPlugin({
+  pmPluginFactoryParams,
+  fireEvent,
+  options,
+  api
+}) {
   let mentionProvider;
   const sendAnalytics = (event, actionSubject, action, attributes
   // Ignored via go/ees005
@@ -96,6 +101,7 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
           Component: MentionNodeView,
           extraComponentProps: {
             providerFactory: pmPluginFactoryParams.providerFactory,
+            pluginInjectionApi: api,
             options
           }
         })
@@ -140,7 +146,12 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
         }
         return;
       };
-      pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
+      const providerViaConfig = fg('platform_editor_mention_provider_via_plugin_config');
+      if (providerViaConfig && options !== null && options !== void 0 && options.mentionProvider) {
+        providerHandler('mentionProvider', options === null || options === void 0 ? void 0 : options.mentionProvider);
+      } else {
+        pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
+      }
       return {
         destroy() {
           if (pmPluginFactoryParams.providerFactory) {

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

@@ -282,7 +282,8 @@ export const createTypeAheadConfig = ({
         name,
         nickname,
         accessLevel,
-        userType
+        userType,
+        isXProductUser
       } = item.mention;
       const trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
       const renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
@@ -340,6 +341,9 @@ export const createTypeAheadConfig = ({
       if (mentionProvider && isTeamType(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
+      if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
+        mentionProvider.inviteXProductUser(id);
+      }
 
       // Don't insert into document if document data is sanitized.
       const text = sanitizePrivateContent ? '' : `@${renderName}`;

package/dist/esm/mentionsPlugin.js

@@ -1,20 +1,24 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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; }
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import uuid from 'uuid';
 import { mention } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconMention } from '@atlaskit/editor-common/quick-insert';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { mentionPluginKey } from './pm-plugins/key';
-import { createMentionPlugin } from './pm-plugins/main';
+import { ACTIONS, createMentionPlugin } from './pm-plugins/main';
 import { SecondaryToolbarComponent } from './ui/SecondaryToolbarComponent';
 import { createTypeAheadConfig } from './ui/type-ahead';
 var mentionsPlugin = function mentionsPlugin(_ref) {
   var options = _ref.config,
     api = _ref.api;
   var sessionId = uuid();
+  var previousMediaProvider;
   var fireEvent = function fireEvent(payload, channel) {
     var _api$analytics;
     var fireAnalyticsEvent = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.fireAnalyticsEvent;
@@ -46,7 +50,12 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
       return [{
         name: 'mention',
         plugin: function plugin(pmPluginFactoryParams) {
-          return createMentionPlugin(pmPluginFactoryParams, fireEvent, options);
+          return createMentionPlugin({
+            pmPluginFactoryParams: pmPluginFactoryParams,
+            fireEvent: fireEvent,
+            options: options,
+            api: api
+          });
         }
       }];
     },
@@ -72,7 +81,51 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
         if (options !== null && options !== void 0 && options.handleMentionsChanged) {
           options.handleMentionsChanged(mentionChanges);
         }
-      }
+      },
+      setProvider: function () {
+        var _setProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(providerPromise) {
+          var _api$core$actions$exe;
+          var provider;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (fg('platform_editor_mention_provider_via_plugin_config')) {
+                  _context.next = 2;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 2:
+                _context.next = 4;
+                return providerPromise;
+              case 4:
+                provider = _context.sent;
+                if (!(previousMediaProvider === provider)) {
+                  _context.next = 7;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 7:
+                previousMediaProvider = provider;
+                return _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref3) {
+                  var tr = _ref3.tr;
+                  return tr.setMeta(mentionPluginKey, {
+                    action: ACTIONS.SET_PROVIDER,
+                    params: {
+                      provider: provider
+                    }
+                  });
+                })) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false);
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function setProvider(_x) {
+          return _setProvider.apply(this, arguments);
+        }
+        return setProvider;
+      }()
     },
     getSharedState: function getSharedState(editorState) {
       if (!editorState) {
@@ -84,8 +137,8 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
       });
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref3) {
-        var formatMessage = _ref3.formatMessage;
+      quickInsert: function quickInsert(_ref4) {
+        var formatMessage = _ref4.formatMessage;
         return [{
           id: 'mention',
           title: formatMessage(messages.mention),

package/dist/esm/nodeviews/mention.js

@@ -1,23 +1,27 @@
 import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { Mention } from '../ui/Mention';
 export var MentionNodeView = function MentionNodeView(props) {
-  var providerFactory = props.providerFactory;
+  var providerFactory = props.providerFactory,
+    pluginInjectionApi = props.pluginInjectionApi;
   var _props$node$attrs = props.node.attrs,
     id = _props$node$attrs.id,
     text = _props$node$attrs.text,
     accessLevel = _props$node$attrs.accessLevel,
     localId = _props$node$attrs.localId;
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['mention']),
+    mentionState = _useSharedPluginState.mentionState;
+  var mentionProvider = mentionState === null || mentionState === void 0 ? void 0 : mentionState.mentionProvider;
   var renderAssistiveTextWithProviders = function renderAssistiveTextWithProviders(providers) {
     var _props$options;
-    var _ref = providers,
-      mentionProvider = _ref.mentionProvider;
+    var mentionProviderPromise = mentionProvider ? Promise.resolve(mentionProvider) : providers.mentionProvider;
     var profilecardProvider = (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.profilecardProvider;
     return /*#__PURE__*/React.createElement(Mention, {
       id: id,
       text: text,
       accessLevel: accessLevel,
-      mentionProvider: mentionProvider,
+      mentionProvider: mentionProviderPromise,
       profilecardProvider: profilecardProvider,
       localId: localId
     });

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

@@ -12,11 +12,11 @@ import { MentionNodeView } from '../nodeviews/mention';
 import { MENTION_PROVIDER_REJECTED, MENTION_PROVIDER_UNDEFINED } from '../types';
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
-var ACTIONS = {
+export var ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "2.10.9";
+var PACKAGE_VERSION = "2.11.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -30,7 +30,11 @@ var setProvider = function setProvider(provider) {
     return true;
   };
 };
-export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
+export function createMentionPlugin(_ref) {
+  var pmPluginFactoryParams = _ref.pmPluginFactoryParams,
+    fireEvent = _ref.fireEvent,
+    options = _ref.options,
+    api = _ref.api;
   var mentionProvider;
   var sendAnalytics = function sendAnalytics(event, actionSubject, action, attributes
   // Ignored via go/ees005
@@ -61,12 +65,12 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, oldState, newState) {
-        var _ref = tr.getMeta(mentionPluginKey) || {
+        var _ref2 = tr.getMeta(mentionPluginKey) || {
             action: null,
             params: null
           },
-          action = _ref.action,
-          params = _ref.params;
+          action = _ref2.action,
+          params = _ref2.params;
         var hasNewPluginState = false;
         var newPluginState = pluginState;
         var hasPositionChanged = oldState.selection.from !== newState.selection.from || oldState.selection.to !== newState.selection.to;
@@ -97,6 +101,7 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
           Component: MentionNodeView,
           extraComponentProps: {
             providerFactory: pmPluginFactoryParams.providerFactory,
+            pluginInjectionApi: api,
             options: options
           }
         })
@@ -141,7 +146,12 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
         }
         return;
       };
-      pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
+      var providerViaConfig = fg('platform_editor_mention_provider_via_plugin_config');
+      if (providerViaConfig && options !== null && options !== void 0 && options.mentionProvider) {
+        providerHandler('mentionProvider', options === null || options === void 0 ? void 0 : options.mentionProvider);
+      } else {
+        pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
+      }
       return {
         destroy: function destroy() {
           if (pmPluginFactoryParams.providerFactory) {
@@ -156,16 +166,16 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
           if (options !== null && options !== void 0 && options.handleMentionsChanged && fg('confluence_updated_mentions_livepages')) {
             var mentionSchema = newState.schema.nodes.mention;
             var mentionNodesBefore = findChildrenByType(prevState.doc, mentionSchema);
-            var mentionLocalIdsAfter = new Set(findChildrenByType(newState.doc, mentionSchema).map(function (_ref2) {
-              var node = _ref2.node;
+            var mentionLocalIdsAfter = new Set(findChildrenByType(newState.doc, mentionSchema).map(function (_ref3) {
+              var node = _ref3.node;
               return node.attrs.localId;
             }));
             if (mentionNodesBefore.length > mentionLocalIdsAfter.size) {
-              var deletedMentions = mentionNodesBefore.filter(function (_ref3) {
-                var node = _ref3.node;
-                return !mentionLocalIdsAfter.has(node.attrs.localId);
-              }).map(function (_ref4) {
+              var deletedMentions = mentionNodesBefore.filter(function (_ref4) {
                 var node = _ref4.node;
+                return !mentionLocalIdsAfter.has(node.attrs.localId);
+              }).map(function (_ref5) {
+                var node = _ref5.node;
                 return {
                   type: 'deleted',
                   id: node.attrs.id,

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

@@ -287,7 +287,8 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         name = _item$mention.name,
         nickname = _item$mention.nickname,
         accessLevel = _item$mention.accessLevel,
-        userType = _item$mention.userType;
+        userType = _item$mention.userType,
+        isXProductUser = _item$mention.isXProductUser;
       var trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
       var renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
       var _ref10 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
@@ -344,6 +345,9 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       if (mentionProvider && isTeamType(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
+      if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
+        mentionProvider.inviteXProductUser(id);
+      }
 
       // Don't insert into document if document data is sanitized.
       var text = sanitizePrivateContent ? '' : "@".concat(renderName);

package/dist/types/mentionsPluginType.d.ts

@@ -2,6 +2,7 @@ import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/t
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-identifier';
 import type { TypeAheadInputMethod, TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
+import type { MentionProvider } from '@atlaskit/mention/resource';
 import type { MentionPluginOptions, MentionSharedState } from './types';
 export type MentionsPlugin = NextEditorPlugin<'mention', {
     pluginConfiguration: MentionPluginOptions | undefined;
@@ -19,5 +20,12 @@ export type MentionsPlugin = NextEditorPlugin<'mention', {
             id: string;
             taskLocalId?: string;
         }[]) => void;
+        /**
+         * Used to update the initial provider passed to the mention plugin.
+         *
+         * @param provider Promise<MentionProvider>
+         * @returns {boolean} if setting the provider was successful or not
+         */
+        setProvider: (provider: Promise<MentionProvider>) => Promise<boolean>;
     };
 }>;

package/dist/types/nodeviews/mention.d.ts

@@ -1,9 +1,12 @@
 /// <reference types="react" />
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { InlineNodeViewComponentProps } from '@atlaskit/editor-common/react-node-view';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { MentionsPlugin } from '../mentionsPluginType';
 import type { MentionPluginOptions } from '../types';
 export type Props = InlineNodeViewComponentProps & {
     options: MentionPluginOptions | undefined;
     providerFactory: ProviderFactory;
+    pluginInjectionApi?: ExtractInjectionAPI<MentionsPlugin>;
 };
 export declare const MentionNodeView: (props: Props) => JSX.Element;

package/dist/types/pm-plugins/main.d.ts

@@ -1,4 +1,15 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { MentionsPlugin } from '../mentionsPluginType';
 import { type FireElementsChannelEvent, type MentionPluginOptions, type MentionPluginState } from '../types';
-export declare function createMentionPlugin(pmPluginFactoryParams: PMPluginFactoryParams, fireEvent: FireElementsChannelEvent, options?: MentionPluginOptions): SafePlugin<MentionPluginState>;
+export declare const ACTIONS: {
+    SET_PROVIDER: string;
+};
+interface CreateMentionPlugin {
+    pmPluginFactoryParams: PMPluginFactoryParams;
+    fireEvent: FireElementsChannelEvent;
+    options?: MentionPluginOptions;
+    api?: ExtractInjectionAPI<MentionsPlugin>;
+}
+export declare function createMentionPlugin({ pmPluginFactoryParams, fireEvent, options, api, }: CreateMentionPlugin): SafePlugin<MentionPluginState>;
+export {};

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

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 import { type ProfilecardProvider } from '@atlaskit/editor-common/provider-factory';
+import type { Providers } from '@atlaskit/editor-common/provider-factory';
 import type { TypeAheadHandler } from '@atlaskit/editor-common/types';
 import type { MentionDescription, MentionProvider } from '@atlaskit/mention';
 export declare const MENTION_PROVIDER_REJECTED = "REJECTED";
@@ -16,6 +17,7 @@ export interface MentionPluginConfig {
     profilecardProvider?: Promise<ProfilecardProvider>;
 }
 export interface MentionPluginOptions extends MentionPluginConfig {
+    mentionProvider?: Providers['mentionProvider'];
     sanitizePrivateContent?: boolean;
     allowZeroWidthSpaceAfter?: boolean;
     handleMentionsChanged?: (mentionChanges: {

package/dist/types-ts4.5/mentionsPluginType.d.ts

@@ -2,6 +2,7 @@ import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/t
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-identifier';
 import type { TypeAheadInputMethod, TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
+import type { MentionProvider } from '@atlaskit/mention/resource';
 import type { MentionPluginOptions, MentionSharedState } from './types';
 export type MentionsPlugin = NextEditorPlugin<'mention', {
     pluginConfiguration: MentionPluginOptions | undefined;
@@ -19,5 +20,12 @@ export type MentionsPlugin = NextEditorPlugin<'mention', {
             id: string;
             taskLocalId?: string;
         }[]) => void;
+        /**
+         * Used to update the initial provider passed to the mention plugin.
+         *
+         * @param provider Promise<MentionProvider>
+         * @returns {boolean} if setting the provider was successful or not
+         */
+        setProvider: (provider: Promise<MentionProvider>) => Promise<boolean>;
     };
 }>;

package/dist/types-ts4.5/nodeviews/mention.d.ts

@@ -1,9 +1,12 @@
 /// <reference types="react" />
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { InlineNodeViewComponentProps } from '@atlaskit/editor-common/react-node-view';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { MentionsPlugin } from '../mentionsPluginType';
 import type { MentionPluginOptions } from '../types';
 export type Props = InlineNodeViewComponentProps & {
     options: MentionPluginOptions | undefined;
     providerFactory: ProviderFactory;
+    pluginInjectionApi?: ExtractInjectionAPI<MentionsPlugin>;
 };
 export declare const MentionNodeView: (props: Props) => JSX.Element;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -1,4 +1,15 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { MentionsPlugin } from '../mentionsPluginType';
 import { type FireElementsChannelEvent, type MentionPluginOptions, type MentionPluginState } from '../types';
-export declare function createMentionPlugin(pmPluginFactoryParams: PMPluginFactoryParams, fireEvent: FireElementsChannelEvent, options?: MentionPluginOptions): SafePlugin<MentionPluginState>;
+export declare const ACTIONS: {
+    SET_PROVIDER: string;
+};
+interface CreateMentionPlugin {
+    pmPluginFactoryParams: PMPluginFactoryParams;
+    fireEvent: FireElementsChannelEvent;
+    options?: MentionPluginOptions;
+    api?: ExtractInjectionAPI<MentionsPlugin>;
+}
+export declare function createMentionPlugin({ pmPluginFactoryParams, fireEvent, options, api, }: CreateMentionPlugin): SafePlugin<MentionPluginState>;
+export {};

package/dist/types-ts4.5/types/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 import { type ProfilecardProvider } from '@atlaskit/editor-common/provider-factory';
+import type { Providers } from '@atlaskit/editor-common/provider-factory';
 import type { TypeAheadHandler } from '@atlaskit/editor-common/types';
 import type { MentionDescription, MentionProvider } from '@atlaskit/mention';
 export declare const MENTION_PROVIDER_REJECTED = "REJECTED";
@@ -16,6 +17,7 @@ export interface MentionPluginConfig {
     profilecardProvider?: Promise<ProfilecardProvider>;
 }
 export interface MentionPluginOptions extends MentionPluginConfig {
+    mentionProvider?: Providers['mentionProvider'];
     sanitizePrivateContent?: boolean;
     allowZeroWidthSpaceAfter?: boolean;
     handleMentionsChanged?: (mentionChanges: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "2.10.9",
+	"version": "2.11.0",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,13 +32,13 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^98.0.0",
+		"@atlaskit/editor-common": "^98.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-context-identifier": "^1.3.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.11.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/icon": "^23.1.0",
-		"@atlaskit/mention": "^23.5.0",
+		"@atlaskit/mention": "^23.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tokens": "^2.5.0",
@@ -106,6 +106,9 @@
 		},
 		"team-mention-inline-smartlink": {
 			"type": "boolean"
+		},
+		"platform_editor_mention_provider_via_plugin_config": {
+			"type": "boolean"
 		}
 	}
 }