@atlaskit/editor-plugin-mentions 0.2.0 → 0.2.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-mentions
 
+## 0.2.2
+
+### Patch Changes
+
+- [#70152](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70152) [`53ed3673df28`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/53ed3673df28) - Updating adf-schema version to 35.5.1
+
+## 0.2.1
+
+### Patch Changes
+
+- [#68640](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68640) [`6a3ea210641a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6a3ea210641a) - Create new context identifier plugin which contains the provider.
+- Updated dependencies
+
 ## 0.2.0
 
 ### Minor Changes

package/dist/cjs/plugin.js

@@ -39,7 +39,8 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
     sanitizePrivateContent: options === null || options === void 0 ? void 0 : options.sanitizePrivateContent,
     mentionInsertDisplayName: options === null || options === void 0 ? void 0 : options.insertDisplayName,
     HighlightComponent: options === null || options === void 0 ? void 0 : options.HighlightComponent,
-    fireEvent: fireEvent
+    fireEvent: fireEvent,
+    api: api
   });
   return {
     name: 'mention',

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMentionPlugin = createMentionPlugin;
-exports.setContext = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
@@ -16,8 +15,7 @@ var _utils = 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 = {
-  SET_PROVIDER: 'SET_PROVIDER',
-  SET_CONTEXT: 'SET_CONTEXT'
+  SET_PROVIDER: 'SET_PROVIDER'
 };
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
@@ -32,19 +30,6 @@ var setProvider = function setProvider(provider) {
     return true;
   };
 };
-var setContext = exports.setContext = function setContext(context) {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(state.tr.setMeta(_key.mentionPluginKey, {
-        action: ACTIONS.SET_CONTEXT,
-        params: {
-          context: context
-        }
-      }));
-    }
-    return true;
-  };
-};
 function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
   var mentionProvider;
   var sendAnalytics = function sendAnalytics(event, actionSubject, action, attributes) {
@@ -84,12 +69,6 @@ function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
             });
             hasNewPluginState = true;
             break;
-          case ACTIONS.SET_CONTEXT:
-            newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-              contextIdentifierProvider: params.context
-            });
-            hasNewPluginState = true;
-            break;
         }
         if (hasNewPluginState) {
           pmPluginFactoryParams.dispatch(_key.mentionPluginKey, newPluginState);
@@ -127,24 +106,14 @@ function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
               return setProvider(undefined)(editorView.state, editorView.dispatch);
             });
             break;
-          case 'contextIdentifierProvider':
-            if (!providerPromise) {
-              return setContext(undefined)(editorView.state, editorView.dispatch);
-            }
-            providerPromise.then(function (provider) {
-              setContext(provider)(editorView.state, editorView.dispatch);
-            });
-            break;
         }
         return;
       };
       pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
-      pmPluginFactoryParams.providerFactory.subscribe('contextIdentifierProvider', providerHandler);
       return {
         destroy: function destroy() {
           if (pmPluginFactoryParams.providerFactory) {
             pmPluginFactoryParams.providerFactory.unsubscribe('mentionProvider', providerHandler);
-            pmPluginFactoryParams.providerFactory.unsubscribe('contextIdentifierProvider', providerHandler);
           }
           if (mentionProvider) {
             mentionProvider.unsubscribe('mentionPlugin');

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

@@ -193,7 +193,8 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
   var sanitizePrivateContent = _ref6.sanitizePrivateContent,
     mentionInsertDisplayName = _ref6.mentionInsertDisplayName,
     fireEvent = _ref6.fireEvent,
-    HighlightComponent = _ref6.HighlightComponent;
+    HighlightComponent = _ref6.HighlightComponent,
+    api = _ref6.api;
   var sessionId = (0, _uuid.default)();
   var firstQueryWithoutResults = null;
   var subscriptionKeys = new Set();
@@ -211,14 +212,16 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       return null;
     },
     getItems: function getItems(_ref7) {
+      var _api$contextIdentifie, _api$contextIdentifie2;
       var query = _ref7.query,
         editorState = _ref7.editorState;
       var pluginState = (0, _utils2.getMentionPluginState)(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
       }
-      var mentionProvider = pluginState.mentionProvider,
-        contextIdentifierProvider = pluginState.contextIdentifierProvider;
+      var mentionProvider = pluginState.mentionProvider;
+      var _ref8 = (_api$contextIdentifie = api === null || api === void 0 || (_api$contextIdentifie2 = api.contextIdentifier) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.sharedState.currentState()) !== null && _api$contextIdentifie !== void 0 ? _api$contextIdentifie : {},
+        contextIdentifierProvider = _ref8.contextIdentifierProvider;
       return new Promise(function (resolve) {
         var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.default)());
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
@@ -271,11 +274,12 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
     onOpen: function onOpen() {
       firstQueryWithoutResults = null;
     },
-    selectItem: function selectItem(state, item, insert, _ref8) {
-      var mode = _ref8.mode,
-        stats = _ref8.stats,
-        query = _ref8.query,
-        sourceListItem = _ref8.sourceListItem;
+    selectItem: function selectItem(state, item, insert, _ref9) {
+      var _api$contextIdentifie3, _api$contextIdentifie4;
+      var mode = _ref9.mode,
+        stats = _ref9.stats,
+        query = _ref9.query,
+        sourceListItem = _ref9.sourceListItem;
       var schema = state.schema;
       var pluginState = (0, _utils2.getMentionPluginState)(state);
       var mentionProvider = pluginState.mentionProvider;
@@ -287,7 +291,9 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         userType = _item$mention.userType;
       var trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
       var renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
-      var mentionContext = _objectSpread(_objectSpread({}, pluginState.contextIdentifierProvider), {}, {
+      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 : {},
+        contextIdentifierProvider = _ref10.contextIdentifierProvider;
+      var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
         sessionId: sessionId
       });
       if (mentionProvider && !(0, _utils3.isInviteItem)(item.mention)) {
@@ -299,7 +305,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       if (mentionProvider && mentionProvider.shouldEnableInvite && (0, _utils3.isInviteItem)(item.mention)) {
         // Don't fire event and the callback with selection by space press
         if (mode !== 'space') {
-          fireEvent((0, _analytics.buildTypeAheadInviteItemClickedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, pluginState.contextIdentifierProvider, mentionProvider.userRole));
+          fireEvent((0, _analytics.buildTypeAheadInviteItemClickedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, contextIdentifierProvider, mentionProvider.userRole));
           if (mentionProvider.onInviteItemClick) {
             mentionProvider.onInviteItemClick('mention');
           }
@@ -317,7 +323,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }
       fireEvent((0, _analytics.buildTypeAheadInsertedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, sourceListItem.map(function (x) {
         return x.mention;
-      }), query, pluginState.contextIdentifierProvider, taskListId, taskItemId));
+      }), query, contextIdentifierProvider, taskListId, taskItemId));
       sessionId = (0, _uuid.default)();
       if (mentionProvider && (0, _utils3.isTeamType)(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
@@ -338,11 +344,11 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       var space = schema.text(' ');
       return insert(_model.Fragment.from([mentionNode, space]));
     },
-    dismiss: function dismiss(_ref9) {
-      var editorState = _ref9.editorState,
-        query = _ref9.query,
-        stats = _ref9.stats,
-        wasItemInserted = _ref9.wasItemInserted;
+    dismiss: function dismiss(_ref11) {
+      var editorState = _ref11.editorState,
+        query = _ref11.query,
+        stats = _ref11.stats,
+        wasItemInserted = _ref11.wasItemInserted;
       firstQueryWithoutResults = null;
       var pickerElapsedTime = stats.startedAt ? performance.now() - stats.startedAt : 0;
       if (!wasItemInserted) {

package/dist/es2019/plugin.js

@@ -31,7 +31,8 @@ const mentionsPlugin = ({
     sanitizePrivateContent: options === null || options === void 0 ? void 0 : options.sanitizePrivateContent,
     mentionInsertDisplayName: options === null || options === void 0 ? void 0 : options.insertDisplayName,
     HighlightComponent: options === null || options === void 0 ? void 0 : options.HighlightComponent,
-    fireEvent
+    fireEvent,
+    api
   });
   return {
     name: 'mention',

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

@@ -5,8 +5,7 @@ import { MentionNodeView } from '../nodeviews/mention';
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
 const ACTIONS = {
-  SET_PROVIDER: 'SET_PROVIDER',
-  SET_CONTEXT: 'SET_CONTEXT'
+  SET_PROVIDER: 'SET_PROVIDER'
 };
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
@@ -19,17 +18,6 @@ const setProvider = provider => (state, dispatch) => {
   }
   return true;
 };
-export const setContext = context => (state, dispatch) => {
-  if (dispatch) {
-    dispatch(state.tr.setMeta(mentionPluginKey, {
-      action: ACTIONS.SET_CONTEXT,
-      params: {
-        context
-      }
-    }));
-  }
-  return true;
-};
 export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
   let mentionProvider;
   const sendAnalytics = (event, actionSubject, action, attributes) => {
@@ -72,13 +60,6 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
             };
             hasNewPluginState = true;
             break;
-          case ACTIONS.SET_CONTEXT:
-            newPluginState = {
-              ...newPluginState,
-              contextIdentifierProvider: params.context
-            };
-            hasNewPluginState = true;
-            break;
         }
         if (hasNewPluginState) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
@@ -114,24 +95,14 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
               provider.subscribe('mentionPlugin', undefined, undefined, undefined, undefined, sendAnalytics);
             }).catch(() => setProvider(undefined)(editorView.state, editorView.dispatch));
             break;
-          case 'contextIdentifierProvider':
-            if (!providerPromise) {
-              return setContext(undefined)(editorView.state, editorView.dispatch);
-            }
-            providerPromise.then(provider => {
-              setContext(provider)(editorView.state, editorView.dispatch);
-            });
-            break;
         }
         return;
       };
       pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
-      pmPluginFactoryParams.providerFactory.subscribe('contextIdentifierProvider', providerHandler);
       return {
         destroy() {
           if (pmPluginFactoryParams.providerFactory) {
             pmPluginFactoryParams.providerFactory.unsubscribe('mentionProvider', providerHandler);
-            pmPluginFactoryParams.providerFactory.unsubscribe('contextIdentifierProvider', providerHandler);
           }
           if (mentionProvider) {
             mentionProvider.unsubscribe('mentionPlugin');

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

@@ -169,7 +169,8 @@ export const createTypeAheadConfig = ({
   sanitizePrivateContent,
   mentionInsertDisplayName,
   fireEvent,
-  HighlightComponent
+  HighlightComponent,
+  api
 }) => {
   let sessionId = uuid();
   let firstQueryWithoutResults = null;
@@ -191,14 +192,17 @@ export const createTypeAheadConfig = ({
       query,
       editorState
     }) {
+      var _api$contextIdentifie, _api$contextIdentifie2;
       const pluginState = getMentionPluginState(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
       }
       const {
-        mentionProvider,
-        contextIdentifierProvider
+        mentionProvider
       } = pluginState;
+      const {
+        contextIdentifierProvider
+      } = (_api$contextIdentifie = api === null || api === void 0 ? void 0 : (_api$contextIdentifie2 = api.contextIdentifier) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.sharedState.currentState()) !== null && _api$contextIdentifie !== void 0 ? _api$contextIdentifie : {};
       return new Promise(resolve => {
         const key = `loadingMentionsForTypeAhead_${uuid()}`;
         const mentionsSubscribeCallback = (mentions, resultQuery = '', stats) => {
@@ -256,6 +260,7 @@ export const createTypeAheadConfig = ({
       query,
       sourceListItem
     }) {
+      var _api$contextIdentifie3, _api$contextIdentifie4;
       const {
         schema
       } = state;
@@ -272,8 +277,11 @@ export const createTypeAheadConfig = ({
       } = item.mention;
       const trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
       const renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
+      const {
+        contextIdentifierProvider
+      } = (_api$contextIdentifie3 = api === null || api === void 0 ? void 0 : (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {};
       const mentionContext = {
-        ...pluginState.contextIdentifierProvider,
+        ...contextIdentifierProvider,
         sessionId
       };
       if (mentionProvider && !isInviteItem(item.mention)) {
@@ -285,7 +293,7 @@ export const createTypeAheadConfig = ({
       if (mentionProvider && mentionProvider.shouldEnableInvite && isInviteItem(item.mention)) {
         // Don't fire event and the callback with selection by space press
         if (mode !== 'space') {
-          fireEvent(buildTypeAheadInviteItemClickedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, pluginState.contextIdentifierProvider, mentionProvider.userRole));
+          fireEvent(buildTypeAheadInviteItemClickedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, contextIdentifierProvider, mentionProvider.userRole));
           if (mentionProvider.onInviteItemClick) {
             mentionProvider.onInviteItemClick('mention');
           }
@@ -301,7 +309,7 @@ export const createTypeAheadConfig = ({
           taskItemId = taskItem.node.attrs.localId;
         }
       }
-      fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, sourceListItem.map(x => x.mention), query, pluginState.contextIdentifierProvider, taskListId, taskItemId));
+      fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, sourceListItem.map(x => x.mention), query, contextIdentifierProvider, taskListId, taskItemId));
       sessionId = uuid();
       if (mentionProvider && isTeamType(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));

package/dist/esm/plugin.js

@@ -32,7 +32,8 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
     sanitizePrivateContent: options === null || options === void 0 ? void 0 : options.sanitizePrivateContent,
     mentionInsertDisplayName: options === null || options === void 0 ? void 0 : options.insertDisplayName,
     HighlightComponent: options === null || options === void 0 ? void 0 : options.HighlightComponent,
-    fireEvent: fireEvent
+    fireEvent: fireEvent,
+    api: api
   });
   return {
     name: 'mention',

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

@@ -8,8 +8,7 @@ import { MentionNodeView } from '../nodeviews/mention';
 import { mentionPluginKey } from './key';
 import { canMentionBeCreatedInRange } from './utils';
 var ACTIONS = {
-  SET_PROVIDER: 'SET_PROVIDER',
-  SET_CONTEXT: 'SET_CONTEXT'
+  SET_PROVIDER: 'SET_PROVIDER'
 };
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
@@ -24,19 +23,6 @@ var setProvider = function setProvider(provider) {
     return true;
   };
 };
-export var setContext = function setContext(context) {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(state.tr.setMeta(mentionPluginKey, {
-        action: ACTIONS.SET_CONTEXT,
-        params: {
-          context: context
-        }
-      }));
-    }
-    return true;
-  };
-};
 export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
   var mentionProvider;
   var sendAnalytics = function sendAnalytics(event, actionSubject, action, attributes) {
@@ -76,12 +62,6 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
             });
             hasNewPluginState = true;
             break;
-          case ACTIONS.SET_CONTEXT:
-            newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-              contextIdentifierProvider: params.context
-            });
-            hasNewPluginState = true;
-            break;
         }
         if (hasNewPluginState) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
@@ -119,24 +99,14 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
               return setProvider(undefined)(editorView.state, editorView.dispatch);
             });
             break;
-          case 'contextIdentifierProvider':
-            if (!providerPromise) {
-              return setContext(undefined)(editorView.state, editorView.dispatch);
-            }
-            providerPromise.then(function (provider) {
-              setContext(provider)(editorView.state, editorView.dispatch);
-            });
-            break;
         }
         return;
       };
       pmPluginFactoryParams.providerFactory.subscribe('mentionProvider', providerHandler);
-      pmPluginFactoryParams.providerFactory.subscribe('contextIdentifierProvider', providerHandler);
       return {
         destroy: function destroy() {
           if (pmPluginFactoryParams.providerFactory) {
             pmPluginFactoryParams.providerFactory.unsubscribe('mentionProvider', providerHandler);
-            pmPluginFactoryParams.providerFactory.unsubscribe('contextIdentifierProvider', providerHandler);
           }
           if (mentionProvider) {
             mentionProvider.unsubscribe('mentionPlugin');

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

@@ -181,7 +181,8 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
   var sanitizePrivateContent = _ref6.sanitizePrivateContent,
     mentionInsertDisplayName = _ref6.mentionInsertDisplayName,
     fireEvent = _ref6.fireEvent,
-    HighlightComponent = _ref6.HighlightComponent;
+    HighlightComponent = _ref6.HighlightComponent,
+    api = _ref6.api;
   var sessionId = uuid();
   var firstQueryWithoutResults = null;
   var subscriptionKeys = new Set();
@@ -199,14 +200,16 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       return null;
     },
     getItems: function getItems(_ref7) {
+      var _api$contextIdentifie, _api$contextIdentifie2;
       var query = _ref7.query,
         editorState = _ref7.editorState;
       var pluginState = getMentionPluginState(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
       }
-      var mentionProvider = pluginState.mentionProvider,
-        contextIdentifierProvider = pluginState.contextIdentifierProvider;
+      var mentionProvider = pluginState.mentionProvider;
+      var _ref8 = (_api$contextIdentifie = api === null || api === void 0 || (_api$contextIdentifie2 = api.contextIdentifier) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.sharedState.currentState()) !== null && _api$contextIdentifie !== void 0 ? _api$contextIdentifie : {},
+        contextIdentifierProvider = _ref8.contextIdentifierProvider;
       return new Promise(function (resolve) {
         var key = "loadingMentionsForTypeAhead_".concat(uuid());
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
@@ -259,11 +262,12 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
     onOpen: function onOpen() {
       firstQueryWithoutResults = null;
     },
-    selectItem: function selectItem(state, item, insert, _ref8) {
-      var mode = _ref8.mode,
-        stats = _ref8.stats,
-        query = _ref8.query,
-        sourceListItem = _ref8.sourceListItem;
+    selectItem: function selectItem(state, item, insert, _ref9) {
+      var _api$contextIdentifie3, _api$contextIdentifie4;
+      var mode = _ref9.mode,
+        stats = _ref9.stats,
+        query = _ref9.query,
+        sourceListItem = _ref9.sourceListItem;
       var schema = state.schema;
       var pluginState = getMentionPluginState(state);
       var mentionProvider = pluginState.mentionProvider;
@@ -275,7 +279,9 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         userType = _item$mention.userType;
       var trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
       var renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
-      var mentionContext = _objectSpread(_objectSpread({}, pluginState.contextIdentifierProvider), {}, {
+      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 : {},
+        contextIdentifierProvider = _ref10.contextIdentifierProvider;
+      var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
         sessionId: sessionId
       });
       if (mentionProvider && !isInviteItem(item.mention)) {
@@ -287,7 +293,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       if (mentionProvider && mentionProvider.shouldEnableInvite && isInviteItem(item.mention)) {
         // Don't fire event and the callback with selection by space press
         if (mode !== 'space') {
-          fireEvent(buildTypeAheadInviteItemClickedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, pluginState.contextIdentifierProvider, mentionProvider.userRole));
+          fireEvent(buildTypeAheadInviteItemClickedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, contextIdentifierProvider, mentionProvider.userRole));
           if (mentionProvider.onInviteItemClick) {
             mentionProvider.onInviteItemClick('mention');
           }
@@ -305,7 +311,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       }
       fireEvent(buildTypeAheadInsertedPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, sourceListItem.map(function (x) {
         return x.mention;
-      }), query, pluginState.contextIdentifierProvider, taskListId, taskItemId));
+      }), query, contextIdentifierProvider, taskListId, taskItemId));
       sessionId = uuid();
       if (mentionProvider && isTeamType(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
@@ -326,11 +332,11 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       var space = schema.text(' ');
       return insert(Fragment.from([mentionNode, space]));
     },
-    dismiss: function dismiss(_ref9) {
-      var editorState = _ref9.editorState,
-        query = _ref9.query,
-        stats = _ref9.stats,
-        wasItemInserted = _ref9.wasItemInserted;
+    dismiss: function dismiss(_ref11) {
+      var editorState = _ref11.editorState,
+        query = _ref11.query,
+        stats = _ref11.stats,
+        wasItemInserted = _ref11.wasItemInserted;
       firstQueryWithoutResults = null;
       var pickerElapsedTime = stats.startedAt ? performance.now() - stats.startedAt : 0;
       if (!wasItemInserted) {

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

@@ -1,6 +1,4 @@
-import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { Command, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { MentionPluginOptions, MentionPluginState } from '../types';
-export declare const setContext: (context: ContextIdentifierProvider | undefined) => Command;
 export declare function createMentionPlugin(pmPluginFactoryParams: PMPluginFactoryParams, fireEvent: (payload: any) => void, options?: MentionPluginOptions): SafePlugin<MentionPluginState>;

package/dist/types/type-ahead/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { TypeAheadHandler, TypeAheadItem } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, TypeAheadHandler, TypeAheadItem } from '@atlaskit/editor-common/types';
 import type { MentionDescription } from '@atlaskit/mention/resource';
-import type { FireElementsChannelEvent } from '../types';
+import type { FireElementsChannelEvent, MentionsPlugin } from '../types';
 export declare const mentionToTypeaheadItem: (mention: MentionDescription) => TypeAheadItem;
 export declare function memoize<ResultFn extends (mention: MentionDescription) => TypeAheadItem>(fn: ResultFn): {
     call: ResultFn;
@@ -12,6 +12,7 @@ type Props = {
     mentionInsertDisplayName?: boolean;
     HighlightComponent?: React.ComponentType;
     fireEvent: FireElementsChannelEvent;
+    api: ExtractInjectionAPI<MentionsPlugin> | undefined;
 };
-export declare const createTypeAheadConfig: ({ sanitizePrivateContent, mentionInsertDisplayName, fireEvent, HighlightComponent, }: Props) => TypeAheadHandler;
+export declare const createTypeAheadConfig: ({ sanitizePrivateContent, mentionInsertDisplayName, fireEvent, HighlightComponent, api, }: Props) => TypeAheadHandler;
 export {};

package/dist/types/types.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import type { AnalyticsEventPayload } from '@atlaskit/analytics-next';
-import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
 import type { NextEditorPlugin, OptionalPlugin, TypeAheadHandler } from '@atlaskit/editor-common/types';
 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 { MentionDescription, MentionProvider } from '@atlaskit/mention';
 export interface TeamInfoAttrAnalytics {
@@ -20,7 +20,6 @@ export interface MentionPluginOptions extends MentionPluginConfig {
 }
 export type MentionPluginState = {
     mentionProvider?: MentionProvider;
-    contextIdentifierProvider?: ContextIdentifierProvider;
     mentions?: Array<MentionDescription>;
     canInsertMention?: boolean;
 };
@@ -30,7 +29,11 @@ export type MentionSharedState = MentionPluginState & {
 };
 export type MentionsPlugin = NextEditorPlugin<'mention', {
     pluginConfiguration: MentionPluginOptions | undefined;
-    dependencies: [OptionalPlugin<AnalyticsPlugin>, TypeAheadPlugin];
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>,
+        TypeAheadPlugin,
+        OptionalPlugin<ContextIdentifierPlugin>
+    ];
     sharedState: MentionSharedState | undefined;
     actions: {
         openTypeAhead: (inputMethod: TypeAheadInputMethod) => boolean;

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

@@ -1,6 +1,4 @@
-import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { Command, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { MentionPluginOptions, MentionPluginState } from '../types';
-export declare const setContext: (context: ContextIdentifierProvider | undefined) => Command;
 export declare function createMentionPlugin(pmPluginFactoryParams: PMPluginFactoryParams, fireEvent: (payload: any) => void, options?: MentionPluginOptions): SafePlugin<MentionPluginState>;

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

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { TypeAheadHandler, TypeAheadItem } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, TypeAheadHandler, TypeAheadItem } from '@atlaskit/editor-common/types';
 import type { MentionDescription } from '@atlaskit/mention/resource';
-import type { FireElementsChannelEvent } from '../types';
+import type { FireElementsChannelEvent, MentionsPlugin } from '../types';
 export declare const mentionToTypeaheadItem: (mention: MentionDescription) => TypeAheadItem;
 export declare function memoize<ResultFn extends (mention: MentionDescription) => TypeAheadItem>(fn: ResultFn): {
     call: ResultFn;
@@ -12,6 +12,7 @@ type Props = {
     mentionInsertDisplayName?: boolean;
     HighlightComponent?: React.ComponentType;
     fireEvent: FireElementsChannelEvent;
+    api: ExtractInjectionAPI<MentionsPlugin> | undefined;
 };
-export declare const createTypeAheadConfig: ({ sanitizePrivateContent, mentionInsertDisplayName, fireEvent, HighlightComponent, }: Props) => TypeAheadHandler;
+export declare const createTypeAheadConfig: ({ sanitizePrivateContent, mentionInsertDisplayName, fireEvent, HighlightComponent, api, }: Props) => TypeAheadHandler;
 export {};

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

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import type { AnalyticsEventPayload } from '@atlaskit/analytics-next';
-import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
 import type { NextEditorPlugin, OptionalPlugin, TypeAheadHandler } from '@atlaskit/editor-common/types';
 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 { MentionDescription, MentionProvider } from '@atlaskit/mention';
 export interface TeamInfoAttrAnalytics {
@@ -20,7 +20,6 @@ export interface MentionPluginOptions extends MentionPluginConfig {
 }
 export type MentionPluginState = {
     mentionProvider?: MentionProvider;
-    contextIdentifierProvider?: ContextIdentifierProvider;
     mentions?: Array<MentionDescription>;
     canInsertMention?: boolean;
 };
@@ -32,7 +31,8 @@ export type MentionsPlugin = NextEditorPlugin<'mention', {
     pluginConfiguration: MentionPluginOptions | undefined;
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        TypeAheadPlugin
+        TypeAheadPlugin,
+        OptionalPlugin<ContextIdentifierPlugin>
     ];
     sharedState: MentionSharedState | undefined;
     actions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-mentions",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Mentions plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,10 +33,11 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.3.0",
+    "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/analytics-gas-types": "^5.1.0",
-    "@atlaskit/editor-common": "^77.1.0",
+    "@atlaskit/editor-common": "^77.2.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
+    "@atlaskit/editor-plugin-context-identifier": "^0.1.0",
     "@atlaskit/editor-plugin-type-ahead": "^0.9.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/icon": "^22.0.0",