@atlaskit/editor-core 187.6.0 → 187.6.10

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

@@ -3,6 +3,7 @@ import { SLI_EVENT_TYPE, SMART_EVENT_TYPE, buildSliPayload } from '@atlaskit/men
 import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { MentionNodeView } from '../nodeviews/mention';
 import { mentionPluginKey } from './key';
+import { canMentionBeCreatedInRange } from './utils';
 const ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER',
   SET_CONTEXT: 'SET_CONTEXT'
@@ -39,10 +40,13 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
   return new SafePlugin({
     key: mentionPluginKey,
     state: {
-      init() {
-        return {};
+      init(_, state) {
+        const canInsertMention = canMentionBeCreatedInRange(state.selection.from, state.selection.to)(state);
+        return {
+          canInsertMention
+        };
       },
-      apply(tr, pluginState) {
+      apply(tr, pluginState, oldState, newState) {
         const {
           action,
           params
@@ -50,22 +54,34 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
           action: null,
           params: null
         };
+        let hasNewPluginState = false;
         let newPluginState = pluginState;
+        const hasPositionChanged = oldState.selection.from !== newState.selection.from || oldState.selection.to !== newState.selection.to;
+        if (tr.docChanged || tr.selectionSet && hasPositionChanged) {
+          newPluginState = {
+            ...pluginState,
+            canInsertMention: canMentionBeCreatedInRange(newState.selection.from, newState.selection.to)(newState)
+          };
+          hasNewPluginState = true;
+        }
         switch (action) {
           case ACTIONS.SET_PROVIDER:
             newPluginState = {
-              ...pluginState,
+              ...newPluginState,
               mentionProvider: params.provider
             };
-            pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
-            return newPluginState;
+            hasNewPluginState = true;
+            break;
           case ACTIONS.SET_CONTEXT:
             newPluginState = {
-              ...pluginState,
+              ...newPluginState,
               contextIdentifierProvider: params.context
             };
-            pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
-            return newPluginState;
+            hasNewPluginState = true;
+            break;
+        }
+        if (hasNewPluginState) {
+          pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }
         return newPluginState;
       }

package/dist/es2019/plugins/mentions/pm-plugins/utils.js

@@ -1,4 +1,14 @@
 import { mentionPluginKey } from './key';
+import { canInsert } from 'prosemirror-utils';
 export function getMentionPluginState(state) {
   return mentionPluginKey.getState(state);
-}
+}
+export const canMentionBeCreatedInRange = (from, to) => state => {
+  const $from = state.doc.resolve(from);
+  const $to = state.doc.resolve(to);
+  const mention = state.schema.nodes.mention.createChecked();
+  if ($from.parent === $to.parent && canInsert($from, mention)) {
+    return true;
+  }
+  return false;
+};

package/dist/es2019/ui/Appearance/FullPage/MainToolbar.js

@@ -1,6 +1,6 @@
 import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-import { akEditorMenuZIndex, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, akEditorMobileMaxWidth } from '@atlaskit/editor-shared-styles';
+import { akEditorFloatingDialogZIndex, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, akEditorMobileMaxWidth } from '@atlaskit/editor-shared-styles';
 export const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
 const toolbarLineHeight = 56;
 
@@ -20,7 +20,7 @@ const mainToolbar = css`
   align-items: center;
   box-shadow: none;
   transition: box-shadow 200ms ${akEditorSwoopCubicBezier};
-  z-index: ${akEditorMenuZIndex};
+  z-index: ${akEditorFloatingDialogZIndex};
   display: flex;
   height: ${toolbarLineHeight}px;
   flex-shrink: 0;

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.6.0";
+export const version = "187.6.10";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.6.0",
+	"version": "187.6.10",
 	"sideEffects": false
 }

package/dist/esm/plugins/expand/commands.js

@@ -8,6 +8,7 @@ import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
 import { findExpand } from './utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { createWrapSelectionTransaction } from '../block-type/commands/block-type';
+import { safeInsert } from 'prosemirror-utils';
 export var setExpandRef = function setExpandRef(ref) {
   return createCommand({
     type: 'SET_EXPAND_REF',
@@ -110,7 +111,7 @@ export var insertExpand = function insertExpand(state, dispatch) {
   if (!expandNode) {
     return false;
   }
-  var tr = createWrapSelectionTransaction({
+  var tr = state.selection.empty ? safeInsert(expandNode)(state.tr).scrollIntoView() : createWrapSelectionTransaction({
     state: state,
     type: expandNode.type
   });

package/dist/esm/plugins/expand/index.js

@@ -59,7 +59,7 @@ var expandPlugin = function expandPlugin() {
             if (!node) {
               return false;
             }
-            var tr = createWrapSelectionTransaction({
+            var tr = state.selection.empty ? insert(node) : createWrapSelectionTransaction({
               state: state,
               type: node.type
             });

package/dist/esm/plugins/insert-block/index.js

@@ -3,7 +3,6 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { pluginKey as blockTypeStateKey } from '../block-type/pm-plugins/main';
 import { stateKey as mediaStateKey } from '../media/pm-plugins/plugin-key';
 import { isTypeAheadAllowed } from '../type-ahead/utils';
-import { mentionPluginKey } from '../mentions/pm-plugins/key';
 import { pluginKey as layoutStateKey } from '../layout';
 import { insertMacroFromMacroBrowser } from '../macro';
 import { emojiPluginKey } from '../emoji';
@@ -65,15 +64,13 @@ var insertBlockPlugin = function insertBlockPlugin() {
             typeAheadState: typeAheadPluginKey,
             blockTypeState: blockTypeStateKey,
             mediaState: mediaStateKey,
-            mentionState: mentionPluginKey,
             macroState: macroStateKey,
             emojiState: emojiPluginKey,
             placeholderTextState: placeholderTextStateKey,
             layoutState: layoutStateKey
           },
           render: function render(_ref2) {
-            var mentionState = _ref2.mentionState,
-              blockTypeState = _ref2.blockTypeState,
+            var blockTypeState = _ref2.blockTypeState,
               mediaState = _ref2.mediaState,
               _ref2$macroState = _ref2.macroState,
               macroState = _ref2$macroState === void 0 ? {} : _ref2$macroState,
@@ -94,7 +91,6 @@ var insertBlockPlugin = function insertBlockPlugin() {
               isToolbarReducedSpacing: isToolbarReducedSpacing,
               isLastItem: isLastItem,
               featureFlags: featureFlags,
-              mentionState: mentionState,
               blockTypeState: blockTypeState,
               mediaState: mediaState,
               macroState: macroState,
@@ -131,7 +127,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     providers = _ref3.providers,
     pluginInjectionApi = _ref3.pluginInjectionApi,
     options = _ref3.options,
-    mentionState = _ref3.mentionState,
     blockTypeState = _ref3.blockTypeState,
     mediaState = _ref3.mediaState,
     macroState = _ref3.macroState,
@@ -140,10 +135,11 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     layoutState = _ref3.layoutState,
     featureFlags = _ref3.featureFlags;
   var buttons = toolbarSizeToButtons(toolbarSize);
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload']),
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention']),
     dateState = _useSharedPluginState.dateState,
     hyperlinkState = _useSharedPluginState.hyperlinkState,
-    imageUploadState = _useSharedPluginState.imageUploadState;
+    imageUploadState = _useSharedPluginState.imageUploadState,
+    mentionState = _useSharedPluginState.mentionState;
   return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
     pluginInjectionApi: pluginInjectionApi,
     buttons: buttons,
@@ -154,6 +150,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     tableSupported: !!editorView.state.schema.nodes.table,
     actionSupported: !!editorView.state.schema.nodes.taskItem,
     mentionsSupported: !!(mentionState && mentionState.mentionProvider),
+    mentionsDisabled: !!(mentionState && !mentionState.canInsertMention),
     decisionSupported: !!editorView.state.schema.nodes.decisionItem,
     dateEnabled: !!dateState,
     placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/create-items.js

@@ -37,6 +37,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     imageUploadSupported = config.imageUploadSupported,
     imageUploadEnabled = config.imageUploadEnabled,
     mentionsSupported = config.mentionsSupported,
+    mentionsDisabled = config.mentionsDisabled,
     availableWrapperBlockTypes = config.availableWrapperBlockTypes,
     actionSupported = config.actionSupported,
     decisionSupported = config.decisionSupported,
@@ -89,7 +90,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push(mention({
       content: formatMessage(messages.mention),
       tooltipDescription: formatMessage(messages.mentionDescription),
-      disabled: !isTypeAheadAllowed,
+      disabled: !isTypeAheadAllowed || !!mentionsDisabled,
       'aria-haspopup': 'listbox'
     }));
   }

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -176,21 +176,28 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       return true;
     });
     _defineProperty(_assertThisInitialized(_this), "insertMention", function (inputMethod) {
-      var editorView = _this.props.editorView;
+      var _pluginInjectionApi$d3;
+      var _this$props2 = _this.props,
+        editorView = _this$props2.editorView,
+        pluginInjectionApi = _this$props2.pluginInjectionApi;
       if (!editorView) {
         return true;
       }
+      var pluginState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.mention) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.sharedState.currentState();
+      if (pluginState && pluginState.canInsertMention === false) {
+        return false;
+      }
       createTypeAheadTools(editorView).openMention(inputMethod);
       return true;
     });
     _defineProperty(_assertThisInitialized(_this), "insertTable", function (inputMethod) {
-      var _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _pluginInjectionApi$d6;
-      var _this$props2 = _this.props,
-        pluginInjectionApi = _this$props2.pluginInjectionApi,
-        editorView = _this$props2.editorView;
+      var _pluginInjectionApi$d4, _pluginInjectionApi$d5, _pluginInjectionApi$d6, _pluginInjectionApi$d7;
+      var _this$props3 = _this.props,
+        pluginInjectionApi = _this$props3.pluginInjectionApi,
+        editorView = _this$props3.editorView;
       var state = editorView.state,
         dispatch = editorView.dispatch;
-      return (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies.table) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = (_pluginInjectionApi$d6 = _pluginInjectionApi$d4.actions).insertTable) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.call(_pluginInjectionApi$d6, {
+      return (_pluginInjectionApi$d4 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies.table) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : (_pluginInjectionApi$d6 = (_pluginInjectionApi$d7 = _pluginInjectionApi$d5.actions).insertTable) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.call(_pluginInjectionApi$d7, {
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: ACTION_SUBJECT_ID.TABLE,
@@ -198,7 +205,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           inputMethod: inputMethod
         },
         eventType: EVENT_TYPE.TRACK
-      })(state, dispatch)) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : false;
+      })(state, dispatch)) !== null && _pluginInjectionApi$d4 !== void 0 ? _pluginInjectionApi$d4 : false;
     });
     _defineProperty(_assertThisInitialized(_this), "createDate", function (inputMethod) {
       var editorView = _this.props.editorView;
@@ -221,9 +228,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       return true;
     });
     _defineProperty(_assertThisInitialized(_this), "openMediaPicker", function (inputMethod) {
-      var _this$props3 = _this.props,
-        onShowMediaPicker = _this$props3.onShowMediaPicker,
-        dispatchAnalyticsEvent = _this$props3.dispatchAnalyticsEvent;
+      var _this$props4 = _this.props,
+        onShowMediaPicker = _this$props4.onShowMediaPicker,
+        dispatchAnalyticsEvent = _this$props4.dispatchAnalyticsEvent;
       if (onShowMediaPicker) {
         onShowMediaPicker();
         if (dispatchAnalyticsEvent) {
@@ -250,11 +257,11 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       };
     });
     _defineProperty(_assertThisInitialized(_this), "insertHorizontalRule", function (inputMethod) {
-      var _this$props4 = _this.props,
-        _this$props4$editorVi = _this$props4.editorView,
-        state = _this$props4$editorVi.state,
-        dispatch = _this$props4$editorVi.dispatch,
-        featureFlags = _this$props4.featureFlags;
+      var _this$props5 = _this.props,
+        _this$props5$editorVi = _this$props5.editorView,
+        state = _this$props5$editorVi.state,
+        dispatch = _this$props5$editorVi.dispatch,
+        featureFlags = _this$props5.featureFlags;
       return insertHorizontalRule(inputMethod, featureFlags)(state, dispatch);
     });
     _defineProperty(_assertThisInitialized(_this), "insertExpand", function () {
@@ -265,9 +272,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     _defineProperty(_assertThisInitialized(_this), "insertBlockType", function (itemName) {
       return function () {
-        var _this$props5 = _this.props,
-          editorView = _this$props5.editorView,
-          onInsertBlockType = _this$props5.onInsertBlockType;
+        var _this$props6 = _this.props,
+          editorView = _this$props6.editorView,
+          onInsertBlockType = _this$props6.onInsertBlockType;
         var state = editorView.state,
           dispatch = editorView.dispatch;
         onInsertBlockType(itemName)(state, dispatch);
@@ -286,11 +293,11 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "onItemActivated", function (_ref2) {
       var item = _ref2.item,
         inputMethod = _ref2.inputMethod;
-      var _this$props6 = _this.props,
-        editorView = _this$props6.editorView,
-        editorActions = _this$props6.editorActions,
-        handleImageUpload = _this$props6.handleImageUpload,
-        expandEnabled = _this$props6.expandEnabled;
+      var _this$props7 = _this.props,
+        editorView = _this$props7.editorView,
+        editorActions = _this$props7.editorActions,
+        handleImageUpload = _this$props7.handleImageUpload,
+        expandEnabled = _this$props7.expandEnabled;
 
       // need to do this before inserting nodes so scrollIntoView works properly
       if (!editorView.hasFocus()) {
@@ -406,12 +413,12 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     key: "renderPopup",
     value: function renderPopup() {
       var emojiPickerOpen = this.state.emojiPickerOpen;
-      var _this$props7 = this.props,
-        popupsMountPoint = _this$props7.popupsMountPoint,
-        popupsBoundariesElement = _this$props7.popupsBoundariesElement,
-        popupsScrollableElement = _this$props7.popupsScrollableElement,
-        emojiProvider = _this$props7.emojiProvider,
-        replacePlusMenuWithElementBrowser = _this$props7.replacePlusMenuWithElementBrowser;
+      var _this$props8 = this.props,
+        popupsMountPoint = _this$props8.popupsMountPoint,
+        popupsBoundariesElement = _this$props8.popupsBoundariesElement,
+        popupsScrollableElement = _this$props8.popupsScrollableElement,
+        emojiProvider = _this$props8.emojiProvider,
+        replacePlusMenuWithElementBrowser = _this$props8.replacePlusMenuWithElementBrowser;
       var dropdownEmoji = this.state.dropdownItems.some(function (_ref4) {
         var name = _ref4.value.name;
         return name === 'emoji';
@@ -447,9 +454,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         buttons = _this$state.buttons,
         dropdownItems = _this$state.dropdownItems,
         emojiPickerOpen = _this$state.emojiPickerOpen;
-      var _this$props8 = this.props,
-        isDisabled = _this$props8.isDisabled,
-        isReducedSpacing = _this$props8.isReducedSpacing;
+      var _this$props9 = this.props,
+        isDisabled = _this$props9.isDisabled,
+        isReducedSpacing = _this$props9.isReducedSpacing;
       if (buttons.length === 0 && dropdownItems.length === 0) {
         return null;
       }
@@ -509,6 +516,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           imageUploadSupported: props.imageUploadSupported,
           imageUploadEnabled: props.imageUploadEnabled,
           mentionsSupported: props.mentionsSupported,
+          mentionsDisabled: props.mentionsDisabled,
           actionSupported: props.actionSupported,
           decisionSupported: props.decisionSupported,
           linkSupported: props.linkSupported,

package/dist/esm/plugins/mentions/index.js

@@ -13,6 +13,12 @@ import { createTypeAheadConfig } from './type-ahead';
 import { mentionPluginKey } from './pm-plugins/key';
 import { createMentionPlugin } from './pm-plugins/main';
 export { mentionPluginKey };
+var getSharedState = function getSharedState(editorState) {
+  if (!editorState) {
+    return undefined;
+  }
+  return mentionPluginKey.getState(editorState);
+};
 var mentionsPlugin = function mentionsPlugin(options, api) {
   var sessionId = uuid();
   var fireEvent = function fireEvent(payload) {
@@ -67,6 +73,7 @@ var mentionsPlugin = function mentionsPlugin(options, api) {
         }
       });
     },
+    getSharedState: getSharedState,
     pluginsOptions: {
       quickInsert: function quickInsert(_ref4) {
         var formatMessage = _ref4.formatMessage;
@@ -83,6 +90,10 @@ var mentionsPlugin = function mentionsPlugin(options, api) {
           action: function action(insert, state) {
             var _api$dependencies$ana3;
             var tr = insert(undefined);
+            var pluginState = getSharedState(state);
+            if (pluginState && pluginState.canInsertMention === false) {
+              return false;
+            }
             openTypeAheadAtCursor({
               triggerHandler: typeAhead,
               inputMethod: INPUT_METHOD.QUICK_INSERT

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

@@ -6,6 +6,7 @@ import { SLI_EVENT_TYPE, SMART_EVENT_TYPE, buildSliPayload } from '@atlaskit/men
 import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { MentionNodeView } from '../nodeviews/mention';
 import { mentionPluginKey } from './key';
+import { canMentionBeCreatedInRange } from './utils';
 var ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER',
   SET_CONTEXT: 'SET_CONTEXT'
@@ -46,30 +47,44 @@ export function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
   return new SafePlugin({
     key: mentionPluginKey,
     state: {
-      init: function init() {
-        return {};
+      init: function init(_, state) {
+        var canInsertMention = canMentionBeCreatedInRange(state.selection.from, state.selection.to)(state);
+        return {
+          canInsertMention: canInsertMention
+        };
       },
-      apply: function apply(tr, pluginState) {
+      apply: function apply(tr, pluginState, oldState, newState) {
         var _ref = tr.getMeta(mentionPluginKey) || {
             action: null,
             params: null
           },
           action = _ref.action,
           params = _ref.params;
+        var hasNewPluginState = false;
         var newPluginState = pluginState;
+        var hasPositionChanged = oldState.selection.from !== newState.selection.from || oldState.selection.to !== newState.selection.to;
+        if (tr.docChanged || tr.selectionSet && hasPositionChanged) {
+          newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
+            canInsertMention: canMentionBeCreatedInRange(newState.selection.from, newState.selection.to)(newState)
+          });
+          hasNewPluginState = true;
+        }
         switch (action) {
           case ACTIONS.SET_PROVIDER:
-            newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
+            newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
               mentionProvider: params.provider
             });
-            pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
-            return newPluginState;
+            hasNewPluginState = true;
+            break;
           case ACTIONS.SET_CONTEXT:
-            newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
+            newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
               contextIdentifierProvider: params.context
             });
-            pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
-            return newPluginState;
+            hasNewPluginState = true;
+            break;
+        }
+        if (hasNewPluginState) {
+          pmPluginFactoryParams.dispatch(mentionPluginKey, newPluginState);
         }
         return newPluginState;
       }

package/dist/esm/plugins/mentions/pm-plugins/utils.js

@@ -1,4 +1,16 @@
 import { mentionPluginKey } from './key';
+import { canInsert } from 'prosemirror-utils';
 export function getMentionPluginState(state) {
   return mentionPluginKey.getState(state);
-}
+}
+export var canMentionBeCreatedInRange = function canMentionBeCreatedInRange(from, to) {
+  return function (state) {
+    var $from = state.doc.resolve(from);
+    var $to = state.doc.resolve(to);
+    var mention = state.schema.nodes.mention.createChecked();
+    if ($from.parent === $to.parent && canInsert($from, mention)) {
+      return true;
+    }
+    return false;
+  };
+};

package/dist/esm/ui/Appearance/FullPage/MainToolbar.js

@@ -2,14 +2,14 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-import { akEditorMenuZIndex, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, akEditorMobileMaxWidth } from '@atlaskit/editor-shared-styles';
+import { akEditorFloatingDialogZIndex, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, akEditorMobileMaxWidth } from '@atlaskit/editor-shared-styles';
 export var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
 var toolbarLineHeight = 56;
 
 // box-shadow is overriden by the mainToolbar
 var mainToolbarWithKeyline = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  box-shadow: 0 ", "px 0 0\n    ", ";\n"])), akEditorToolbarKeylineHeight, "var(--ds-border, ".concat(N30, ")"));
 var mainToolbarTwoLineStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  @media (max-width: ", "px) {\n    flex-wrap: wrap;\n    height: calc(", "px * 2);\n  }\n"])), MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, toolbarLineHeight);
-var mainToolbar = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  position: relative;\n  align-items: center;\n  box-shadow: none;\n  transition: box-shadow 200ms ", ";\n  z-index: ", ";\n  display: flex;\n  height: ", "px;\n  flex-shrink: 0;\n  // TODO: https://product-fabric.atlassian.net/browse/DSP-4456\n  background-color: ", ";\n\n  & object {\n    height: 0 !important;\n  }\n\n  @media (max-width: ", "px) {\n    display: grid;\n    height: calc(", "px * 2);\n  }\n"])), akEditorSwoopCubicBezier, akEditorMenuZIndex, toolbarLineHeight, "var(--ds-surface, white)", akEditorMobileMaxWidth, toolbarLineHeight);
+var mainToolbar = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  position: relative;\n  align-items: center;\n  box-shadow: none;\n  transition: box-shadow 200ms ", ";\n  z-index: ", ";\n  display: flex;\n  height: ", "px;\n  flex-shrink: 0;\n  // TODO: https://product-fabric.atlassian.net/browse/DSP-4456\n  background-color: ", ";\n\n  & object {\n    height: 0 !important;\n  }\n\n  @media (max-width: ", "px) {\n    display: grid;\n    height: calc(", "px * 2);\n  }\n"])), akEditorSwoopCubicBezier, akEditorFloatingDialogZIndex, toolbarLineHeight, "var(--ds-surface, white)", akEditorMobileMaxWidth, toolbarLineHeight);
 export var mainToolbarStyle = function mainToolbarStyle(showKeyline, twoLineEditorToolbar) {
   return [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
 };

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.6.0";
+export var version = "187.6.10";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.6.0",
+	"version": "187.6.10",
 	"sideEffects": false
 }

package/dist/types/plugins/insert-block/index.d.ts

@@ -1,10 +1,11 @@
-import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { ImageUploadPlugin } from '../image-upload';
 import type datePlugin from '../date';
-import { tablesPlugin } from '@atlaskit/editor-plugin-table';
+import type { tablesPlugin } from '@atlaskit/editor-plugin-table';
 import type { hyperlinkPlugin } from '@atlaskit/editor-plugin-hyperlink';
 import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type mentionsPlugin from '../mentions';
 export interface InsertBlockOptions {
     allowTables?: boolean;
     allowExpand?: boolean;
@@ -22,7 +23,8 @@ declare const insertBlockPlugin: NextEditorPlugin<'insertBlock', {
         OptionalPlugin<typeof hyperlinkPlugin>,
         OptionalPlugin<typeof datePlugin>,
         OptionalPlugin<typeof analyticsPlugin>,
-        OptionalPlugin<ImageUploadPlugin>
+        OptionalPlugin<ImageUploadPlugin>,
+        OptionalPlugin<typeof mentionsPlugin>
     ];
 }>;
 export default insertBlockPlugin;

package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/create-items.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
-import { WrappedComponentProps } from 'react-intl-next';
-import { Schema } from 'prosemirror-model';
-import { EmojiProvider } from '@atlaskit/emoji/resource';
-import { BlockType } from '../../../block-type/types';
-import { MenuItem } from '../../../../ui/DropdownMenu/types';
-import { MacroProvider } from '../../../macro';
+import type { WrappedComponentProps } from 'react-intl-next';
+import type { Schema } from 'prosemirror-model';
+import type { EmojiProvider } from '@atlaskit/emoji/resource';
+import type { BlockType } from '../../../block-type/types';
+import type { MenuItem } from '../../../../ui/DropdownMenu/types';
+import type { MacroProvider } from '../../../macro';
 export interface CreateItemsConfig {
     isTypeAheadAllowed?: boolean;
     tableSupported?: boolean;
@@ -13,6 +13,7 @@ export interface CreateItemsConfig {
     imageUploadSupported?: boolean;
     imageUploadEnabled?: boolean;
     mentionsSupported?: boolean;
+    mentionsDisabled?: boolean;
     availableWrapperBlockTypes?: BlockType[];
     actionSupported?: boolean;
     decisionSupported?: boolean;

package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/types.d.ts

@@ -1,12 +1,12 @@
-import { INPUT_METHOD, DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import { EditorView } from 'prosemirror-view';
-import { EditorActionsOptions as EditorActions, FeatureFlags, ExtractInjectionAPI, ImageUploadPluginReferenceEvent, Command } from '@atlaskit/editor-common/types';
-import { EmojiProvider } from '@atlaskit/emoji';
-import { BlockType } from '../../../block-type/types';
-import { MacroProvider } from '@atlaskit/editor-common/provider-factory';
-import { MenuItem } from '../../../../ui/DropdownMenu/types';
-import { Node as PMNode } from 'prosemirror-model';
-import { BlockMenuItem } from './create-items';
+import type { INPUT_METHOD, DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { EditorView } from 'prosemirror-view';
+import type { EditorActionsOptions as EditorActions, FeatureFlags, ExtractInjectionAPI, ImageUploadPluginReferenceEvent, Command } from '@atlaskit/editor-common/types';
+import type { EmojiProvider } from '@atlaskit/emoji';
+import type { BlockType } from '../../../block-type/types';
+import type { MacroProvider } from '@atlaskit/editor-common/provider-factory';
+import type { MenuItem } from '../../../../ui/DropdownMenu/types';
+import type { Node as PMNode } from 'prosemirror-model';
+import type { BlockMenuItem } from './create-items';
 import type insertBlockPlugin from '../../index';
 export interface Props {
     buttons: number;
@@ -49,6 +49,7 @@ export interface Props {
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
     featureFlags: FeatureFlags;
     pluginInjectionApi?: ExtractInjectionAPI<typeof insertBlockPlugin>;
+    mentionsDisabled?: boolean;
 }
 export interface State {
     isPlusMenuOpen: boolean;

package/dist/types/plugins/mentions/index.d.ts

@@ -1,10 +1,11 @@
-import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import { MentionPluginOptions } from './types';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { MentionPluginOptions, MentionPluginState } from './types';
 import { mentionPluginKey } from './pm-plugins/key';
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 export { mentionPluginKey };
 declare const mentionsPlugin: NextEditorPlugin<'mention', {
     pluginConfiguration: MentionPluginOptions | undefined;
     dependencies: [OptionalPlugin<typeof analyticsPlugin>];
+    sharedState: MentionPluginState | undefined;
 }>;
 export default mentionsPlugin;

package/dist/types/plugins/mentions/pm-plugins/utils.d.ts

@@ -1,3 +1,4 @@
-import { EditorState } from 'prosemirror-state';
-import { MentionPluginState } from '../types';
+import type { EditorState } from 'prosemirror-state';
+import type { MentionPluginState } from '../types';
 export declare function getMentionPluginState(state: EditorState): MentionPluginState;
+export declare const canMentionBeCreatedInRange: (from: number, to: number) => (state: EditorState) => boolean;

package/dist/types/plugins/mentions/types.d.ts

@@ -19,5 +19,6 @@ export type MentionPluginState = {
     mentionProvider?: MentionProvider;
     contextIdentifierProvider?: ContextIdentifierProvider;
     mentions?: Array<MentionDescription>;
+    canInsertMention?: boolean;
 };
 export type FireElementsChannelEvent = <T extends AnalyticsEventPayload>(payload: T) => void;