@atlaskit/editor-plugin-mentions 2.11.0 → 2.11.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-mentions
 
+## 2.11.2
+
+### Patch Changes
+
+- [#102447](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102447)
+  [`17f3bf711d55c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/17f3bf711d55c) -
+  Re-enable mentions while offline.
+
+## 2.11.1
+
+### Patch Changes
+
+- [#97984](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97984)
+  [`8ffeab9aaf1ab`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8ffeab9aaf1ab) -
+  [ux] [ED-23573] Added new actions (resolveMarks and registerMarks) to basePlugin. Callbacks added
+  to mentions, card, emoji and base plugins to handle conversion to inline code. Deprecated code
+  removed from editor-common.
+- Updated dependencies
+
 ## 2.11.0
 
 ### Minor Changes

package/dist/cjs/mentionsPlugin.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,22 +9,79 @@ 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 _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
 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 _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _resource = require("@atlaskit/mention/resource");
+var _types = require("@atlaskit/mention/types");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _key = require("./pm-plugins/key");
 var _main = require("./pm-plugins/main");
 var _SecondaryToolbarComponent = require("./ui/SecondaryToolbarComponent");
 var _typeAhead = require("./ui/type-ahead");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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 mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
-  var options = _ref.config,
+var processName = function processName(name, intl) {
+  var unknownLabel = intl.formatMessage(_messages.mentionMessages.unknownLabel);
+  if (name.status === _types.MentionNameStatus.OK) {
+    return "@".concat(name.name || unknownLabel);
+  } else {
+    return "@".concat(unknownLabel);
+  }
+};
+
+/**
+ * We will need to clean this up once mentionProvider is
+ * put inside mention plugin.
+ * See: https://product-fabric.atlassian.net/browse/ED-26011
+ */
+function Component(_ref) {
+  var mentionProvider = _ref.mentionProvider,
     api = _ref.api;
+  var mentionProviderMemo = (0, _react.useMemo)(function () {
+    return mentionProvider;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var intl = (0, _reactIntlNext.useIntl)();
+  (0, _react.useEffect)(function () {
+    mentionProviderMemo === null || mentionProviderMemo === void 0 || mentionProviderMemo.then(function (mentionProviderSync) {
+      var _api$base;
+      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.registerMarks(function (_ref2) {
+        var tr = _ref2.tr,
+          node = _ref2.node,
+          pos = _ref2.pos;
+        var doc = tr.doc;
+        var schema = doc.type.schema;
+        var mentionNodeType = schema.nodes.mention;
+        var id = node.attrs.id;
+        if (node.type === mentionNodeType) {
+          if ((0, _resource.isResolvingMentionProvider)(mentionProviderSync)) {
+            var nameDetail = mentionProviderSync === null || mentionProviderSync === void 0 ? void 0 : mentionProviderSync.resolveMentionName(id);
+            var newText;
+            if ((0, _types.isPromise)(nameDetail)) {
+              newText = "@".concat(intl.formatMessage(_messages.mentionMessages.unknownLabel));
+            } else {
+              newText = processName(nameDetail, intl);
+            }
+            var currentPos = tr.mapping.map(pos);
+            tr.replaceWith(currentPos, currentPos + node.nodeSize, schema.text(newText, node.marks));
+          }
+        }
+      });
+    });
+  }, [mentionProviderMemo, api, intl]);
+  return null;
+}
+var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref3) {
+  var options = _ref3.config,
+    api = _ref3.api;
   var sessionId = (0, _uuid.default)();
   var previousMediaProvider;
   var fireEvent = function fireEvent(payload, channel) {
@@ -66,9 +124,23 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
         }
       }];
     },
-    secondaryToolbarComponent: function secondaryToolbarComponent(_ref2) {
-      var editorView = _ref2.editorView,
-        disabled = _ref2.disabled;
+    contentComponent: function contentComponent(_ref4) {
+      var providerFactory = _ref4.providerFactory;
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
+        providers: ['mentionProvider'],
+        providerFactory: providerFactory,
+        renderNode: function renderNode(_ref5) {
+          var mentionProvider = _ref5.mentionProvider;
+          return /*#__PURE__*/_react.default.createElement(Component, {
+            mentionProvider: mentionProvider,
+            api: api
+          });
+        }
+      });
+    },
+    secondaryToolbarComponent: function secondaryToolbarComponent(_ref6) {
+      var editorView = _ref6.editorView,
+        disabled = _ref6.disabled;
       return /*#__PURE__*/_react.default.createElement(_SecondaryToolbarComponent.SecondaryToolbarComponent, {
         editorView: editorView,
         api: api,
@@ -113,8 +185,8 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
                 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 _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref7) {
+                  var tr = _ref7.tr;
                   return tr.setMeta(_key.mentionPluginKey, {
                     action: _main.ACTIONS.SET_PROVIDER,
                     params: {
@@ -144,8 +216,8 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
       });
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref4) {
-        var formatMessage = _ref4.formatMessage;
+      quickInsert: function quickInsert(_ref8) {
+        var formatMessage = _ref8.formatMessage;
         return [{
           id: 'mention',
           title: formatMessage(_messages.toolbarInsertBlockMessages.mention),
@@ -153,7 +225,6 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref) {
           keywords: ['team', 'user'],
           priority: 400,
           keyshortcut: '@',
-          isDisabledOffline: true,
           icon: function icon() {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconMention, null);
           },

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

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

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

@@ -167,6 +167,7 @@ var buildNodesForTeamMention = function buildNodesForTeamMention(schema, selecte
   // build team link
   var defaultTeamLink = "".concat(window.location.origin, "/people/team/").concat(teamId);
   var teamLink = context && context.teamLink ? context.teamLink : defaultTeamLink;
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
   var teamLinkNode = (0, _platformFeatureFlags.fg)('team-mention-inline-smartlink') ? schema.nodes.inlineCard.create({
     url: teamLink
   }) :
@@ -238,7 +239,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       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) {
+      return new Promise(function (resolve, reject) {
         var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.default)());
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
           var resultQuery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -274,7 +275,13 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
           }
         };
         subscriptionKeys.add(key);
-        mentionProvider.subscribe(key, mentionsSubscribeCallback);
+        mentionProvider.subscribe(key, mentionsSubscribeCallback, function () {
+          if ((0, _platformFeatureFlags.fg)('platform_editor_offline_editing_ga')) {
+            mentionProvider.unsubscribe(key);
+            subscriptionKeys.delete(key);
+            reject('FETCH_ERROR');
+          }
+        });
         mentionProvider.filter(query || '', _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
           sessionId: sessionId
         }));
@@ -367,15 +374,21 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         // Cache (locally) for later rendering
         mentionProvider.cacheMentionName(id, renderName);
       }
-      var annotationMarksForPos = (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? (0, _utils.getAnnotationMarksForPos)(state.tr.selection.$head) : undefined;
+      var annotationMarksForPos = (0, _platformFeatureFlags.fg)(
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      'editor_inline_comments_paste_insert_nodes') ? (0, _utils.getAnnotationMarksForPos)(state.tr.selection.$head) : undefined;
       var mentionNode = schema.nodes.mention.createChecked({
         text: text,
         id: id,
         accessLevel: accessLevel,
         userType: userType === 'DEFAULT' ? null : userType,
         localId: mentionLocalId
-      }, null, (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      var space = schema.text(' ', (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+      }, null,
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+      var space = schema.text(' ',
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
       return insert(_model.Fragment.from([mentionNode, space]));
     },
     dismiss: function dismiss(_ref11) {

package/dist/es2019/mentionsPlugin.js

@@ -1,14 +1,79 @@
-import React from 'react';
+import React, { useEffect, useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
 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 { toolbarInsertBlockMessages as messages, mentionMessages } from '@atlaskit/editor-common/messages';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { IconMention } from '@atlaskit/editor-common/quick-insert';
+import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { MentionNameStatus, isPromise } from '@atlaskit/mention/types';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { mentionPluginKey } from './pm-plugins/key';
 import { ACTIONS, createMentionPlugin } from './pm-plugins/main';
 import { SecondaryToolbarComponent } from './ui/SecondaryToolbarComponent';
 import { createTypeAheadConfig } from './ui/type-ahead';
+const processName = (name, intl) => {
+  const unknownLabel = intl.formatMessage(mentionMessages.unknownLabel);
+  if (name.status === MentionNameStatus.OK) {
+    return `@${name.name || unknownLabel}`;
+  } else {
+    return `@${unknownLabel}`;
+  }
+};
+
+/**
+ * We will need to clean this up once mentionProvider is
+ * put inside mention plugin.
+ * See: https://product-fabric.atlassian.net/browse/ED-26011
+ */
+function Component({
+  mentionProvider,
+  api
+}) {
+  const mentionProviderMemo = useMemo(() => {
+    return mentionProvider;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  const intl = useIntl();
+  useEffect(() => {
+    mentionProviderMemo === null || mentionProviderMemo === void 0 ? void 0 : mentionProviderMemo.then(mentionProviderSync => {
+      var _api$base, _api$base$actions;
+      api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : (_api$base$actions = _api$base.actions) === null || _api$base$actions === void 0 ? void 0 : _api$base$actions.registerMarks(({
+        tr,
+        node,
+        pos
+      }) => {
+        const {
+          doc
+        } = tr;
+        const {
+          schema
+        } = doc.type;
+        const {
+          mention: mentionNodeType
+        } = schema.nodes;
+        const {
+          id
+        } = node.attrs;
+        if (node.type === mentionNodeType) {
+          if (isResolvingMentionProvider(mentionProviderSync)) {
+            const nameDetail = mentionProviderSync === null || mentionProviderSync === void 0 ? void 0 : mentionProviderSync.resolveMentionName(id);
+            let newText;
+            if (isPromise(nameDetail)) {
+              newText = `@${intl.formatMessage(mentionMessages.unknownLabel)}`;
+            } else {
+              newText = processName(nameDetail, intl);
+            }
+            const currentPos = tr.mapping.map(pos);
+            tr.replaceWith(currentPos, currentPos + node.nodeSize, schema.text(newText, node.marks));
+          }
+        }
+      });
+    });
+  }, [mentionProviderMemo, api, intl]);
+  return null;
+}
 const mentionsPlugin = ({
   config: options,
   api
@@ -53,6 +118,22 @@ const mentionsPlugin = ({
         })
       }];
     },
+    contentComponent({
+      providerFactory
+    }) {
+      return /*#__PURE__*/React.createElement(WithProviders, {
+        providers: ['mentionProvider'],
+        providerFactory: providerFactory,
+        renderNode: ({
+          mentionProvider
+        }) => {
+          return /*#__PURE__*/React.createElement(Component, {
+            mentionProvider: mentionProvider,
+            api: api
+          });
+        }
+      });
+    },
     secondaryToolbarComponent({
       editorView,
       disabled
@@ -118,7 +199,6 @@ const mentionsPlugin = ({
         keywords: ['team', 'user'],
         priority: 400,
         keyshortcut: '@',
-        isDisabledOffline: true,
         icon: () => /*#__PURE__*/React.createElement(IconMention, null),
         action(insert, state) {
           var _api$typeAhead2;

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

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

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

@@ -141,6 +141,7 @@ const buildNodesForTeamMention = (schema, selectedMention, mentionProvider, sani
   // build team link
   const defaultTeamLink = `${window.location.origin}/people/team/${teamId}`;
   const teamLink = context && context.teamLink ? context.teamLink : defaultTeamLink;
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
   const teamLinkNode = fg('team-mention-inline-smartlink') ? schema.nodes.inlineCard.create({
     url: teamLink
   }) :
@@ -219,7 +220,7 @@ export const createTypeAheadConfig = ({
       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 => {
+      return new Promise((resolve, reject) => {
         const key = `loadingMentionsForTypeAhead_${uuid()}`;
         const mentionsSubscribeCallback = (mentions, resultQuery = '', stats) => {
           if (query !== resultQuery) {
@@ -251,7 +252,13 @@ export const createTypeAheadConfig = ({
           }
         };
         subscriptionKeys.add(key);
-        mentionProvider.subscribe(key, mentionsSubscribeCallback);
+        mentionProvider.subscribe(key, mentionsSubscribeCallback, () => {
+          if (fg('platform_editor_offline_editing_ga')) {
+            mentionProvider.unsubscribe(key);
+            subscriptionKeys.delete(key);
+            reject('FETCH_ERROR');
+          }
+        });
         mentionProvider.filter(query || '', {
           ...contextIdentifierProvider,
           sessionId
@@ -351,15 +358,21 @@ export const createTypeAheadConfig = ({
         // Cache (locally) for later rendering
         mentionProvider.cacheMentionName(id, renderName);
       }
-      const annotationMarksForPos = fg('editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(state.tr.selection.$head) : undefined;
+      const annotationMarksForPos = fg(
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      'editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(state.tr.selection.$head) : undefined;
       const mentionNode = schema.nodes.mention.createChecked({
         text,
         id,
         accessLevel,
         userType: userType === 'DEFAULT' ? null : userType,
         localId: mentionLocalId
-      }, null, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      const space = schema.text(' ', fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+      }, null,
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+      const space = schema.text(' ',
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
       return insert(Fragment.from([mentionNode, space]));
     },
     dismiss({

package/dist/esm/mentionsPlugin.js

@@ -3,20 +3,75 @@ 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 React, { useEffect, useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
 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 { toolbarInsertBlockMessages as messages, mentionMessages } from '@atlaskit/editor-common/messages';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { IconMention } from '@atlaskit/editor-common/quick-insert';
+import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { MentionNameStatus, isPromise } from '@atlaskit/mention/types';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { mentionPluginKey } from './pm-plugins/key';
 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,
+var processName = function processName(name, intl) {
+  var unknownLabel = intl.formatMessage(mentionMessages.unknownLabel);
+  if (name.status === MentionNameStatus.OK) {
+    return "@".concat(name.name || unknownLabel);
+  } else {
+    return "@".concat(unknownLabel);
+  }
+};
+
+/**
+ * We will need to clean this up once mentionProvider is
+ * put inside mention plugin.
+ * See: https://product-fabric.atlassian.net/browse/ED-26011
+ */
+function Component(_ref) {
+  var mentionProvider = _ref.mentionProvider,
     api = _ref.api;
+  var mentionProviderMemo = useMemo(function () {
+    return mentionProvider;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var intl = useIntl();
+  useEffect(function () {
+    mentionProviderMemo === null || mentionProviderMemo === void 0 || mentionProviderMemo.then(function (mentionProviderSync) {
+      var _api$base;
+      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.registerMarks(function (_ref2) {
+        var tr = _ref2.tr,
+          node = _ref2.node,
+          pos = _ref2.pos;
+        var doc = tr.doc;
+        var schema = doc.type.schema;
+        var mentionNodeType = schema.nodes.mention;
+        var id = node.attrs.id;
+        if (node.type === mentionNodeType) {
+          if (isResolvingMentionProvider(mentionProviderSync)) {
+            var nameDetail = mentionProviderSync === null || mentionProviderSync === void 0 ? void 0 : mentionProviderSync.resolveMentionName(id);
+            var newText;
+            if (isPromise(nameDetail)) {
+              newText = "@".concat(intl.formatMessage(mentionMessages.unknownLabel));
+            } else {
+              newText = processName(nameDetail, intl);
+            }
+            var currentPos = tr.mapping.map(pos);
+            tr.replaceWith(currentPos, currentPos + node.nodeSize, schema.text(newText, node.marks));
+          }
+        }
+      });
+    });
+  }, [mentionProviderMemo, api, intl]);
+  return null;
+}
+var mentionsPlugin = function mentionsPlugin(_ref3) {
+  var options = _ref3.config,
+    api = _ref3.api;
   var sessionId = uuid();
   var previousMediaProvider;
   var fireEvent = function fireEvent(payload, channel) {
@@ -59,9 +114,23 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
         }
       }];
     },
-    secondaryToolbarComponent: function secondaryToolbarComponent(_ref2) {
-      var editorView = _ref2.editorView,
-        disabled = _ref2.disabled;
+    contentComponent: function contentComponent(_ref4) {
+      var providerFactory = _ref4.providerFactory;
+      return /*#__PURE__*/React.createElement(WithProviders, {
+        providers: ['mentionProvider'],
+        providerFactory: providerFactory,
+        renderNode: function renderNode(_ref5) {
+          var mentionProvider = _ref5.mentionProvider;
+          return /*#__PURE__*/React.createElement(Component, {
+            mentionProvider: mentionProvider,
+            api: api
+          });
+        }
+      });
+    },
+    secondaryToolbarComponent: function secondaryToolbarComponent(_ref6) {
+      var editorView = _ref6.editorView,
+        disabled = _ref6.disabled;
       return /*#__PURE__*/React.createElement(SecondaryToolbarComponent, {
         editorView: editorView,
         api: api,
@@ -106,8 +175,8 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
                 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 _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref7) {
+                  var tr = _ref7.tr;
                   return tr.setMeta(mentionPluginKey, {
                     action: ACTIONS.SET_PROVIDER,
                     params: {
@@ -137,8 +206,8 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
       });
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref4) {
-        var formatMessage = _ref4.formatMessage;
+      quickInsert: function quickInsert(_ref8) {
+        var formatMessage = _ref8.formatMessage;
         return [{
           id: 'mention',
           title: formatMessage(messages.mention),
@@ -146,7 +215,6 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
           keywords: ['team', 'user'],
           priority: 400,
           keyshortcut: '@',
-          isDisabledOffline: true,
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconMention, null);
           },

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

@@ -16,7 +16,7 @@ export var ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "2.11.0";
+var PACKAGE_VERSION = "2.11.2";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

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

@@ -155,6 +155,7 @@ var buildNodesForTeamMention = function buildNodesForTeamMention(schema, selecte
   // build team link
   var defaultTeamLink = "".concat(window.location.origin, "/people/team/").concat(teamId);
   var teamLink = context && context.teamLink ? context.teamLink : defaultTeamLink;
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
   var teamLinkNode = fg('team-mention-inline-smartlink') ? schema.nodes.inlineCard.create({
     url: teamLink
   }) :
@@ -226,7 +227,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       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) {
+      return new Promise(function (resolve, reject) {
         var key = "loadingMentionsForTypeAhead_".concat(uuid());
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
           var resultQuery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -262,7 +263,13 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
           }
         };
         subscriptionKeys.add(key);
-        mentionProvider.subscribe(key, mentionsSubscribeCallback);
+        mentionProvider.subscribe(key, mentionsSubscribeCallback, function () {
+          if (fg('platform_editor_offline_editing_ga')) {
+            mentionProvider.unsubscribe(key);
+            subscriptionKeys.delete(key);
+            reject('FETCH_ERROR');
+          }
+        });
         mentionProvider.filter(query || '', _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
           sessionId: sessionId
         }));
@@ -355,15 +362,21 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         // Cache (locally) for later rendering
         mentionProvider.cacheMentionName(id, renderName);
       }
-      var annotationMarksForPos = fg('editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(state.tr.selection.$head) : undefined;
+      var annotationMarksForPos = fg(
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      'editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(state.tr.selection.$head) : undefined;
       var mentionNode = schema.nodes.mention.createChecked({
         text: text,
         id: id,
         accessLevel: accessLevel,
         userType: userType === 'DEFAULT' ? null : userType,
         localId: mentionLocalId
-      }, null, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      var space = schema.text(' ', fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+      }, null,
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+      var space = schema.text(' ',
+      // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+      fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
       return insert(Fragment.from([mentionNode, space]));
     },
     dismiss: function dismiss(_ref11) {

package/dist/types/mentionsPluginType.d.ts

@@ -1,31 +1,32 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 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 MentionActionOpenTypeAhead = (inputMethod: TypeAheadInputMethod) => boolean;
+export type MentionActionAnnounceMentionsInsertion = (mentionIds: {
+    type: 'added' | 'deleted';
+    localId: string;
+    id: string;
+    taskLocalId?: string;
+}[]) => void;
+export type MentionActionSetProvider = (provider: Promise<MentionProvider>) => Promise<boolean>;
+export type MentionActions = {
+    openTypeAhead: MentionActionOpenTypeAhead;
+    announceMentionsInsertion: MentionActionAnnounceMentionsInsertion;
+    setProvider: MentionActionSetProvider;
+};
+export type MentionPluginDependencies = [
+    OptionalPlugin<AnalyticsPlugin>,
+    TypeAheadPlugin,
+    OptionalPlugin<ContextIdentifierPlugin>,
+    OptionalPlugin<BasePlugin>
+];
 export type MentionsPlugin = NextEditorPlugin<'mention', {
     pluginConfiguration: MentionPluginOptions | undefined;
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        TypeAheadPlugin,
-        OptionalPlugin<ContextIdentifierPlugin>
-    ];
+    dependencies: MentionPluginDependencies;
     sharedState: MentionSharedState | undefined;
-    actions: {
-        openTypeAhead: (inputMethod: TypeAheadInputMethod) => boolean;
-        announceMentionsInsertion: (mentionIds: {
-            type: 'added' | 'deleted';
-            localId: string;
-            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>;
-    };
+    actions: MentionActions;
 }>;

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

@@ -1,31 +1,32 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 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 MentionActionOpenTypeAhead = (inputMethod: TypeAheadInputMethod) => boolean;
+export type MentionActionAnnounceMentionsInsertion = (mentionIds: {
+    type: 'added' | 'deleted';
+    localId: string;
+    id: string;
+    taskLocalId?: string;
+}[]) => void;
+export type MentionActionSetProvider = (provider: Promise<MentionProvider>) => Promise<boolean>;
+export type MentionActions = {
+    openTypeAhead: MentionActionOpenTypeAhead;
+    announceMentionsInsertion: MentionActionAnnounceMentionsInsertion;
+    setProvider: MentionActionSetProvider;
+};
+export type MentionPluginDependencies = [
+    OptionalPlugin<AnalyticsPlugin>,
+    TypeAheadPlugin,
+    OptionalPlugin<ContextIdentifierPlugin>,
+    OptionalPlugin<BasePlugin>
+];
 export type MentionsPlugin = NextEditorPlugin<'mention', {
     pluginConfiguration: MentionPluginOptions | undefined;
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        TypeAheadPlugin,
-        OptionalPlugin<ContextIdentifierPlugin>
-    ];
+    dependencies: MentionPluginDependencies;
     sharedState: MentionSharedState | undefined;
-    actions: {
-        openTypeAhead: (inputMethod: TypeAheadInputMethod) => boolean;
-        announceMentionsInsertion: (mentionIds: {
-            type: 'added' | 'deleted';
-            localId: string;
-            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>;
-    };
+    actions: MentionActions;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "2.11.0",
+	"version": "2.11.2",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,17 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^98.2.0",
+		"@atlaskit/editor-common": "^99.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
+		"@atlaskit/editor-plugin-base": "^2.1.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/icon": "^23.3.0",
 		"@atlaskit/mention": "^23.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tokens": "^2.5.0",
+		"@atlaskit/tokens": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"uuid": "^3.1.0"
@@ -109,6 +110,9 @@
 		},
 		"platform_editor_mention_provider_via_plugin_config": {
 			"type": "boolean"
+		},
+		"platform_editor_offline_editing_ga": {
+			"type": "boolean"
 		}
 	}
 }