@atlaskit/editor-plugin-mentions 16.0.3 → 16.1.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-mentions
 
+## 16.1.1
+
+### Patch Changes
+
+- [`716685b30ef93`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/716685b30ef93) -
+  Correlate rendered agent mention results with picker selection sessions.
+- Updated dependencies
+
+## 16.1.0
+
+### Minor Changes
+
+- [`50992b74009d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/50992b74009d1) -
+  Add InlineInvitePopup provider hook, replacing InlineInviteRecaptcha slot
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 16.0.3
 
 ### Patch Changes

package/anchored-popup/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@atlaskit/editor-plugin-mentions/anchored-popup",
+  "main": "../dist/cjs/entry-points/anchored-popup.js",
+  "module": "../dist/esm/entry-points/anchored-popup.js",
+  "module:es2019": "../dist/es2019/entry-points/anchored-popup.js",
+  "sideEffects": [
+    "**/*.compiled.css"
+  ],
+  "types": "../dist/types/entry-points/anchored-popup.d.ts"
+}

package/dist/cjs/entry-points/anchored-popup.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "AnchoredPopup", {
+  enumerable: true,
+  get: function get() {
+    return _AnchoredPopup.AnchoredPopup;
+  }
+});
+var _AnchoredPopup = require("../ui/AnchoredPopup");

package/dist/cjs/mentionsPlugin.js

@@ -27,8 +27,7 @@ var _mentionNodeSpec = require("./nodeviews/mentionNodeSpec");
 var _agent = require("./pm-plugins/agent");
 var _key = require("./pm-plugins/key");
 var _main = require("./pm-plugins/main");
-var _mentionPlaceholder = require("./pm-plugins/mentionPlaceholder");
-var _InlineInviteRecaptchaContainer = require("./ui/InlineInviteRecaptchaContainer");
+var _InlineInvitePopupContainer = require("./ui/InlineInvitePopupContainer");
 var _SecondaryToolbarComponent = require("./ui/SecondaryToolbarComponent");
 var _typeAhead = require("./ui/type-ahead");
 var _excluded2 = ["pendingPastedAgentMention"]; // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
@@ -145,14 +144,6 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref3) {
           }
         });
       }
-      if ((0, _platformFeatureFlags.fg)('jira_invites_auto_tag_new_user_in_mentions_fg')) {
-        plugins.push({
-          name: 'mentionPlaceholder',
-          plugin: function plugin() {
-            return (0, _mentionPlaceholder.createMentionPlaceholderPlugin)();
-          }
-        });
-      }
       return plugins;
     },
     contentComponent: function contentComponent(_ref4) {
@@ -173,9 +164,10 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref3) {
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(Component, {
             mentionProvider: mentionProvider,
             api: api
-          }), (0, _platformFeatureFlags.fg)('jira_invites_auto_tag_new_user_in_mentions_fg') && /*#__PURE__*/_react.default.createElement(_InlineInviteRecaptchaContainer.InlineInviteRecaptchaContainer, {
+          }), (0, _platformFeatureFlags.fg)('inline_invite_from_mentions_kill_switch') && /*#__PURE__*/_react.default.createElement(_InlineInvitePopupContainer.InlineInvitePopupContainer, {
             mentionProvider: mentionProvider,
-            api: api
+            api: api,
+            editorView: editorView
           }));
         }
       });

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

@@ -67,7 +67,7 @@ var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "16.0.2";
+var PACKAGE_VERSION = "16.1.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/cjs/ui/AnchoredPopup.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AnchoredPopup = AnchoredPopup;
+var _react = _interopRequireWildcard(require("react"));
+var _popup = require("@atlaskit/popup/popup");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+/**
+ * A `<Popup>` anchored to an externally-supplied DOM node. Unlike `PopupTrigger`, it has no
+ * clickable trigger of its own — it opens whenever `isOpen` becomes true, so callers can drive
+ * it from any external signal.
+ */
+function AnchoredPopup(_ref) {
+  var anchorElement = _ref.anchorElement,
+    content = _ref.content,
+    isOpen = _ref.isOpen,
+    onClose = _ref.onClose;
+  var renderContent = (0, _react.useCallback)(function () {
+    return isOpen ? content : null;
+  }, [isOpen, content]);
+  var renderTrigger = (0, _react.useCallback)(function (triggerProps) {
+    if (anchorElement && typeof triggerProps.ref === 'function') {
+      triggerProps.ref(anchorElement);
+    }
+    return null;
+  }, [anchorElement]);
+  return /*#__PURE__*/_react.default.createElement(_popup.Popup, {
+    isOpen: isOpen,
+    onClose: onClose,
+    placement: "bottom-start",
+    content: renderContent,
+    trigger: renderTrigger
+  });
+}

package/dist/cjs/ui/InlineInvitePopupContainer.js

@@ -0,0 +1,157 @@
+/* InlineInvitePopupContainer.tsx generated by @compiled/babel-plugin v2.0.0 */
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.InlineInvitePopupContainer = void 0;
+var _runtime = require("@compiled/react/runtime");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var findMentionRange = function findMentionRange(doc, localId) {
+  var range = null;
+  doc.descendants(function (node, pos) {
+    if (range) {
+      return false;
+    }
+    if (node.type.name === 'mention' && node.attrs.localId === localId) {
+      range = {
+        from: pos,
+        to: pos + node.nodeSize
+      };
+      return false;
+    }
+    return true;
+  });
+  return range;
+};
+var InlineInvitePopupContainer = exports.InlineInvitePopupContainer = function InlineInvitePopupContainer(_ref) {
+  var _api$mention2, _api$core3;
+  var mentionProvider = _ref.mentionProvider,
+    api = _ref.api,
+    editorView = _ref.editorView;
+  var _useState = (0, _react.useState)(null),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    provider = _useState2[0],
+    setProvider = _useState2[1];
+  var _useState3 = (0, _react.useState)(null),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    anchorElement = _useState4[0],
+    setAnchorElement = _useState4[1];
+  var pendingMentionRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (!mentionProvider) {
+      return;
+    }
+    var isMounted = true;
+    var cleanupProvider;
+    mentionProvider.then(function (resolvedProvider) {
+      var _providerWithPopup$ge;
+      if (!isMounted) {
+        return;
+      }
+      var providerWithPopup = resolvedProvider;
+      var originalGetMentionDisabledState = (_providerWithPopup$ge = providerWithPopup.getMentionDisabledState) === null || _providerWithPopup$ge === void 0 ? void 0 : _providerWithPopup$ge.bind(providerWithPopup);
+      providerWithPopup.getMentionDisabledState = function (mention) {
+        var _pendingMentionRef$cu;
+        if (((_pendingMentionRef$cu = pendingMentionRef.current) === null || _pendingMentionRef$cu === void 0 ? void 0 : _pendingMentionRef$cu.localId) === mention.id) {
+          return {
+            disabled: true
+          };
+        }
+        return originalGetMentionDisabledState === null || originalGetMentionDisabledState === void 0 ? void 0 : originalGetMentionDisabledState(mention);
+      };
+      cleanupProvider = function cleanupProvider() {
+        if (originalGetMentionDisabledState) {
+          providerWithPopup.getMentionDisabledState = originalGetMentionDisabledState;
+        } else {
+          delete providerWithPopup.getMentionDisabledState;
+        }
+      };
+      setProvider(providerWithPopup);
+    }).catch(function () {});
+    return function () {
+      var _cleanupProvider;
+      isMounted = false;
+      (_cleanupProvider = cleanupProvider) === null || _cleanupProvider === void 0 || _cleanupProvider();
+      setProvider(null);
+    };
+  }, [mentionProvider]);
+  var removePendingMention = (0, _react.useCallback)(function () {
+    var _api$core;
+    var pending = pendingMentionRef.current;
+    if (pending && api !== null && api !== void 0 && (_api$core = api.core) !== null && _api$core !== void 0 && (_api$core = _api$core.actions) !== null && _api$core !== void 0 && _api$core.execute) {
+      api.core.actions.execute(function (_ref2) {
+        var tr = _ref2.tr;
+        var range = findMentionRange(tr.doc, pending.localId);
+        return range ? tr.delete(range.from, range.to) : null;
+      });
+    }
+    pendingMentionRef.current = null;
+    setAnchorElement(null);
+  }, [api]);
+  var handleDismiss = (0, _react.useCallback)(function () {
+    removePendingMention();
+  }, [removePendingMention]);
+  var handleInviteComplete = (0, _react.useCallback)(function (result) {
+    var _result$invited$, _api$core2, _api$mention;
+    var pending = pendingMentionRef.current;
+    if (!pending) {
+      return;
+    }
+    var invitedUser = (_result$invited$ = result.invited[0]) !== null && _result$invited$ !== void 0 ? _result$invited$ : result.requested[0];
+    if (!invitedUser || !(api !== null && api !== void 0 && (_api$core2 = api.core) !== null && _api$core2 !== void 0 && (_api$core2 = _api$core2.actions) !== null && _api$core2 !== void 0 && _api$core2.execute) || !(api !== null && api !== void 0 && (_api$mention = api.mention) !== null && _api$mention !== void 0 && (_api$mention = _api$mention.commands) !== null && _api$mention !== void 0 && _api$mention.insertMention)) {
+      removePendingMention();
+      return;
+    }
+    var userId = invitedUser.id,
+      email = invitedUser.email;
+    api.core.actions.execute(function (_ref3) {
+      var tr = _ref3.tr;
+      var range = findMentionRange(tr.doc, pending.localId);
+      return range ? tr.delete(range.from, range.to) : null;
+    });
+    api.core.actions.execute(api.mention.commands.insertMention({
+      id: userId,
+      name: email,
+      userType: 'DEFAULT',
+      accessLevel: 'CONTAINER'
+    }));
+    pendingMentionRef.current = null;
+    setAnchorElement(null);
+  }, [api, removePendingMention]);
+  var handleReady = (0, _react.useCallback)(function (show) {
+    if (!provider) {
+      return;
+    }
+    if (show) {
+      provider.showInlineInvitePopup = function (email, localId) {
+        pendingMentionRef.current = {
+          email: email,
+          localId: localId
+        };
+        setTimeout(function () {
+          var range = findMentionRange(editorView.state.doc, localId);
+          var dom = range ? editorView.nodeDOM(range.from) : null;
+          setAnchorElement(dom instanceof HTMLElement ? dom : null);
+          show(email);
+        }, 0);
+      };
+    } else {
+      delete provider.showInlineInvitePopup;
+    }
+  }, [provider, editorView]);
+  if (!(provider !== null && provider !== void 0 && provider.InlineInvitePopup) || !(api !== null && api !== void 0 && (_api$mention2 = api.mention) !== null && _api$mention2 !== void 0 && (_api$mention2 = _api$mention2.commands) !== null && _api$mention2 !== void 0 && _api$mention2.insertMention) || !(api !== null && api !== void 0 && (_api$core3 = api.core) !== null && _api$core3 !== void 0 && (_api$core3 = _api$core3.actions) !== null && _api$core3 !== void 0 && _api$core3.execute)) {
+    return null;
+  }
+  var PopupComponent = provider.InlineInvitePopup;
+  return /*#__PURE__*/_react.default.createElement(PopupComponent, {
+    anchorElement: anchorElement,
+    onInviteComplete: handleInviteComplete,
+    onDismiss: handleDismiss,
+    onReady: handleReady
+  });
+};

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

@@ -153,7 +153,7 @@ var buildTypeAheadInsertedPayload = exports.buildTypeAheadInsertedPayload = func
     })
   };
 };
-var buildTypeAheadRenderedPayload = exports.buildTypeAheadRenderedPayload = function buildTypeAheadRenderedPayload(duration, userIds, query, teams, xProductMentionsLength, agentAnalytics) {
+var buildTypeAheadRenderedPayload = exports.buildTypeAheadRenderedPayload = function buildTypeAheadRenderedPayload(duration, userIds, query, teams, xProductMentionsLength, mentionTypeaheadSessionId, agentAnalytics) {
   var _extractAttributesFro4 = extractAttributesFromQuery(query),
     queryLength = _extractAttributesFro4.queryLength,
     spaceInQuery = _extractAttributesFro4.spaceInQuery;
@@ -170,6 +170,7 @@ var buildTypeAheadRenderedPayload = exports.buildTypeAheadRenderedPayload = func
     attributes: _objectSpread({
       componentName: componentName,
       duration: duration,
+      mentionTypeaheadSessionId: mentionTypeaheadSessionId,
       userIds: userIds,
       teams: teams,
       queryLength: queryLength,

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

@@ -26,7 +26,6 @@ var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _editorCommands = require("../../editor-commands");
 var _key = require("../../pm-plugins/key");
 var _main = require("../../pm-plugins/main");
-var _mentionPlaceholder = require("../../pm-plugins/mentionPlaceholder");
 var _utils2 = require("../../pm-plugins/utils");
 var _InviteItem = _interopRequireWildcard(require("../InviteItem"));
 var _InviteItemWithEmailDomain = _interopRequireDefault(require("../InviteItem/InviteItemWithEmailDomain"));
@@ -67,7 +66,7 @@ var createInviteItem = function createInviteItem(_ref) {
       var isSelected = _ref2.isSelected,
         onClick = _ref2.onClick,
         onHover = _ref2.onHover;
-      return emailDomain && (_mentionProvider$getS = mentionProvider.getShouldEnableInlineInvite) !== null && _mentionProvider$getS !== void 0 && _mentionProvider$getS.call(mentionProvider) && (0, _platformFeatureFlags.fg)('jira_invites_auto_tag_new_user_in_mentions_fg') ? /*#__PURE__*/_react.default.createElement(_InviteItemWithEmailDomain.default, {
+      return emailDomain && (_mentionProvider$getS = mentionProvider.getShouldEnableInlineInvite) !== null && _mentionProvider$getS !== void 0 && _mentionProvider$getS.call(mentionProvider) && (0, _platformFeatureFlags.fg)('inline_invite_from_mentions_kill_switch') ? /*#__PURE__*/_react.default.createElement(_InviteItemWithEmailDomain.default, {
         productName: mentionProvider ? mentionProvider.productName : undefined,
         selected: isSelected,
         onMount: onInviteItemMount,
@@ -168,6 +167,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
     var query = _ref5.query,
       mentions = _ref5.mentions,
       stats = _ref5.stats,
+      mentionTypeaheadSessionId = _ref5.mentionTypeaheadSessionId,
       agentAnalytics = _ref5.agentAnalytics;
     var duration = 0;
     var userOrTeamIds = null;
@@ -201,7 +201,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
         return !!m;
       });
     }
-    var payload = (0, _analytics.buildTypeAheadRenderedPayload)(duration, userOrTeamIds, query, teams, xProductMentionsLength, agentAnalytics);
+    var payload = (0, _analytics.buildTypeAheadRenderedPayload)(duration, userOrTeamIds, query, teams, xProductMentionsLength, mentionTypeaheadSessionId, agentAnalytics);
     fireEvent(payload, 'fabric-elements');
   };
 };
@@ -286,22 +286,22 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
     var mentionItems = mentions.map(function (mention) {
       return toItem(mention);
     });
-    var agentCount = mentions.filter(isAgentMention).length;
-    var agentAnalytics = {
-      agentCount: agentCount,
-      agentSectioningEnabled: enableAgentSectioning
-    };
-
     // The loading placeholder is a rendered-only row — keep it in
     // `mentionItems` so the shimmer shows, but exclude it from analytics
     // and no-results bookkeeping so it isn't counted as a real result.
     var realMentions = mentions.filter(function (mention) {
       return !isLoadingPlaceholder(mention);
     });
+    var agentCount = realMentions.filter(isAgentMention).length;
+    var agentAnalytics = {
+      agentCount: agentCount,
+      agentSectioningEnabled: enableAgentSectioning
+    };
     buildAndSendElementsTypeAheadAnalytics(fireEvent)({
       query: query,
       mentions: realMentions,
       stats: stats,
+      mentionTypeaheadSessionId: sessionId,
       agentAnalytics: agentAnalytics
     });
 
@@ -490,10 +490,10 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         // Don't fire event and the callback with selection by space press
         if (mode !== 'space') {
           var _mentionProvider$getS3, _mentionProvider$getS4;
-          fireEvent((0, _analytics.buildTypeAheadInviteItemClickedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, contextIdentifierProvider, mentionProvider.userRole, (0, _platformFeatureFlags.fg)('jira_invites_auto_tag_new_user_in_mentions_fg') ? {
+          fireEvent((0, _analytics.buildTypeAheadInviteItemClickedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, contextIdentifierProvider, mentionProvider.userRole, (0, _platformFeatureFlags.fg)('inline_invite_from_mentions_kill_switch') ? {
             isInlineInviteMentionsEnabled: (_mentionProvider$getS3 = mentionProvider.getShouldEnableInlineInvite) === null || _mentionProvider$getS3 === void 0 ? void 0 : _mentionProvider$getS3.call(mentionProvider)
           } : {}));
-          if ((_mentionProvider$getS4 = mentionProvider.getShouldEnableInlineInvite) !== null && _mentionProvider$getS4 !== void 0 && _mentionProvider$getS4.call(mentionProvider) && (0, _platformFeatureFlags.fg)('jira_invites_auto_tag_new_user_in_mentions_fg')) {
+          if ((_mentionProvider$getS4 = mentionProvider.getShouldEnableInlineInvite) !== null && _mentionProvider$getS4 !== void 0 && _mentionProvider$getS4.call(mentionProvider) && (0, _platformFeatureFlags.fg)('inline_invite_from_mentions_kill_switch')) {
             // Get the email from query, using the same logic as InviteItemWithEmailDomain
             var emailDomain = mentionProvider.userEmailDomain;
             var email = query || '';
@@ -502,13 +502,21 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
               email = "".concat(email.toLowerCase(), "@").concat(emailDomain);
             }
             // If query already includes @, use it as is
-            if (email && mentionProvider.showInlineInviteRecaptcha) {
-              mentionProvider.showInlineInviteRecaptcha(email);
-              var _tr = state.tr;
-              _tr.setMeta(_mentionPlaceholder.mentionPlaceholderPluginKey, {
-                action: _mentionPlaceholder.MENTION_PLACEHOLDER_ACTIONS.SHOW_PLACEHOLDER,
-                placeholder: "@".concat(query)
-              });
+            if (email && mentionProvider.showInlineInvitePopup) {
+              var pendingLocalId = crypto.randomUUID();
+              var _tr = insert((0, _editorCommands.createSingleMentionFragment)({
+                mentionProvider: mentionProvider,
+                mentionInsertDisplayName: mentionInsertDisplayName,
+                tr: state.tr,
+                sanitizePrivateContent: sanitizePrivateContent
+              })({
+                name: email,
+                id: pendingLocalId,
+                userType: 'DEFAULT',
+                localId: pendingLocalId,
+                accessLevel: 'CONTAINER'
+              }));
+              mentionProvider.showInlineInvitePopup(email, pendingLocalId);
               return _tr;
             }
           } else if (mentionProvider.onInviteItemClick) {

package/dist/es2019/entry-points/anchored-popup.js

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { AnchoredPopup } from '../ui/AnchoredPopup';

package/dist/es2019/mentionsPlugin.js

@@ -16,8 +16,7 @@ import { mentionNodeSpec } from './nodeviews/mentionNodeSpec';
 import { agentMentionPluginKey, createAgentMentionPlugin } from './pm-plugins/agent';
 import { mentionPluginKey } from './pm-plugins/key';
 import { ACTIONS, createMentionPlugin } from './pm-plugins/main';
-import { createMentionPlaceholderPlugin } from './pm-plugins/mentionPlaceholder';
-import { InlineInviteRecaptchaContainer } from './ui/InlineInviteRecaptchaContainer';
+import { InlineInvitePopupContainer } from './ui/InlineInvitePopupContainer';
 import { SecondaryToolbarComponent } from './ui/SecondaryToolbarComponent';
 import { createTypeAheadConfig } from './ui/type-ahead';
 const processName = (name, intl) => {
@@ -137,12 +136,6 @@ const mentionsPlugin = ({
           })
         });
       }
-      if (fg('jira_invites_auto_tag_new_user_in_mentions_fg')) {
-        plugins.push({
-          name: 'mentionPlaceholder',
-          plugin: () => createMentionPlaceholderPlugin()
-        });
-      }
       return plugins;
     },
     contentComponent({
@@ -165,9 +158,10 @@ const mentionsPlugin = ({
           return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Component, {
             mentionProvider: mentionProvider,
             api: api
-          }), fg('jira_invites_auto_tag_new_user_in_mentions_fg') && /*#__PURE__*/React.createElement(InlineInviteRecaptchaContainer, {
+          }), fg('inline_invite_from_mentions_kill_switch') && /*#__PURE__*/React.createElement(InlineInvitePopupContainer, {
             mentionProvider: mentionProvider,
-            api: api
+            api: api,
+            editorView: editorView
           }));
         }
       });

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

@@ -51,7 +51,7 @@ const AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 const AGENT_MENTION_INACTIVITY_MS = 3000;
 const MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "16.0.2";
+const PACKAGE_VERSION = "16.1.0";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

package/dist/es2019/ui/AnchoredPopup.js

@@ -0,0 +1,28 @@
+import React, { useCallback } from 'react';
+import { Popup } from '@atlaskit/popup/popup';
+/**
+ * A `<Popup>` anchored to an externally-supplied DOM node. Unlike `PopupTrigger`, it has no
+ * clickable trigger of its own — it opens whenever `isOpen` becomes true, so callers can drive
+ * it from any external signal.
+ */
+export function AnchoredPopup({
+  anchorElement,
+  content,
+  isOpen,
+  onClose
+}) {
+  const renderContent = useCallback(() => isOpen ? content : null, [isOpen, content]);
+  const renderTrigger = useCallback(triggerProps => {
+    if (anchorElement && typeof triggerProps.ref === 'function') {
+      triggerProps.ref(anchorElement);
+    }
+    return null;
+  }, [anchorElement]);
+  return /*#__PURE__*/React.createElement(Popup, {
+    isOpen: isOpen,
+    onClose: onClose,
+    placement: "bottom-start",
+    content: renderContent,
+    trigger: renderTrigger
+  });
+}

package/dist/es2019/ui/InlineInvitePopupContainer.js

@@ -0,0 +1,146 @@
+/* InlineInvitePopupContainer.tsx generated by @compiled/babel-plugin v2.0.0 */
+import { ax, ix } from "@compiled/react/runtime";
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+const findMentionRange = (doc, localId) => {
+  let range = null;
+  doc.descendants((node, pos) => {
+    if (range) {
+      return false;
+    }
+    if (node.type.name === 'mention' && node.attrs.localId === localId) {
+      range = {
+        from: pos,
+        to: pos + node.nodeSize
+      };
+      return false;
+    }
+    return true;
+  });
+  return range;
+};
+export const InlineInvitePopupContainer = ({
+  mentionProvider,
+  api,
+  editorView
+}) => {
+  var _api$mention2, _api$mention2$command, _api$core3, _api$core3$actions;
+  const [provider, setProvider] = useState(null);
+  const [anchorElement, setAnchorElement] = useState(null);
+  const pendingMentionRef = useRef(null);
+  useEffect(() => {
+    if (!mentionProvider) {
+      return;
+    }
+    let isMounted = true;
+    let cleanupProvider;
+    mentionProvider.then(resolvedProvider => {
+      var _providerWithPopup$ge;
+      if (!isMounted) {
+        return;
+      }
+      const providerWithPopup = resolvedProvider;
+      const originalGetMentionDisabledState = (_providerWithPopup$ge = providerWithPopup.getMentionDisabledState) === null || _providerWithPopup$ge === void 0 ? void 0 : _providerWithPopup$ge.bind(providerWithPopup);
+      providerWithPopup.getMentionDisabledState = mention => {
+        var _pendingMentionRef$cu;
+        if (((_pendingMentionRef$cu = pendingMentionRef.current) === null || _pendingMentionRef$cu === void 0 ? void 0 : _pendingMentionRef$cu.localId) === mention.id) {
+          return {
+            disabled: true
+          };
+        }
+        return originalGetMentionDisabledState === null || originalGetMentionDisabledState === void 0 ? void 0 : originalGetMentionDisabledState(mention);
+      };
+      cleanupProvider = () => {
+        if (originalGetMentionDisabledState) {
+          providerWithPopup.getMentionDisabledState = originalGetMentionDisabledState;
+        } else {
+          delete providerWithPopup.getMentionDisabledState;
+        }
+      };
+      setProvider(providerWithPopup);
+    }).catch(() => {});
+    return () => {
+      var _cleanupProvider;
+      isMounted = false;
+      (_cleanupProvider = cleanupProvider) === null || _cleanupProvider === void 0 ? void 0 : _cleanupProvider();
+      setProvider(null);
+    };
+  }, [mentionProvider]);
+  const removePendingMention = useCallback(() => {
+    var _api$core, _api$core$actions;
+    const pending = pendingMentionRef.current;
+    if (pending && api !== null && api !== void 0 && (_api$core = api.core) !== null && _api$core !== void 0 && (_api$core$actions = _api$core.actions) !== null && _api$core$actions !== void 0 && _api$core$actions.execute) {
+      api.core.actions.execute(({
+        tr
+      }) => {
+        const range = findMentionRange(tr.doc, pending.localId);
+        return range ? tr.delete(range.from, range.to) : null;
+      });
+    }
+    pendingMentionRef.current = null;
+    setAnchorElement(null);
+  }, [api]);
+  const handleDismiss = useCallback(() => {
+    removePendingMention();
+  }, [removePendingMention]);
+  const handleInviteComplete = useCallback(result => {
+    var _result$invited$, _api$core2, _api$core2$actions, _api$mention, _api$mention$commands;
+    const pending = pendingMentionRef.current;
+    if (!pending) {
+      return;
+    }
+    const invitedUser = (_result$invited$ = result.invited[0]) !== null && _result$invited$ !== void 0 ? _result$invited$ : result.requested[0];
+    if (!invitedUser || !(api !== null && api !== void 0 && (_api$core2 = api.core) !== null && _api$core2 !== void 0 && (_api$core2$actions = _api$core2.actions) !== null && _api$core2$actions !== void 0 && _api$core2$actions.execute) || !(api !== null && api !== void 0 && (_api$mention = api.mention) !== null && _api$mention !== void 0 && (_api$mention$commands = _api$mention.commands) !== null && _api$mention$commands !== void 0 && _api$mention$commands.insertMention)) {
+      removePendingMention();
+      return;
+    }
+    const {
+      id: userId,
+      email
+    } = invitedUser;
+    api.core.actions.execute(({
+      tr
+    }) => {
+      const range = findMentionRange(tr.doc, pending.localId);
+      return range ? tr.delete(range.from, range.to) : null;
+    });
+    api.core.actions.execute(api.mention.commands.insertMention({
+      id: userId,
+      name: email,
+      userType: 'DEFAULT',
+      accessLevel: 'CONTAINER'
+    }));
+    pendingMentionRef.current = null;
+    setAnchorElement(null);
+  }, [api, removePendingMention]);
+  const handleReady = useCallback(show => {
+    if (!provider) {
+      return;
+    }
+    if (show) {
+      provider.showInlineInvitePopup = (email, localId) => {
+        pendingMentionRef.current = {
+          email,
+          localId
+        };
+        setTimeout(() => {
+          const range = findMentionRange(editorView.state.doc, localId);
+          const dom = range ? editorView.nodeDOM(range.from) : null;
+          setAnchorElement(dom instanceof HTMLElement ? dom : null);
+          show(email);
+        }, 0);
+      };
+    } else {
+      delete provider.showInlineInvitePopup;
+    }
+  }, [provider, editorView]);
+  if (!(provider !== null && provider !== void 0 && provider.InlineInvitePopup) || !(api !== null && api !== void 0 && (_api$mention2 = api.mention) !== null && _api$mention2 !== void 0 && (_api$mention2$command = _api$mention2.commands) !== null && _api$mention2$command !== void 0 && _api$mention2$command.insertMention) || !(api !== null && api !== void 0 && (_api$core3 = api.core) !== null && _api$core3 !== void 0 && (_api$core3$actions = _api$core3.actions) !== null && _api$core3$actions !== void 0 && _api$core3$actions.execute)) {
+    return null;
+  }
+  const PopupComponent = provider.InlineInvitePopup;
+  return /*#__PURE__*/React.createElement(PopupComponent, {
+    anchorElement: anchorElement,
+    onInviteComplete: handleInviteComplete,
+    onDismiss: handleDismiss,
+    onReady: handleReady
+  });
+};

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

@@ -146,7 +146,7 @@ export const buildTypeAheadInsertedPayload = (duration, upKeyCount, downKeyCount
     }
   };
 };
-export const buildTypeAheadRenderedPayload = (duration, userIds, query, teams, xProductMentionsLength, agentAnalytics) => {
+export const buildTypeAheadRenderedPayload = (duration, userIds, query, teams, xProductMentionsLength, mentionTypeaheadSessionId, agentAnalytics) => {
   const {
     queryLength,
     spaceInQuery
@@ -164,6 +164,7 @@ export const buildTypeAheadRenderedPayload = (duration, userIds, query, teams, x
     attributes: {
       componentName,
       duration,
+      mentionTypeaheadSessionId,
       userIds,
       teams,
       queryLength,