npm - @atlaskit/editor-plugin-mentions - Versions diffs - 14.1.1 → 14.2.0 - Mend

@atlaskit/editor-plugin-mentions 14.1.1 → 14.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/CHANGELOG.md +12 -0
package/dist/cjs/pm-plugins/main.js +133 -45
package/dist/es2019/pm-plugins/main.js +126 -45
package/dist/esm/pm-plugins/main.js +133 -45
package/dist/types/types/index.d.ts +26 -18
package/package.json +7 -7

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-mentions
+## 14.2.0
+### Minor Changes
+- [`cf7bf77da7d41`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cf7bf77da7d41) -
+  Delay typed agent mention trigger until editor inactivity or when selection leaves the parent
+  block
+### Patch Changes
+- Updated dependencies
 ## 14.1.1
 ### Patch Changes

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

@@ -31,11 +31,15 @@ var ACTIONS = exports.ACTIONS = {
 };
 // 'AGENT' is not in the ADF schema UserType enum but is used at runtime.
 var AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
+var isAgentUserType = function isAgentUserType(userType) {
+  return typeof userType === 'string' && AGENT_USER_TYPES.has(userType);
+};
 var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "14.1.0";
+var PACKAGE_VERSION = "14.2.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -61,6 +65,14 @@ var isQualifyingLocalUserDocChange = function isQualifyingLocalUserDocChange(tr)
   var isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
   return tr.docChanged && !tr.getMeta('isRemote') && !tr.getMeta('replaceDocument') && !isAIStreaming;
 };
+var isLocalSelectionChange = function isLocalSelectionChange(tr, hasPositionChanged) {
+  var isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
+  // Pressing Enter can move selection through a doc split without setting tr.selectionSet
+  // or changing from/to numerically, so local doc changes are checked against the
+  // pending mention's current parent before publishing.
+  return (hasPositionChanged || tr.docChanged) && !tr.getMeta('isRemote') && !tr.getMeta('replaceDocument') && !isAIStreaming;
+};
 /**
  * Reads agent-mention details from a known document position without traversing
@@ -74,16 +86,18 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
   }
   var node = state.doc.nodeAt(pos);
   var mentionSchema = state.schema.nodes.mention;
-  if ((node === null || node === void 0 ? void 0 : node.type) !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !matchesMention(node.attrs) || !node.attrs.id) {
+  if ((node === null || node === void 0 ? void 0 : node.type) !== mentionSchema || !isAgentUserType(node.attrs.userType) || !matchesMention(node.attrs) || !node.attrs.id) {
     return null;
   }
-  var $mentionPos = state.doc.resolve(pos);
+  var $mentionPos = state.doc.resolve(Math.min(pos + node.nodeSize, state.doc.content.size));
   var parentNode = $mentionPos.node($mentionPos.depth);
   return {
     id: node.attrs.id,
     context: parentNode.textContent.trim() || null,
     nodeSize: node.nodeSize,
+    parentEnd: $mentionPos.end($mentionPos.depth),
     parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
+    parentStart: $mentionPos.start($mentionPos.depth),
     pos: pos
   };
 };
@@ -101,7 +115,7 @@ var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(s
     if (((_result = result) === null || _result === void 0 ? void 0 : _result.id) === preferredId) {
       return false;
     }
-    if (node.type !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !node.attrs.id) {
+    if (node.type !== mentionSchema || !isAgentUserType(node.attrs.userType) || !node.attrs.id) {
       return true;
     }
     result = getAgentMentionDetailsAtPos(state, pos, function (attrs) {
@@ -135,6 +149,79 @@ var getPendingTypedAgentMentionAfterDocChange = function getPendingTypedAgentMen
     resetCount: resetCount
   } : null;
 };
+var hasPendingMentionMovedToNewParent = function hasPendingMentionMovedToNewParent(oldState, tr, previousPendingTypedAgentMention, pendingMentionDetails) {
+  if (!previousPendingTypedAgentMention) {
+    return false;
+  }
+  var previousMentionDetails = getAgentMentionDetailsAtPos(oldState, previousPendingTypedAgentMention.pos, function (attrs) {
+    return attrs.localId === previousPendingTypedAgentMention.localId;
+  });
+  // Keep the previous parent boundary associated with the left side of an
+  // insertion at that boundary, so typing at the start of the parent does not
+  // look like the pending mention moved into a new parent.
+  var mappedPreviousParentStart = previousMentionDetails && tr.mapping.map(previousMentionDetails.parentStart, -1);
+  return Boolean(previousMentionDetails && mappedPreviousParentStart !== pendingMentionDetails.parentStart);
+};
+var isSelectionOutsideDirectParent = function isSelectionOutsideDirectParent(state, pendingMentionDetails) {
+  return state.selection.from < pendingMentionDetails.parentStart || state.selection.to > pendingMentionDetails.parentEnd;
+};
+/**
+ * Finalises a pending typed agent mention by copying its details into the
+ * public lastInserted* plugin state after the caller has already resolved the
+ * pending mention from the current document.
+ */
+var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails) {
+  var _pluginState$lastAgen;
+  return {
+    hasPublicPluginStateChanged: true,
+    pluginState: _objectSpread(_objectSpread({}, pluginState), {}, {
+      pendingTypedAgentMention: null,
+      lastInsertedAgentMentionId: pendingMentionDetails.id,
+      lastInsertedAgentMentionContext: pendingMentionDetails.context,
+      lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
+      lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
+    })
+  };
+};
+/**
+ * Resolves and finalises a pending typed agent mention. If the tracked mention
+ * no longer resolves, the stale pending state is cleared without dispatching a
+ * public update.
+ */
+var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(state, pluginState, pendingTypedAgentMention) {
+  var pendingMentionDetails = getAgentMentionDetailsAtPos(state, pendingTypedAgentMention.pos, function (attrs) {
+    return attrs.localId === pendingTypedAgentMention.localId;
+  });
+  if (!pendingMentionDetails) {
+    return {
+      hasPublicPluginStateChanged: false,
+      pluginState: _objectSpread(_objectSpread({}, pluginState), {}, {
+        pendingTypedAgentMention: null
+      })
+    };
+  }
+  return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
+};
+var hasTrackedAgentMentionState = function hasTrackedAgentMentionState(pluginState) {
+  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+};
+/**
+ * Clears agent mention state that points at a specific document snapshot.
+ * replaceDocument swaps content wholesale, so pending typed mentions and
+ * lastInserted* details from the previous document must be cleared together.
+ */
+var clearTrackedAgentMentionState = function clearTrackedAgentMentionState(pluginState) {
+  return _objectSpread(_objectSpread({}, pluginState), {}, {
+    pendingTypedAgentMention: null,
+    lastInsertedAgentMentionId: null,
+    lastInsertedAgentMentionContext: null,
+    lastInsertedAgentMentionParentNodeType: null
+  });
+};
 function createMentionPlugin(_ref2) {
   var pmPluginFactoryParams = _ref2.pmPluginFactoryParams,
     fireEvent = _ref2.fireEvent,
@@ -184,30 +271,15 @@ function createMentionPlugin(_ref2) {
         switch (action) {
           case ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION:
             {
-              var _newPluginState$lastA;
               var pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
               // Ignore stale timer callbacks. The localId and resetCount must still match the
               // current pending mention so older timers cannot publish after later user edits.
               if (!isAgentMentionsExperimentEnabled || !pendingTypedAgentMention || pendingTypedAgentMention.localId !== (params === null || params === void 0 ? void 0 : params.localId) || pendingTypedAgentMention.resetCount !== (params === null || params === void 0 ? void 0 : params.resetCount)) {
                 break;
               }
-              var pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, function (attrs) {
-                return attrs.localId === pendingTypedAgentMention.localId;
-              });
-              if (!pendingMentionDetails) {
-                newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-                  pendingTypedAgentMention: null
-                });
-                break;
-              }
-              newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-                pendingTypedAgentMention: null,
-                lastInsertedAgentMentionId: pendingMentionDetails.id,
-                lastInsertedAgentMentionContext: pendingMentionDetails.context,
-                lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
-                lastAgentMentionInsertionCount: ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1
-              });
-              hasPublicPluginStateChanged = true;
+              var commitResult = commitPendingTypedAgentMention(newState, newPluginState, pendingTypedAgentMention);
+              newPluginState = commitResult.pluginState;
+              hasPublicPluginStateChanged = hasPublicPluginStateChanged || commitResult.hasPublicPluginStateChanged;
               break;
             }
           case ACTIONS.SET_PROVIDER:
@@ -224,15 +296,6 @@ function createMentionPlugin(_ref2) {
         if (hasPublicPluginStateChanged && !isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(_key.mentionPluginKey, newPluginState);
         }
-        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument')) {
-          newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-            pendingTypedAgentMention: null,
-            lastInsertedAgentMentionId: null,
-            lastInsertedAgentMentionContext: null,
-            lastInsertedAgentMentionParentNodeType: null
-          });
-          hasPublicPluginStateChanged = true;
-        }
         if (options !== null && options !== void 0 && options.handleMentionsChanged && tr.docChanged) {
           var _insm$session, _insm$session2;
           (_insm$session = _insm.insm.session) === null || _insm$session === void 0 || _insm$session.startFeature('mentionDeletionDetection');
@@ -313,7 +376,7 @@ function createMentionPlugin(_ref2) {
                 var clampedNewTo = Math.min(newTo, newState.doc.content.size);
                 if (clampedNewFrom < clampedNewTo) {
                   newState.doc.nodesBetween(clampedNewFrom, clampedNewTo, function (node) {
-                    if (node.type === _mentionSchema && AGENT_USER_TYPES.has(node.attrs.userType)) {
+                    if (node.type === _mentionSchema && isAgentUserType(node.attrs.userType)) {
                       found = true;
                     }
                     return !found;
@@ -341,14 +404,14 @@ function createMentionPlugin(_ref2) {
           });
           var shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
           if (shouldResolveAgentMentionState) {
-            var _newPluginState$lastA2, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
             var agentMentionId = null;
             var agentMentionContext = null;
             var agentMentionParentNodeType = null;
             var newCount = 0;
             var oldAgentMentionId = null;
             var oldCount = 0;
-            var pendingTypedAgentMentionDetails = {};
+            var pendingTypedAgentMentionDetails = null;
             if (stepsTouchMentions) {
               var _iterator = _createForOfIteratorHelper(newDocRanges),
                 _step;
@@ -360,15 +423,14 @@ function createMentionPlugin(_ref2) {
                   var clampedTo = Math.min(to, newState.doc.content.size);
                   if (from >= clampedTo) continue;
                   newState.doc.nodesBetween(from, clampedTo, function (node, pos) {
-                    if (node.type !== _mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType)) {
+                    if (node.type !== _mentionSchema || !isAgentUserType(node.attrs.userType)) {
                       return true;
                     }
                     newCount++;
-                    if (pendingTypedAgentMentionDetails.current === undefined && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
-                      var _getAgentMentionDetai;
-                      pendingTypedAgentMentionDetails.current = (_getAgentMentionDetai = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
+                    if (pendingTypedAgentMentionDetails === null && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
+                      pendingTypedAgentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
                         return attrs.localId === params.localId;
-                      })) !== null && _getAgentMentionDetai !== void 0 ? _getAgentMentionDetai : undefined;
+                      });
                     }
                     if (agentMentionId === null && node.attrs.id) {
                       var agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
@@ -398,7 +460,7 @@ function createMentionPlugin(_ref2) {
                   var clampedOldTo = Math.min(_to, oldState.doc.content.size);
                   if (_from >= clampedOldTo) continue;
                   oldState.doc.nodesBetween(_from, clampedOldTo, function (node) {
-                    if (node.type !== _mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType)) {
+                    if (node.type !== _mentionSchema || !isAgentUserType(node.attrs.userType)) {
                       return true;
                     }
                     oldCount++;
@@ -430,15 +492,16 @@ function createMentionPlugin(_ref2) {
             }
             var isNewInsertion = agentMentionId !== null && !resolvedFromFullDocFallback && (oldAgentMentionId !== agentMentionId || newCount > oldCount);
             var isPendingTypedAgentMentionInsertion = isNewInsertion && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && typeof (params === null || params === void 0 ? void 0 : params.localId) === 'string';
-            var newInsertionCount = isNewInsertion ? ((_newPluginState$lastA2 = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA2 !== void 0 ? _newPluginState$lastA2 : 0) + 1 : undefined;
-            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetails.current) {
+            var newInsertionCount = isNewInsertion ? ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1 : undefined;
+            var pendingTypedAgentMentionDetailsForState = pendingTypedAgentMentionDetails;
+            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetailsForState) {
               var pendingTypedAgentMentionLocalId = params === null || params === void 0 ? void 0 : params.localId;
               newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 pendingTypedAgentMention: {
-                  id: pendingTypedAgentMentionDetails.current.id,
+                  id: pendingTypedAgentMentionDetailsForState.id,
                   localId: pendingTypedAgentMentionLocalId,
-                  nodeSize: pendingTypedAgentMentionDetails.current.nodeSize,
-                  pos: pendingTypedAgentMentionDetails.current.pos,
+                  nodeSize: pendingTypedAgentMentionDetailsForState.nodeSize,
+                  pos: pendingTypedAgentMentionDetailsForState.pos,
                   resetCount: 1
                 }
               });
@@ -466,6 +529,10 @@ function createMentionPlugin(_ref2) {
             }
           }
         }
+        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument') && hasTrackedAgentMentionState(newPluginState)) {
+          newPluginState = clearTrackedAgentMentionState(newPluginState);
+          hasPublicPluginStateChanged = true;
+        }
         if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && tr.docChanged) {
           newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
             pendingTypedAgentMention: getPendingTypedAgentMentionAfterDocChange(newState, tr, newPluginState.pendingTypedAgentMention, {
@@ -473,6 +540,27 @@ function createMentionPlugin(_ref2) {
             })
           });
         }
+        // Typed agent mentions stay pending while the user is still editing around them,
+        // but leaving the mention's direct parent means they have moved on from that
+        // paragraph/block. Publish immediately in that case instead of waiting for the
+        // inactivity timer.
+        var shouldCheckPendingTypedAgentMentionParent = isLocalSelectionChange(tr, hasPositionChanged);
+        if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && shouldCheckPendingTypedAgentMentionParent) {
+          var _pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
+          var pendingMentionDetails = getAgentMentionDetailsAtPos(newState, _pendingTypedAgentMention.pos, function (attrs) {
+            return attrs.localId === _pendingTypedAgentMention.localId;
+          });
+          if (!pendingMentionDetails) {
+            newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+              pendingTypedAgentMention: null
+            });
+          } else if (hasPendingMentionMovedToNewParent(oldState, tr, pluginState.pendingTypedAgentMention, pendingMentionDetails) || isSelectionOutsideDirectParent(newState, pendingMentionDetails)) {
+            var _commitResult = commitResolvedPendingTypedAgentMention(newPluginState, pendingMentionDetails);
+            newPluginState = _commitResult.pluginState;
+            hasPublicPluginStateChanged = hasPublicPluginStateChanged || _commitResult.hasPublicPluginStateChanged;
+          }
+        }
         if (hasPublicPluginStateChanged && isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(_key.mentionPluginKey, newPluginState);
         }

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

@@ -16,11 +16,15 @@ export const ACTIONS = {
 };
 // 'AGENT' is not in the ADF schema UserType enum but is used at runtime.
 const AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
+const isAgentUserType = userType => {
+  return typeof userType === 'string' && AGENT_USER_TYPES.has(userType);
+};
 const AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 const AGENT_MENTION_INACTIVITY_MS = 3000;
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "14.1.0";
+const PACKAGE_VERSION = "14.2.0";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {
@@ -44,6 +48,14 @@ const isQualifyingLocalUserDocChange = tr => {
   const isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
   return tr.docChanged && !tr.getMeta('isRemote') && !tr.getMeta('replaceDocument') && !isAIStreaming;
 };
+const isLocalSelectionChange = (tr, hasPositionChanged) => {
+  const isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
+  // Pressing Enter can move selection through a doc split without setting tr.selectionSet
+  // or changing from/to numerically, so local doc changes are checked against the
+  // pending mention's current parent before publishing.
+  return (hasPositionChanged || tr.docChanged) && !tr.getMeta('isRemote') && !tr.getMeta('replaceDocument') && !isAIStreaming;
+};
 /**
  * Reads agent-mention details from a known document position without traversing
@@ -57,16 +69,18 @@ const getAgentMentionDetailsAtPos = (state, pos, matchesMention) => {
   }
   const node = state.doc.nodeAt(pos);
   const mentionSchema = state.schema.nodes.mention;
-  if ((node === null || node === void 0 ? void 0 : node.type) !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !matchesMention(node.attrs) || !node.attrs.id) {
+  if ((node === null || node === void 0 ? void 0 : node.type) !== mentionSchema || !isAgentUserType(node.attrs.userType) || !matchesMention(node.attrs) || !node.attrs.id) {
     return null;
   }
-  const $mentionPos = state.doc.resolve(pos);
+  const $mentionPos = state.doc.resolve(Math.min(pos + node.nodeSize, state.doc.content.size));
   const parentNode = $mentionPos.node($mentionPos.depth);
   return {
     id: node.attrs.id,
     context: parentNode.textContent.trim() || null,
     nodeSize: node.nodeSize,
+    parentEnd: $mentionPos.end($mentionPos.depth),
     parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
+    parentStart: $mentionPos.start($mentionPos.depth),
     pos
   };
 };
@@ -84,7 +98,7 @@ const getSurvivingAgentMentionDetails = (state, preferredId) => {
     if (((_result = result) === null || _result === void 0 ? void 0 : _result.id) === preferredId) {
       return false;
     }
-    if (node.type !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !node.attrs.id) {
+    if (node.type !== mentionSchema || !isAgentUserType(node.attrs.userType) || !node.attrs.id) {
       return true;
     }
     result = getAgentMentionDetailsAtPos(state, pos, attrs => attrs.id === node.attrs.id);
@@ -115,6 +129,74 @@ const getPendingTypedAgentMentionAfterDocChange = (state, tr, pendingTypedAgentM
     resetCount
   } : null;
 };
+const hasPendingMentionMovedToNewParent = (oldState, tr, previousPendingTypedAgentMention, pendingMentionDetails) => {
+  if (!previousPendingTypedAgentMention) {
+    return false;
+  }
+  const previousMentionDetails = getAgentMentionDetailsAtPos(oldState, previousPendingTypedAgentMention.pos, attrs => attrs.localId === previousPendingTypedAgentMention.localId);
+  // Keep the previous parent boundary associated with the left side of an
+  // insertion at that boundary, so typing at the start of the parent does not
+  // look like the pending mention moved into a new parent.
+  const mappedPreviousParentStart = previousMentionDetails && tr.mapping.map(previousMentionDetails.parentStart, -1);
+  return Boolean(previousMentionDetails && mappedPreviousParentStart !== pendingMentionDetails.parentStart);
+};
+const isSelectionOutsideDirectParent = (state, pendingMentionDetails) => {
+  return state.selection.from < pendingMentionDetails.parentStart || state.selection.to > pendingMentionDetails.parentEnd;
+};
+/**
+ * Finalises a pending typed agent mention by copying its details into the
+ * public lastInserted* plugin state after the caller has already resolved the
+ * pending mention from the current document.
+ */
+const commitResolvedPendingTypedAgentMention = (pluginState, pendingMentionDetails) => {
+  var _pluginState$lastAgen;
+  return {
+    hasPublicPluginStateChanged: true,
+    pluginState: {
+      ...pluginState,
+      pendingTypedAgentMention: null,
+      lastInsertedAgentMentionId: pendingMentionDetails.id,
+      lastInsertedAgentMentionContext: pendingMentionDetails.context,
+      lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
+      lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
+    }
+  };
+};
+/**
+ * Resolves and finalises a pending typed agent mention. If the tracked mention
+ * no longer resolves, the stale pending state is cleared without dispatching a
+ * public update.
+ */
+const commitPendingTypedAgentMention = (state, pluginState, pendingTypedAgentMention) => {
+  const pendingMentionDetails = getAgentMentionDetailsAtPos(state, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
+  if (!pendingMentionDetails) {
+    return {
+      hasPublicPluginStateChanged: false,
+      pluginState: {
+        ...pluginState,
+        pendingTypedAgentMention: null
+      }
+    };
+  }
+  return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
+};
+const hasTrackedAgentMentionState = pluginState => Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+/**
+ * Clears agent mention state that points at a specific document snapshot.
+ * replaceDocument swaps content wholesale, so pending typed mentions and
+ * lastInserted* details from the previous document must be cleared together.
+ */
+const clearTrackedAgentMentionState = pluginState => ({
+  ...pluginState,
+  pendingTypedAgentMention: null,
+  lastInsertedAgentMentionId: null,
+  lastInsertedAgentMentionContext: null,
+  lastInsertedAgentMentionParentNodeType: null
+});
 export function createMentionPlugin({
   pmPluginFactoryParams,
   fireEvent,
@@ -168,30 +250,15 @@ export function createMentionPlugin({
         switch (action) {
           case ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION:
             {
-              var _newPluginState$lastA;
               const pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
               // Ignore stale timer callbacks. The localId and resetCount must still match the
               // current pending mention so older timers cannot publish after later user edits.
               if (!isAgentMentionsExperimentEnabled || !pendingTypedAgentMention || pendingTypedAgentMention.localId !== (params === null || params === void 0 ? void 0 : params.localId) || pendingTypedAgentMention.resetCount !== (params === null || params === void 0 ? void 0 : params.resetCount)) {
                 break;
               }
-              const pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
-              if (!pendingMentionDetails) {
-                newPluginState = {
-                  ...newPluginState,
-                  pendingTypedAgentMention: null
-                };
-                break;
-              }
-              newPluginState = {
-                ...newPluginState,
-                pendingTypedAgentMention: null,
-                lastInsertedAgentMentionId: pendingMentionDetails.id,
-                lastInsertedAgentMentionContext: pendingMentionDetails.context,
-                lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
-                lastAgentMentionInsertionCount: ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1
-              };
-              hasPublicPluginStateChanged = true;
+              const commitResult = commitPendingTypedAgentMention(newState, newPluginState, pendingTypedAgentMention);
+              newPluginState = commitResult.pluginState;
+              hasPublicPluginStateChanged = hasPublicPluginStateChanged || commitResult.hasPublicPluginStateChanged;
               break;
             }
           case ACTIONS.SET_PROVIDER:
@@ -209,16 +276,6 @@ export function createMentionPlugin({
         if (hasPublicPluginStateChanged && !isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }
-        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument')) {
-          newPluginState = {
-            ...newPluginState,
-            pendingTypedAgentMention: null,
-            lastInsertedAgentMentionId: null,
-            lastInsertedAgentMentionContext: null,
-            lastInsertedAgentMentionParentNodeType: null
-          };
-          hasPublicPluginStateChanged = true;
-        }
         if (options !== null && options !== void 0 && options.handleMentionsChanged && tr.docChanged) {
           var _insm$session, _insm$session2;
           (_insm$session = insm.session) === null || _insm$session === void 0 ? void 0 : _insm$session.startFeature('mentionDeletionDetection');
@@ -297,7 +354,7 @@ export function createMentionPlugin({
                 const clampedNewTo = Math.min(newTo, newState.doc.content.size);
                 if (clampedNewFrom < clampedNewTo) {
                   newState.doc.nodesBetween(clampedNewFrom, clampedNewTo, node => {
-                    if (node.type === mentionSchema && AGENT_USER_TYPES.has(node.attrs.userType)) {
+                    if (node.type === mentionSchema && isAgentUserType(node.attrs.userType)) {
                       found = true;
                     }
                     return !found;
@@ -325,26 +382,25 @@ export function createMentionPlugin({
           });
           const shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
           if (shouldResolveAgentMentionState) {
-            var _newPluginState$lastA2, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
             let agentMentionId = null;
             let agentMentionContext = null;
             let agentMentionParentNodeType = null;
             let newCount = 0;
             let oldAgentMentionId = null;
             let oldCount = 0;
-            const pendingTypedAgentMentionDetails = {};
+            let pendingTypedAgentMentionDetails = null;
             if (stepsTouchMentions) {
               for (const [from, to] of newDocRanges) {
                 const clampedTo = Math.min(to, newState.doc.content.size);
                 if (from >= clampedTo) continue;
                 newState.doc.nodesBetween(from, clampedTo, (node, pos) => {
-                  if (node.type !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType)) {
+                  if (node.type !== mentionSchema || !isAgentUserType(node.attrs.userType)) {
                     return true;
                   }
                   newCount++;
-                  if (pendingTypedAgentMentionDetails.current === undefined && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
-                    var _getAgentMentionDetai;
-                    pendingTypedAgentMentionDetails.current = (_getAgentMentionDetai = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.localId === params.localId)) !== null && _getAgentMentionDetai !== void 0 ? _getAgentMentionDetai : undefined;
+                  if (pendingTypedAgentMentionDetails === null && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
+                    pendingTypedAgentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.localId === params.localId);
                   }
                   if (agentMentionId === null && node.attrs.id) {
                     const agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, attrs => attrs.id === node.attrs.id);
@@ -361,7 +417,7 @@ export function createMentionPlugin({
                 const clampedOldTo = Math.min(to, oldState.doc.content.size);
                 if (from >= clampedOldTo) continue;
                 oldState.doc.nodesBetween(from, clampedOldTo, node => {
-                  if (node.type !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType)) {
+                  if (node.type !== mentionSchema || !isAgentUserType(node.attrs.userType)) {
                     return true;
                   }
                   oldCount++;
@@ -388,16 +444,17 @@ export function createMentionPlugin({
             }
             const isNewInsertion = agentMentionId !== null && !resolvedFromFullDocFallback && (oldAgentMentionId !== agentMentionId || newCount > oldCount);
             const isPendingTypedAgentMentionInsertion = isNewInsertion && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && typeof (params === null || params === void 0 ? void 0 : params.localId) === 'string';
-            const newInsertionCount = isNewInsertion ? ((_newPluginState$lastA2 = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA2 !== void 0 ? _newPluginState$lastA2 : 0) + 1 : undefined;
-            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetails.current) {
+            const newInsertionCount = isNewInsertion ? ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1 : undefined;
+            const pendingTypedAgentMentionDetailsForState = pendingTypedAgentMentionDetails;
+            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetailsForState) {
               const pendingTypedAgentMentionLocalId = params === null || params === void 0 ? void 0 : params.localId;
               newPluginState = {
                 ...newPluginState,
                 pendingTypedAgentMention: {
-                  id: pendingTypedAgentMentionDetails.current.id,
+                  id: pendingTypedAgentMentionDetailsForState.id,
                   localId: pendingTypedAgentMentionLocalId,
-                  nodeSize: pendingTypedAgentMentionDetails.current.nodeSize,
-                  pos: pendingTypedAgentMentionDetails.current.pos,
+                  nodeSize: pendingTypedAgentMentionDetailsForState.nodeSize,
+                  pos: pendingTypedAgentMentionDetailsForState.pos,
                   resetCount: 1
                 }
               };
@@ -429,6 +486,10 @@ export function createMentionPlugin({
             }
           }
         }
+        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument') && hasTrackedAgentMentionState(newPluginState)) {
+          newPluginState = clearTrackedAgentMentionState(newPluginState);
+          hasPublicPluginStateChanged = true;
+        }
         if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && tr.docChanged) {
           newPluginState = {
             ...newPluginState,
@@ -437,6 +498,26 @@ export function createMentionPlugin({
             })
           };
         }
+        // Typed agent mentions stay pending while the user is still editing around them,
+        // but leaving the mention's direct parent means they have moved on from that
+        // paragraph/block. Publish immediately in that case instead of waiting for the
+        // inactivity timer.
+        const shouldCheckPendingTypedAgentMentionParent = isLocalSelectionChange(tr, hasPositionChanged);
+        if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && shouldCheckPendingTypedAgentMentionParent) {
+          const pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
+          const pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, attrs => attrs.localId === pendingTypedAgentMention.localId);
+          if (!pendingMentionDetails) {
+            newPluginState = {
+              ...newPluginState,
+              pendingTypedAgentMention: null
+            };
+          } else if (hasPendingMentionMovedToNewParent(oldState, tr, pluginState.pendingTypedAgentMention, pendingMentionDetails) || isSelectionOutsideDirectParent(newState, pendingMentionDetails)) {
+            const commitResult = commitResolvedPendingTypedAgentMention(newPluginState, pendingMentionDetails);
+            newPluginState = commitResult.pluginState;
+            hasPublicPluginStateChanged = hasPublicPluginStateChanged || commitResult.hasPublicPluginStateChanged;
+          }
+        }
         if (hasPublicPluginStateChanged && isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }

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

@@ -23,11 +23,15 @@ export var ACTIONS = {
 };
 // 'AGENT' is not in the ADF schema UserType enum but is used at runtime.
 var AGENT_USER_TYPES = new Set(['APP', 'AGENT']);
+var isAgentUserType = function isAgentUserType(userType) {
+  return typeof userType === 'string' && AGENT_USER_TYPES.has(userType);
+};
 var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "14.1.0";
+var PACKAGE_VERSION = "14.2.0";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -53,6 +57,14 @@ var isQualifyingLocalUserDocChange = function isQualifyingLocalUserDocChange(tr)
   var isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
   return tr.docChanged && !tr.getMeta('isRemote') && !tr.getMeta('replaceDocument') && !isAIStreaming;
 };
+var isLocalSelectionChange = function isLocalSelectionChange(tr, hasPositionChanged) {
+  var isAIStreaming = Boolean(tr.getMeta(AI_STREAMING_TRANSFORMATION_META_KEY));
+  // Pressing Enter can move selection through a doc split without setting tr.selectionSet
+  // or changing from/to numerically, so local doc changes are checked against the
+  // pending mention's current parent before publishing.
+  return (hasPositionChanged || tr.docChanged) && !tr.getMeta('isRemote') && !tr.getMeta('replaceDocument') && !isAIStreaming;
+};
 /**
  * Reads agent-mention details from a known document position without traversing
@@ -66,16 +78,18 @@ var getAgentMentionDetailsAtPos = function getAgentMentionDetailsAtPos(state, po
   }
   var node = state.doc.nodeAt(pos);
   var mentionSchema = state.schema.nodes.mention;
-  if ((node === null || node === void 0 ? void 0 : node.type) !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !matchesMention(node.attrs) || !node.attrs.id) {
+  if ((node === null || node === void 0 ? void 0 : node.type) !== mentionSchema || !isAgentUserType(node.attrs.userType) || !matchesMention(node.attrs) || !node.attrs.id) {
     return null;
   }
-  var $mentionPos = state.doc.resolve(pos);
+  var $mentionPos = state.doc.resolve(Math.min(pos + node.nodeSize, state.doc.content.size));
   var parentNode = $mentionPos.node($mentionPos.depth);
   return {
     id: node.attrs.id,
     context: parentNode.textContent.trim() || null,
     nodeSize: node.nodeSize,
+    parentEnd: $mentionPos.end($mentionPos.depth),
     parentNodeType: (_parentNode$type$name = parentNode.type.name) !== null && _parentNode$type$name !== void 0 ? _parentNode$type$name : null,
+    parentStart: $mentionPos.start($mentionPos.depth),
     pos: pos
   };
 };
@@ -93,7 +107,7 @@ var getSurvivingAgentMentionDetails = function getSurvivingAgentMentionDetails(s
     if (((_result = result) === null || _result === void 0 ? void 0 : _result.id) === preferredId) {
       return false;
     }
-    if (node.type !== mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType) || !node.attrs.id) {
+    if (node.type !== mentionSchema || !isAgentUserType(node.attrs.userType) || !node.attrs.id) {
       return true;
     }
     result = getAgentMentionDetailsAtPos(state, pos, function (attrs) {
@@ -127,6 +141,79 @@ var getPendingTypedAgentMentionAfterDocChange = function getPendingTypedAgentMen
     resetCount: resetCount
   } : null;
 };
+var hasPendingMentionMovedToNewParent = function hasPendingMentionMovedToNewParent(oldState, tr, previousPendingTypedAgentMention, pendingMentionDetails) {
+  if (!previousPendingTypedAgentMention) {
+    return false;
+  }
+  var previousMentionDetails = getAgentMentionDetailsAtPos(oldState, previousPendingTypedAgentMention.pos, function (attrs) {
+    return attrs.localId === previousPendingTypedAgentMention.localId;
+  });
+  // Keep the previous parent boundary associated with the left side of an
+  // insertion at that boundary, so typing at the start of the parent does not
+  // look like the pending mention moved into a new parent.
+  var mappedPreviousParentStart = previousMentionDetails && tr.mapping.map(previousMentionDetails.parentStart, -1);
+  return Boolean(previousMentionDetails && mappedPreviousParentStart !== pendingMentionDetails.parentStart);
+};
+var isSelectionOutsideDirectParent = function isSelectionOutsideDirectParent(state, pendingMentionDetails) {
+  return state.selection.from < pendingMentionDetails.parentStart || state.selection.to > pendingMentionDetails.parentEnd;
+};
+/**
+ * Finalises a pending typed agent mention by copying its details into the
+ * public lastInserted* plugin state after the caller has already resolved the
+ * pending mention from the current document.
+ */
+var commitResolvedPendingTypedAgentMention = function commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails) {
+  var _pluginState$lastAgen;
+  return {
+    hasPublicPluginStateChanged: true,
+    pluginState: _objectSpread(_objectSpread({}, pluginState), {}, {
+      pendingTypedAgentMention: null,
+      lastInsertedAgentMentionId: pendingMentionDetails.id,
+      lastInsertedAgentMentionContext: pendingMentionDetails.context,
+      lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
+      lastAgentMentionInsertionCount: ((_pluginState$lastAgen = pluginState.lastAgentMentionInsertionCount) !== null && _pluginState$lastAgen !== void 0 ? _pluginState$lastAgen : 0) + 1
+    })
+  };
+};
+/**
+ * Resolves and finalises a pending typed agent mention. If the tracked mention
+ * no longer resolves, the stale pending state is cleared without dispatching a
+ * public update.
+ */
+var commitPendingTypedAgentMention = function commitPendingTypedAgentMention(state, pluginState, pendingTypedAgentMention) {
+  var pendingMentionDetails = getAgentMentionDetailsAtPos(state, pendingTypedAgentMention.pos, function (attrs) {
+    return attrs.localId === pendingTypedAgentMention.localId;
+  });
+  if (!pendingMentionDetails) {
+    return {
+      hasPublicPluginStateChanged: false,
+      pluginState: _objectSpread(_objectSpread({}, pluginState), {}, {
+        pendingTypedAgentMention: null
+      })
+    };
+  }
+  return commitResolvedPendingTypedAgentMention(pluginState, pendingMentionDetails);
+};
+var hasTrackedAgentMentionState = function hasTrackedAgentMentionState(pluginState) {
+  return Boolean(pluginState.pendingTypedAgentMention) || pluginState.lastInsertedAgentMentionId != null || pluginState.lastInsertedAgentMentionContext != null || pluginState.lastInsertedAgentMentionParentNodeType != null;
+};
+/**
+ * Clears agent mention state that points at a specific document snapshot.
+ * replaceDocument swaps content wholesale, so pending typed mentions and
+ * lastInserted* details from the previous document must be cleared together.
+ */
+var clearTrackedAgentMentionState = function clearTrackedAgentMentionState(pluginState) {
+  return _objectSpread(_objectSpread({}, pluginState), {}, {
+    pendingTypedAgentMention: null,
+    lastInsertedAgentMentionId: null,
+    lastInsertedAgentMentionContext: null,
+    lastInsertedAgentMentionParentNodeType: null
+  });
+};
 export function createMentionPlugin(_ref2) {
   var pmPluginFactoryParams = _ref2.pmPluginFactoryParams,
     fireEvent = _ref2.fireEvent,
@@ -176,30 +263,15 @@ export function createMentionPlugin(_ref2) {
         switch (action) {
           case ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION:
             {
-              var _newPluginState$lastA;
               var pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
               // Ignore stale timer callbacks. The localId and resetCount must still match the
               // current pending mention so older timers cannot publish after later user edits.
               if (!isAgentMentionsExperimentEnabled || !pendingTypedAgentMention || pendingTypedAgentMention.localId !== (params === null || params === void 0 ? void 0 : params.localId) || pendingTypedAgentMention.resetCount !== (params === null || params === void 0 ? void 0 : params.resetCount)) {
                 break;
               }
-              var pendingMentionDetails = getAgentMentionDetailsAtPos(newState, pendingTypedAgentMention.pos, function (attrs) {
-                return attrs.localId === pendingTypedAgentMention.localId;
-              });
-              if (!pendingMentionDetails) {
-                newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-                  pendingTypedAgentMention: null
-                });
-                break;
-              }
-              newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-                pendingTypedAgentMention: null,
-                lastInsertedAgentMentionId: pendingMentionDetails.id,
-                lastInsertedAgentMentionContext: pendingMentionDetails.context,
-                lastInsertedAgentMentionParentNodeType: pendingMentionDetails.parentNodeType,
-                lastAgentMentionInsertionCount: ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1
-              });
-              hasPublicPluginStateChanged = true;
+              var commitResult = commitPendingTypedAgentMention(newState, newPluginState, pendingTypedAgentMention);
+              newPluginState = commitResult.pluginState;
+              hasPublicPluginStateChanged = hasPublicPluginStateChanged || commitResult.hasPublicPluginStateChanged;
               break;
             }
           case ACTIONS.SET_PROVIDER:
@@ -216,15 +288,6 @@ export function createMentionPlugin(_ref2) {
         if (hasPublicPluginStateChanged && !isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }
-        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument')) {
-          newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
-            pendingTypedAgentMention: null,
-            lastInsertedAgentMentionId: null,
-            lastInsertedAgentMentionContext: null,
-            lastInsertedAgentMentionParentNodeType: null
-          });
-          hasPublicPluginStateChanged = true;
-        }
         if (options !== null && options !== void 0 && options.handleMentionsChanged && tr.docChanged) {
           var _insm$session, _insm$session2;
           (_insm$session = insm.session) === null || _insm$session === void 0 || _insm$session.startFeature('mentionDeletionDetection');
@@ -305,7 +368,7 @@ export function createMentionPlugin(_ref2) {
                 var clampedNewTo = Math.min(newTo, newState.doc.content.size);
                 if (clampedNewFrom < clampedNewTo) {
                   newState.doc.nodesBetween(clampedNewFrom, clampedNewTo, function (node) {
-                    if (node.type === _mentionSchema && AGENT_USER_TYPES.has(node.attrs.userType)) {
+                    if (node.type === _mentionSchema && isAgentUserType(node.attrs.userType)) {
                       found = true;
                     }
                     return !found;
@@ -333,14 +396,14 @@ export function createMentionPlugin(_ref2) {
           });
           var shouldResolveAgentMentionState = stepsTouchMentions || Boolean(newPluginState.lastInsertedAgentMentionId);
           if (shouldResolveAgentMentionState) {
-            var _newPluginState$lastA2, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
+            var _newPluginState$lastA, _newPluginState$lastI, _newPluginState$lastI2, _newPluginState$lastI3;
             var agentMentionId = null;
             var agentMentionContext = null;
             var agentMentionParentNodeType = null;
             var newCount = 0;
             var oldAgentMentionId = null;
             var oldCount = 0;
-            var pendingTypedAgentMentionDetails = {};
+            var pendingTypedAgentMentionDetails = null;
             if (stepsTouchMentions) {
               var _iterator = _createForOfIteratorHelper(newDocRanges),
                 _step;
@@ -352,15 +415,14 @@ export function createMentionPlugin(_ref2) {
                   var clampedTo = Math.min(to, newState.doc.content.size);
                   if (from >= clampedTo) continue;
                   newState.doc.nodesBetween(from, clampedTo, function (node, pos) {
-                    if (node.type !== _mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType)) {
+                    if (node.type !== _mentionSchema || !isAgentUserType(node.attrs.userType)) {
                       return true;
                     }
                     newCount++;
-                    if (pendingTypedAgentMentionDetails.current === undefined && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
-                      var _getAgentMentionDetai;
-                      pendingTypedAgentMentionDetails.current = (_getAgentMentionDetai = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
+                    if (pendingTypedAgentMentionDetails === null && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && node.attrs.localId === (params === null || params === void 0 ? void 0 : params.localId)) {
+                      pendingTypedAgentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
                         return attrs.localId === params.localId;
-                      })) !== null && _getAgentMentionDetai !== void 0 ? _getAgentMentionDetai : undefined;
+                      });
                     }
                     if (agentMentionId === null && node.attrs.id) {
                       var agentMentionDetails = getAgentMentionDetailsAtPos(newState, pos, function (attrs) {
@@ -390,7 +452,7 @@ export function createMentionPlugin(_ref2) {
                   var clampedOldTo = Math.min(_to, oldState.doc.content.size);
                   if (_from >= clampedOldTo) continue;
                   oldState.doc.nodesBetween(_from, clampedOldTo, function (node) {
-                    if (node.type !== _mentionSchema || !AGENT_USER_TYPES.has(node.attrs.userType)) {
+                    if (node.type !== _mentionSchema || !isAgentUserType(node.attrs.userType)) {
                       return true;
                     }
                     oldCount++;
@@ -422,15 +484,16 @@ export function createMentionPlugin(_ref2) {
             }
             var isNewInsertion = agentMentionId !== null && !resolvedFromFullDocFallback && (oldAgentMentionId !== agentMentionId || newCount > oldCount);
             var isPendingTypedAgentMentionInsertion = isNewInsertion && action === ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && typeof (params === null || params === void 0 ? void 0 : params.localId) === 'string';
-            var newInsertionCount = isNewInsertion ? ((_newPluginState$lastA2 = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA2 !== void 0 ? _newPluginState$lastA2 : 0) + 1 : undefined;
-            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetails.current) {
+            var newInsertionCount = isNewInsertion ? ((_newPluginState$lastA = newPluginState.lastAgentMentionInsertionCount) !== null && _newPluginState$lastA !== void 0 ? _newPluginState$lastA : 0) + 1 : undefined;
+            var pendingTypedAgentMentionDetailsForState = pendingTypedAgentMentionDetails;
+            if (isPendingTypedAgentMentionInsertion && pendingTypedAgentMentionDetailsForState) {
               var pendingTypedAgentMentionLocalId = params === null || params === void 0 ? void 0 : params.localId;
               newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
                 pendingTypedAgentMention: {
-                  id: pendingTypedAgentMentionDetails.current.id,
+                  id: pendingTypedAgentMentionDetailsForState.id,
                   localId: pendingTypedAgentMentionLocalId,
-                  nodeSize: pendingTypedAgentMentionDetails.current.nodeSize,
-                  pos: pendingTypedAgentMentionDetails.current.pos,
+                  nodeSize: pendingTypedAgentMentionDetailsForState.nodeSize,
+                  pos: pendingTypedAgentMentionDetailsForState.pos,
                   resetCount: 1
                 }
               });
@@ -458,6 +521,10 @@ export function createMentionPlugin(_ref2) {
             }
           }
         }
+        if (isAgentMentionsExperimentEnabled && tr.docChanged && tr.getMeta('replaceDocument') && hasTrackedAgentMentionState(newPluginState)) {
+          newPluginState = clearTrackedAgentMentionState(newPluginState);
+          hasPublicPluginStateChanged = true;
+        }
         if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && tr.docChanged) {
           newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
             pendingTypedAgentMention: getPendingTypedAgentMentionAfterDocChange(newState, tr, newPluginState.pendingTypedAgentMention, {
@@ -465,6 +532,27 @@ export function createMentionPlugin(_ref2) {
             })
           });
         }
+        // Typed agent mentions stay pending while the user is still editing around them,
+        // but leaving the mention's direct parent means they have moved on from that
+        // paragraph/block. Publish immediately in that case instead of waiting for the
+        // inactivity timer.
+        var shouldCheckPendingTypedAgentMentionParent = isLocalSelectionChange(tr, hasPositionChanged);
+        if (isAgentMentionsExperimentEnabled && newPluginState.pendingTypedAgentMention && action !== ACTIONS.SET_PENDING_TYPED_AGENT_MENTION && action !== ACTIONS.COMMIT_PENDING_TYPED_AGENT_MENTION && shouldCheckPendingTypedAgentMentionParent) {
+          var _pendingTypedAgentMention = newPluginState.pendingTypedAgentMention;
+          var pendingMentionDetails = getAgentMentionDetailsAtPos(newState, _pendingTypedAgentMention.pos, function (attrs) {
+            return attrs.localId === _pendingTypedAgentMention.localId;
+          });
+          if (!pendingMentionDetails) {
+            newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+              pendingTypedAgentMention: null
+            });
+          } else if (hasPendingMentionMovedToNewParent(oldState, tr, pluginState.pendingTypedAgentMention, pendingMentionDetails) || isSelectionOutsideDirectParent(newState, pendingMentionDetails)) {
+            var _commitResult = commitResolvedPendingTypedAgentMention(newPluginState, pendingMentionDetails);
+            newPluginState = _commitResult.pluginState;
+            hasPublicPluginStateChanged = hasPublicPluginStateChanged || _commitResult.hasPublicPluginStateChanged;
+          }
+        }
         if (hasPublicPluginStateChanged && isAgentMentionsExperimentEnabled) {
           pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }

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

@@ -44,31 +44,22 @@ export interface MentionsPluginOptions extends MentionPluginConfig {
  */
 export type MentionPluginOptions = MentionsPluginOptions;
 export type AgentMentionDetails = {
-    id: string;
     context: string | null;
+    id: string;
     nodeSize: number;
+    /**
+     * @internal ProseMirror position used for parent-boundary checks.
+     */
+    parentEnd: number;
     parentNodeType: string | null;
+    /**
+     * @internal ProseMirror position used for parent-boundary checks.
+     */
+    parentStart: number;
     pos: number;
 };
 export type MentionPluginState = {
     canInsertMention?: boolean;
-    /**
-     * @internal Tracks a typed agent mention while waiting for the platform-side
-     * ready-to-fire trigger. Consumers should continue to react only to
-     * lastInsertedAgentMention* fields.
-     */
-    pendingTypedAgentMention?: {
-        id: string;
-        localId: string;
-        nodeSize: number;
-        pos: number;
-        /**
-         * Generation value for the inactivity timer. This changes when local edits
-         * reset the pending mention window, so stale timer callbacks for the same
-         * localId cannot publish before the latest inactivity period has elapsed.
-         */
-        resetCount: number;
-    } | null;
     /**
      * Increments on each new agent mention insertion (including re-mentions of the same agent).
      * Used to trigger re-renders when the same agent is mentioned again.
@@ -91,6 +82,23 @@ export type MentionPluginState = {
     lastInsertedAgentMentionParentNodeType?: string | null;
     mentionProvider?: MentionProvider;
     mentions?: Array<MentionDescription>;
+    /**
+     * @internal Tracks a typed agent mention while waiting for the platform-side
+     * ready-to-fire trigger. Consumers should continue to react only to
+     * lastInsertedAgentMention* fields.
+     */
+    pendingTypedAgentMention?: {
+        id: string;
+        localId: string;
+        nodeSize: number;
+        pos: number;
+        /**
+         * Generation value for the inactivity timer. This changes when local edits
+         * reset the pending mention window, so stale timer callbacks for the same
+         * localId cannot publish before the latest inactivity period has elapsed.
+         */
+        resetCount: number;
+    } | null;
 };
 export type FireElementsChannelEvent = (payload: AnalyticsEventPayload, channel?: string) => void;
 export type MentionSharedState = MentionPluginState & {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "14.1.1",
+	"version": "14.2.0",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,7 +21,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^55.0.0",
+		"@atlaskit/adf-schema": "^55.2.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^12.0.0",
 		"@atlaskit/editor-plugin-base": "^13.0.0",
@@ -32,18 +32,18 @@
 		"@atlaskit/icon": "^36.0.0",
 		"@atlaskit/insm": "^1.0.0",
 		"@atlaskit/link": "^4.0.0",
-		"@atlaskit/mention": "^27.0.0",
+		"@atlaskit/mention": "^27.1.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/popper": "^8.0.0",
 		"@atlaskit/portal": "^6.0.0",
 		"@atlaskit/primitives": "^20.0.0",
-		"@atlaskit/profilecard": "^26.0.0",
+		"@atlaskit/profilecard": "^26.1.0",
 		"@atlaskit/teams-app-config": "^2.0.0",
 		"@atlaskit/theme": "^26.0.0",
-		"@atlaskit/tmp-editor-statsig": "^106.0.0",
+		"@atlaskit/tmp-editor-statsig": "^107.1.0",
 		"@atlaskit/tokens": "^14.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
-		"@atlaskit/user-picker": "^13.0.0",
+		"@atlaskit/user-picker": "^13.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"bind-event-listener": "^3.0.0",
@@ -52,7 +52,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.2.0",
+		"@atlaskit/editor-common": "^116.3.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"