@atlaskit/editor-plugin-mentions 12.2.10 → 12.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-mentions
 
+## 12.3.0
+
+### Minor Changes
+
+- [`3b29bddd3f460`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3b29bddd3f460) -
+  Suppress human invite flow for agent mentions
+
+### Patch Changes
+
+- Updated dependencies
+
+## 12.2.11
+
+### Patch Changes
+
+- [`8a065eba1d509`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8a065eba1d509) -
+  Show agent profile cards for agent mentions in the editor.
+
 ## 12.2.10
 
 ### Patch Changes

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

@@ -9,13 +9,18 @@ var _uuid = _interopRequireDefault(require("uuid"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _resource = require("@atlaskit/mention/resource");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 
+var isAgentUserType = function isAgentUserType(userType) {
+  return userType === 'APP' || userType === 'AGENT';
+};
 var createSingleMentionFragment = exports.createSingleMentionFragment = function createSingleMentionFragment(_ref) {
   var mentionInsertDisplayName = _ref.mentionInsertDisplayName,
     mentionProvider = _ref.mentionProvider,
     tr = _ref.tr,
-    sanitizePrivateContent = _ref.sanitizePrivateContent;
+    sanitizePrivateContent = _ref.sanitizePrivateContent,
+    suppressInviteXProductUser = _ref.suppressInviteXProductUser;
   return function (_ref2) {
     var name = _ref2.name,
       id = _ref2.id,
@@ -27,7 +32,7 @@ var createSingleMentionFragment = exports.createSingleMentionFragment = function
     var schema = tr.doc.type.schema;
     var trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
     var renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
-    if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
+    if (!suppressInviteXProductUser && isXProductUser && mentionProvider !== null && mentionProvider !== void 0 && mentionProvider.inviteXProductUser) {
       mentionProvider.inviteXProductUser(id, name);
     }
 
@@ -70,7 +75,8 @@ var insertMention = exports.insertMention = function insertMention(_ref3) {
         sanitizePrivateContent: sanitizePrivateContent,
         mentionProvider: mentionProvider,
         mentionInsertDisplayName: mentionInsertDisplayName,
-        tr: tr
+        tr: tr,
+        suppressInviteXProductUser: (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false) && isAgentUserType(userType)
       })({
         name: name,
         id: id,

package/dist/cjs/nodeviews/profileCardRenderer.js

@@ -11,6 +11,7 @@ var _v = _interopRequireDefault(require("uuid/v4"));
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _navigation = require("@atlaskit/teams-app-config/navigation");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _ProfileCardComponent = require("../ui/ProfileCardComponent");
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 
@@ -34,87 +35,105 @@ var profileCardRenderer = exports.profileCardRenderer = function profileCardRend
     renderingProfileCard = false;
     (_cleanupSelection = cleanupSelection) === null || _cleanupSelection === void 0 || _cleanupSelection();
   };
+  var renderProfileCardPopup = function renderProfileCardPopup(renderProfileCard) {
+    var _api$selection;
+    if (!(dom instanceof HTMLElement) || renderingProfileCard) {
+      return;
+    }
+    var referenceElement = dom;
+    referenceElement.setAttribute('aria-expanded', 'true');
+    renderingProfileCard = true;
+    portalProviderAPI.render(function () {
+      return renderProfileCard(referenceElement);
+    }, referenceElement, key);
+    cleanupSelection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : _api$selection.sharedState.onChange(function (_ref2) {
+      var nextSharedState = _ref2.nextSharedState;
+      var selection = nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.selection;
+      if (selection instanceof _state.NodeSelection ? selection.node === node : false) {
+        return;
+      }
+      removeProfileCard === null || removeProfileCard === void 0 || removeProfileCard();
+    });
+  };
+  var renderEditorProfileCard = function renderEditorProfileCard() {
+    renderProfileCardPopup(function (referenceElement) {
+      return /*#__PURE__*/_react.default.createElement(_ProfileCardComponent.ProfileCardComponent, {
+        activeMention: node,
+        profilecardProvider: options === null || options === void 0 ? void 0 : options.profilecardProvider,
+        dom: referenceElement,
+        closeComponent: removeProfileCard
+      });
+    });
+  };
+  var renderUserProfileCard = function renderUserProfileCard(_ref3) {
+    var userId = _ref3.userId,
+      cloudId = _ref3.cloudId,
+      renderUserMentionCard = _ref3.renderUserMentionCard;
+    if (!renderUserMentionCard) {
+      return false;
+    }
+    renderProfileCardPopup(function (referenceElement) {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderUserMentionCard({
+        userId: userId,
+        cloudId: cloudId,
+        children: null,
+        referenceElement: referenceElement
+      }));
+    });
+    return true;
+  };
+  var navigateToProfile = function navigateToProfile(userId, cloudId) {
+    if (navigatingToProfile) {
+      return;
+    }
+    navigatingToProfile = true;
+    var _navigateToTeamsApp = (0, _navigation.navigateToTeamsApp)({
+        type: 'USER',
+        payload: {
+          userId: userId
+        },
+        cloudId: cloudId
+      }),
+      href = _navigateToTeamsApp.href,
+      target = _navigateToTeamsApp.target;
+    window.open(href, target, 'noopener,noreferrer');
+  };
+  var renderDefaultProfileCard = function renderDefaultProfileCard(userId, provider) {
+    if (renderUserProfileCard({
+      userId: userId,
+      cloudId: provider.cloudId,
+      renderUserMentionCard: provider.renderUserMentionCard
+    })) {
+      return;
+    }
+    navigateToProfile(userId, provider.cloudId);
+  };
   var listenerCleanup = (0, _bindEventListener.bind)(dom, {
     type: 'click',
     listener: function listener() {
       if ((0, _platformFeatureFlags.fg)('people-teams_migrate-user-profile-card')) {
-        var _node$attrs;
+        var _node$attrs, _options$profilecardP;
         var userId = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id;
-        if (userId) {
-          var _options$profilecardP;
-          navigatingToProfile = false;
-          options === null || options === void 0 || (_options$profilecardP = options.profilecardProvider) === null || _options$profilecardP === void 0 || _options$profilecardP.then(function (provider) {
-            // If a consumer (e.g. Confluence) has supplied a custom profile card
-            // renderer, render it into the portal instead of navigating away. The
-            // consumer owns its own popup/positioning behavior - subsequent clicks
-            // while the card is already open are no-ops here so the card's own
-            // outside-click / toggle logic can take over.
-            if (provider.renderUserMentionCard) {
-              if (dom instanceof HTMLElement && !renderingProfileCard) {
-                var _api$selection;
-                dom.setAttribute('aria-expanded', 'true');
-                renderingProfileCard = true;
-                portalProviderAPI.render(function () {
-                  var _provider$renderUserM;
-                  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (_provider$renderUserM = provider.renderUserMentionCard) === null || _provider$renderUserM === void 0 ? void 0 : _provider$renderUserM.call(provider, {
-                    userId: userId,
-                    cloudId: provider.cloudId,
-                    children: null,
-                    referenceElement: dom
-                  }));
-                }, dom, key);
-                cleanupSelection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : _api$selection.sharedState.onChange(function (_ref2) {
-                  var nextSharedState = _ref2.nextSharedState;
-                  var selection = nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.selection;
-                  if (selection instanceof _state.NodeSelection ? selection.node === node : false) {
-                    return;
-                  }
-                  removeProfileCard === null || removeProfileCard === void 0 || removeProfileCard();
-                });
-              }
-              return;
-            }
-            if (navigatingToProfile) {
-              return;
-            }
-            navigatingToProfile = true;
-            var _navigateToTeamsApp = (0, _navigation.navigateToTeamsApp)({
-                type: 'USER',
-                payload: {
-                  userId: userId
-                },
-                cloudId: provider.cloudId
-              }),
-              href = _navigateToTeamsApp.href,
-              target = _navigateToTeamsApp.target;
-            window.open(href, target, 'noopener,noreferrer');
-          });
+        if (!userId) {
+          return;
         }
-        return;
-      }
-      if (dom instanceof HTMLElement && options !== null && options !== void 0 && options.profilecardProvider && !renderingProfileCard) {
-        var _api$selection2;
-        dom.setAttribute('aria-expanded', 'true');
-        renderingProfileCard = true;
-        portalProviderAPI.render(function () {
-          return /*#__PURE__*/_react.default.createElement(_ProfileCardComponent.ProfileCardComponent, {
-            activeMention: node,
-            profilecardProvider: options === null || options === void 0 ? void 0 : options.profilecardProvider,
-            dom: dom,
-            closeComponent: removeProfileCard
-          });
-        }, dom, key);
-        // If we change the selection we should also remove the profile card. The "deselectNode"
-        // should usually catch this, but it's possible (ie. on triple click) for this not to be called
-        // which means the profile card gets stuck open until you click + change selection
-        cleanupSelection = api === null || api === void 0 || (_api$selection2 = api.selection) === null || _api$selection2 === void 0 ? void 0 : _api$selection2.sharedState.onChange(function (_ref3) {
-          var nextSharedState = _ref3.nextSharedState;
-          var selection = nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.selection;
-          if (selection instanceof _state.NodeSelection ? selection.node === node : false) {
+        navigatingToProfile = false;
+        options === null || options === void 0 || (_options$profilecardP = options.profilecardProvider) === null || _options$profilecardP === void 0 || _options$profilecardP.then(function (provider) {
+          var _node$attrs2;
+          if (!(0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false)) {
+            renderDefaultProfileCard(userId, provider);
             return;
           }
-          removeProfileCard === null || removeProfileCard === void 0 || removeProfileCard();
+          if ((0, _ProfileCardComponent.isAgentMentionType)((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.userType)) {
+            renderEditorProfileCard();
+          } else {
+            renderDefaultProfileCard(userId, provider);
+          }
         });
+        return;
+      }
+      if (options !== null && options !== void 0 && options.profilecardProvider) {
+        renderEditorProfileCard();
       }
     }
   });

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

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

package/dist/cjs/ui/ProfileCardComponent.js

@@ -2,37 +2,56 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProfileCardComponent = ProfileCardComponent;
-exports.useProfileCardState = void 0;
+exports.useProfileCardState = exports.isAgentMentionType = void 0;
 require("./ProfileCardComponent.compiled.css");
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _bindEventListener = require("bind-event-listener");
+var _reactLoadable = _interopRequireDefault(require("react-loadable"));
 var _user = require("@atlaskit/profilecard/user");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _PopperWrapper = require("./PopperWrapper");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
+var AgentProfileCardResourcedLazy = (0, _reactLoadable.default)({
+  loader: function loader() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_editor-plugin-mentions-agent-profile-card-resourced" */
+      '@atlaskit/profilecard/agent-profile-card-resourced'));
+    }).then(function (_ref) {
+      var AgentProfileCardResourced = _ref.AgentProfileCardResourced;
+      return AgentProfileCardResourced;
+    });
+  },
+  loading: function loading() {
+    return null;
+  }
+});
 var styles = {
   loadingStyles: "_2rko12b0 _16qs130s"
 };
-var LoadingWrapper = function LoadingWrapper(_ref) {
-  var children = _ref.children,
-    isLoading = _ref.isLoading;
+var LoadingWrapper = function LoadingWrapper(_ref2) {
+  var children = _ref2.children,
+    isLoading = _ref2.isLoading;
   return isLoading ? /*#__PURE__*/React.createElement("div", {
     className: (0, _runtime.ax)([styles.loadingStyles])
   }, children) : children;
 };
-var useProfileCardState = exports.useProfileCardState = function useProfileCardState(_ref2) {
-  var id = _ref2.id,
-    provider = _ref2.provider;
+var isAgentMentionType = exports.isAgentMentionType = function isAgentMentionType(userType) {
+  return userType === 'APP' || userType === 'AGENT';
+};
+var useProfileCardState = exports.useProfileCardState = function useProfileCardState(_ref3) {
+  var id = _ref3.id,
+    provider = _ref3.provider;
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     data = _useState2[0],
@@ -61,7 +80,7 @@ var useProfileCardState = exports.useProfileCardState = function useProfileCardS
   // From: packages/people-and-teams/profilecard/src/components/User/ProfileCardTrigger.tsx
   (0, _react.useEffect)(function () {
     var fetchData = /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _yield$Promise$all, _yield$Promise$all2, _data, reportingLines, shouldGiveKudos, _teamCentralBaseUrl, _t;
         return _regenerator.default.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -108,7 +127,7 @@ var useProfileCardState = exports.useProfileCardState = function useProfileCardS
         }, _callee, null, [[2, 4, 5, 6]]);
       }));
       return function fetchData() {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     fetchData();
@@ -122,12 +141,16 @@ var useProfileCardState = exports.useProfileCardState = function useProfileCardS
     hasError: hasError
   };
 };
-function ProfileCardComponent(_ref4) {
-  var _ref6;
-  var profilecardProvider = _ref4.profilecardProvider,
-    activeMention = _ref4.activeMention,
-    dom = _ref4.dom,
-    closeComponent = _ref4.closeComponent;
+
+/**
+ * Renders the profile card popup for an editor mention node.
+ */
+function ProfileCardComponent(_ref5) {
+  var _ref7;
+  var profilecardProvider = _ref5.profilecardProvider,
+    activeMention = _ref5.activeMention,
+    dom = _ref5.dom,
+    closeComponent = _ref5.closeComponent;
   var _useState11 = (0, _react.useState)(undefined),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     provider = _useState12[0],
@@ -137,10 +160,58 @@ function ProfileCardComponent(_ref4) {
       setProvider(p);
     });
   }, [profilecardProvider]);
-  var _ref5 = (_ref6 = activeMention.attrs) !== null && _ref6 !== void 0 ? _ref6 : {},
-    id = _ref5.id,
-    text = _ref5.text,
-    accessLevel = _ref5.accessLevel;
+  var _ref6 = (_ref7 = activeMention.attrs) !== null && _ref7 !== void 0 ? _ref7 : {},
+    id = _ref6.id,
+    text = _ref6.text,
+    accessLevel = _ref6.accessLevel,
+    userType = _ref6.userType;
+  (0, _react.useEffect)(function () {
+    return (0, _bindEventListener.bind)(window, {
+      type: 'keydown',
+      listener: function listener(e) {
+        if (e.key === 'Escape') {
+          closeComponent();
+        }
+      }
+    });
+  });
+  if (!(0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false)) {
+    return /*#__PURE__*/React.createElement(_PopperWrapper.Popup, {
+      referenceElement: dom
+    }, /*#__PURE__*/React.createElement(UserProfileCardContent, {
+      accessLevel: accessLevel,
+      id: id,
+      provider: provider,
+      text: text
+    }));
+  }
+  var isAgentMention = isAgentMentionType(userType);
+  return /*#__PURE__*/React.createElement(_PopperWrapper.Popup, {
+    referenceElement: dom
+  }, isAgentMention && provider && id ? /*#__PURE__*/React.createElement(AgentProfileCardContent, {
+    accountId: id,
+    provider: provider
+  }) : /*#__PURE__*/React.createElement(UserProfileCardContent, {
+    accessLevel: accessLevel,
+    id: id,
+    provider: provider,
+    text: text
+  }));
+}
+var AgentProfileCardContent = function AgentProfileCardContent(_ref8) {
+  var accountId = _ref8.accountId,
+    provider = _ref8.provider;
+  return /*#__PURE__*/React.createElement(AgentProfileCardResourcedLazy, {
+    accountId: accountId,
+    cloudId: provider.cloudId,
+    resourceClient: provider.resourceClient
+  });
+};
+var UserProfileCardContent = function UserProfileCardContent(_ref9) {
+  var accessLevel = _ref9.accessLevel,
+    id = _ref9.id,
+    provider = _ref9.provider,
+    text = _ref9.text;
   var actions = (0, _react.useMemo)(function () {
     return provider === null || provider === void 0 ? void 0 : provider.getActions(id, text !== null && text !== void 0 ? text : '', accessLevel);
   }, [accessLevel, id, provider, text]);
@@ -154,19 +225,7 @@ function ProfileCardComponent(_ref4) {
     teamCentralBaseUrl = _useProfileCardState.teamCentralBaseUrl,
     isLoading = _useProfileCardState.isLoading,
     hasError = _useProfileCardState.hasError;
-  (0, _react.useEffect)(function () {
-    return (0, _bindEventListener.bind)(window, {
-      type: 'keydown',
-      listener: function listener(e) {
-        if (e.key === 'Escape') {
-          closeComponent();
-        }
-      }
-    });
-  });
-  return /*#__PURE__*/React.createElement(_PopperWrapper.Popup, {
-    referenceElement: dom
-  }, /*#__PURE__*/React.createElement(LoadingWrapper, {
+  return /*#__PURE__*/React.createElement(LoadingWrapper, {
     isLoading: isLoading
   }, /*#__PURE__*/React.createElement(_user.ProfileCardLazy, {
     avatarUrl: data === null || data === void 0 ? void 0 : data.avatarUrl,
@@ -191,5 +250,5 @@ function ProfileCardComponent(_ref4) {
     isKudosEnabled: shouldShowGiveKudos,
     teamCentralBaseUrl: teamCentralBaseUrl,
     isRenderedInPortal: (0, _expValEquals.expValEquals)('editor_a11y_7152_profile_card_tab_order', 'isEnabled', true)
-  })));
-}
+  }));
+};

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

@@ -20,6 +20,7 @@ var _item = require("@atlaskit/mention/item");
 var _resource = require("@atlaskit/mention/resource");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _editorCommands = require("../../editor-commands");
 var _mentionPlaceholder = require("../../pm-plugins/mentionPlaceholder");
 var _utils2 = require("../../pm-plugins/utils");
@@ -33,9 +34,12 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return 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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-var isAgentType = function isAgentType(userType) {
+var isAgentUserType = function isAgentUserType(userType) {
   return userType === 'APP' || userType === 'AGENT';
 };
+var isAgentMention = function isAgentMention(mention) {
+  return isAgentUserType(mention.userType) || mention.appType === 'agent';
+};
 var createInviteItem = function createInviteItem(_ref) {
   var mentionProvider = _ref.mentionProvider,
     onInviteItemMount = _ref.onInviteItemMount,
@@ -325,7 +329,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         title: intl.formatMessage(_messages.mentionMessages.typeAheadSectionPeople),
         filter: function filter(item) {
           var _item$mention;
-          return !isAgentType(((_item$mention = item.mention) === null || _item$mention === void 0 ? void 0 : _item$mention.userType) || '');
+          return !isAgentUserType(((_item$mention = item.mention) === null || _item$mention === void 0 ? void 0 : _item$mention.userType) || '');
         },
         limit: 6
       }, {
@@ -333,7 +337,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         title: intl.formatMessage(_messages.mentionMessages.typeAheadSectionAgents),
         filter: function filter(item) {
           var _item$mention2;
-          return isAgentType(((_item$mention2 = item.mention) === null || _item$mention2 === void 0 ? void 0 : _item$mention2.userType) || '');
+          return isAgentUserType(((_item$mention2 = item.mention) === null || _item$mention2 === void 0 ? void 0 : _item$mention2.userType) || '');
         }
       }];
     },
@@ -361,6 +365,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
         sessionId: sessionId
       });
+      var shouldSuppressInviteForAgentMention = (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false) && isAgentMention(item.mention);
       if (mentionProvider && !(0, _utils3.isInviteItem)(item.mention)) {
         mentionProvider.recordMentionSelection(item.mention, mentionContext);
       }
@@ -412,21 +417,20 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var mentionLocalId = (0, _uuid.default)();
       if (handleMentionsChanged) {
+        var mentionChange = _objectSpread({
+          id: id,
+          localId: mentionLocalId,
+          method: 'typed',
+          type: 'added'
+        }, shouldSuppressInviteForAgentMention ? {
+          shouldSuppressMentionNotification: true
+        } : {});
         if (taskItemId) {
-          handleMentionsChanged([{
-            type: 'added',
-            localId: mentionLocalId,
-            id: id,
-            taskLocalId: taskItemId,
-            method: 'typed'
-          }]);
+          handleMentionsChanged([_objectSpread(_objectSpread({}, mentionChange), {}, {
+            taskLocalId: taskItemId
+          })]);
         } else {
-          handleMentionsChanged([{
-            type: 'added',
-            localId: mentionLocalId,
-            id: id,
-            method: 'typed'
-          }]);
+          handleMentionsChanged([mentionChange]);
         }
       }
       fireEvent((0, _analytics.buildTypeAheadInsertedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, item.mention, mentionLocalId, sourceListItem.map(function (x) {
@@ -438,14 +442,15 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       if (mentionProvider && (0, _utils3.isTeamType)(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
-      if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
+      if (!shouldSuppressInviteForAgentMention && isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
         mentionProvider.inviteXProductUser(id, name);
       }
       return insert((0, _editorCommands.createSingleMentionFragment)({
         mentionProvider: mentionProvider,
         mentionInsertDisplayName: mentionInsertDisplayName,
         tr: state.tr,
-        sanitizePrivateContent: sanitizePrivateContent
+        sanitizePrivateContent: sanitizePrivateContent,
+        suppressInviteXProductUser: shouldSuppressInviteForAgentMention
       })({
         name: name,
         id: id,

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

@@ -3,11 +3,14 @@ import uuid from 'uuid';
 import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
+const isAgentUserType = userType => userType === 'APP' || userType === 'AGENT';
 export const createSingleMentionFragment = ({
   mentionInsertDisplayName,
   mentionProvider,
   tr,
-  sanitizePrivateContent
+  sanitizePrivateContent,
+  suppressInviteXProductUser
 }) => ({
   name,
   id,
@@ -20,7 +23,7 @@ export const createSingleMentionFragment = ({
   const schema = tr.doc.type.schema;
   const trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
   const renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
-  if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
+  if (!suppressInviteXProductUser && isXProductUser && mentionProvider !== null && mentionProvider !== void 0 && mentionProvider.inviteXProductUser) {
     mentionProvider.inviteXProductUser(id, name);
   }
 
@@ -64,7 +67,8 @@ export const insertMention = ({
       sanitizePrivateContent,
       mentionProvider,
       mentionInsertDisplayName,
-      tr
+      tr,
+      suppressInviteXProductUser: expVal('platform_editor_agent_mentions', 'isEnabled', false) && isAgentUserType(userType)
     })({
       name,
       id,