@atlaskit/editor-core 187.6.0 → 187.6.10

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 187.6.10
+
+### Patch Changes
+
+- [`fa2209eee80`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fa2209eee80) - [ux] Fixes z-index full page editor main toolbar
+- [`9b64591559a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9b64591559a) - [ux] ED-19163 Expand should only wrap selected text if added inline
+
+## 187.6.1
+
+### Patch Changes
+
+- [`65f1e2bf9fc`](https://bitbucket.org/atlassian/atlassian-frontend/commits/65f1e2bf9fc) - [ux] ED-18212 Disable toolbar mention when cursor is inside a codeblock
+
 ## 187.6.0
 
 ### Minor Changes

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

@@ -13,6 +13,7 @@ var _gapCursorSelection = require("../selection/gap-cursor-selection");
 var _utils2 = require("./utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var _blockType = require("../block-type/commands/block-type");
+var _prosemirrorUtils = require("prosemirror-utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var setExpandRef = function setExpandRef(ref) {
@@ -123,7 +124,7 @@ var insertExpand = function insertExpand(state, dispatch) {
   if (!expandNode) {
     return false;
   }
-  var tr = (0, _blockType.createWrapSelectionTransaction)({
+  var tr = state.selection.empty ? (0, _prosemirrorUtils.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _blockType.createWrapSelectionTransaction)({
     state: state,
     type: expandNode.type
   });

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

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

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

@@ -10,13 +10,12 @@ var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _main = require("../block-type/pm-plugins/main");
 var _pluginKey = require("../media/pm-plugins/plugin-key");
 var _utils = require("../type-ahead/utils");
-var _key = require("../mentions/pm-plugins/key");
 var _layout = require("../layout");
 var _macro = require("../macro");
 var _emoji = require("../emoji");
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 var _ToolbarInsertBlock = _interopRequireDefault(require("./ui/ToolbarInsertBlock"));
-var _key2 = require("../type-ahead/pm-plugins/key");
+var _key = require("../type-ahead/pm-plugins/key");
 var _commands = require("../block-type/commands");
 var _analytics = require("../analytics");
 var _pluginKey2 = require("../placeholder-text/plugin-key");
@@ -69,18 +68,16 @@ var insertBlockPlugin = function insertBlockPlugin() {
         // `ToolbarInsertBlockWithInjectionApi` and remove `WithPluginState`
         return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
           plugins: {
-            typeAheadState: _key2.pluginKey,
+            typeAheadState: _key.pluginKey,
             blockTypeState: _main.pluginKey,
             mediaState: _pluginKey.stateKey,
-            mentionState: _key.mentionPluginKey,
             macroState: _pluginKey3.pluginKey,
             emojiState: _emoji.emojiPluginKey,
             placeholderTextState: _pluginKey2.pluginKey,
             layoutState: _layout.pluginKey
           },
           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,
@@ -101,7 +98,6 @@ var insertBlockPlugin = function insertBlockPlugin() {
               isToolbarReducedSpacing: isToolbarReducedSpacing,
               isLastItem: isLastItem,
               featureFlags: featureFlags,
-              mentionState: mentionState,
               blockTypeState: blockTypeState,
               mediaState: mediaState,
               macroState: macroState,
@@ -138,7 +134,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,
@@ -147,10 +142,11 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     layoutState = _ref3.layoutState,
     featureFlags = _ref3.featureFlags;
   var buttons = toolbarSizeToButtons(toolbarSize);
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload']),
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention']),
     dateState = _useSharedPluginState.dateState,
     hyperlinkState = _useSharedPluginState.hyperlinkState,
-    imageUploadState = _useSharedPluginState.imageUploadState;
+    imageUploadState = _useSharedPluginState.imageUploadState,
+    mentionState = _useSharedPluginState.mentionState;
   return /*#__PURE__*/_react.default.createElement(_ToolbarInsertBlock.default, {
     pluginInjectionApi: pluginInjectionApi,
     buttons: buttons,
@@ -161,6 +157,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/cjs/plugins/insert-block/ui/ToolbarInsertBlock/create-items.js

@@ -44,6 +44,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,
@@ -96,7 +97,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push((0, _item.mention)({
       content: formatMessage(_messages.messages.mention),
       tooltipDescription: formatMessage(_messages.messages.mentionDescription),
-      disabled: !isTypeAheadAllowed,
+      disabled: !isTypeAheadAllowed || !!mentionsDisabled,
       'aria-haspopup': 'listbox'
     }));
   }

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

@@ -181,21 +181,28 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
+      }
       (0, _api.createTypeAheadTools)(editorView).openMention(inputMethod);
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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: _analytics.ACTION.INSERTED,
         actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.TABLE,
@@ -203,7 +210,7 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           inputMethod: inputMethod
         },
         eventType: _analytics.EVENT_TYPE.TRACK
-      })(state, dispatch)) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : false;
+      })(state, dispatch)) !== null && _pluginInjectionApi$d4 !== void 0 ? _pluginInjectionApi$d4 : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createDate", function (inputMethod) {
       var editorView = _this.props.editorView;
@@ -226,9 +233,9 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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) {
@@ -255,11 +262,11 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       };
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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 (0, _commands4.insertHorizontalRule)(inputMethod, featureFlags)(state, dispatch);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertExpand", function () {
@@ -270,9 +277,9 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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);
@@ -291,11 +298,11 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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()) {
@@ -411,12 +418,12 @@ 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';
@@ -452,9 +459,9 @@ 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;
       }
@@ -514,6 +521,7 @@ 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/cjs/plugins/mentions/index.js

@@ -25,6 +25,12 @@ var _openTypeaheadAtCursor = require("../type-ahead/transforms/open-typeahead-at
 var _typeAhead = require("./type-ahead");
 var _key = require("./pm-plugins/key");
 var _main = require("./pm-plugins/main");
+var getSharedState = function getSharedState(editorState) {
+  if (!editorState) {
+    return undefined;
+  }
+  return _key.mentionPluginKey.getState(editorState);
+};
 var mentionsPlugin = function mentionsPlugin(options, api) {
   var sessionId = (0, _uuid.default)();
   var fireEvent = function fireEvent(payload) {
@@ -79,6 +85,7 @@ var mentionsPlugin = function mentionsPlugin(options, api) {
         }
       });
     },
+    getSharedState: getSharedState,
     pluginsOptions: {
       quickInsert: function quickInsert(_ref4) {
         var formatMessage = _ref4.formatMessage;
@@ -95,6 +102,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;
+            }
             (0, _openTypeaheadAtCursor.openTypeAheadAtCursor)({
               triggerHandler: typeAhead,
               inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT

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

@@ -12,6 +12,7 @@ var _resource = require("@atlaskit/mention/resource");
 var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
 var _mention = require("../nodeviews/mention");
 var _key = require("./key");
+var _utils = require("./utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var ACTIONS = {
@@ -55,30 +56,44 @@ function createMentionPlugin(pmPluginFactoryParams, fireEvent, options) {
   return new _safePlugin.SafePlugin({
     key: _key.mentionPluginKey,
     state: {
-      init: function init() {
-        return {};
+      init: function init(_, state) {
+        var canInsertMention = (0, _utils.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(_key.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: (0, _utils.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(_key.mentionPluginKey, newPluginState);
-            return newPluginState;
+            hasNewPluginState = true;
+            break;
           case ACTIONS.SET_CONTEXT:
-            newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
+            newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
               contextIdentifierProvider: params.context
             });
-            pmPluginFactoryParams.dispatch(_key.mentionPluginKey, newPluginState);
-            return newPluginState;
+            hasNewPluginState = true;
+            break;
+        }
+        if (hasNewPluginState) {
+          pmPluginFactoryParams.dispatch(_key.mentionPluginKey, newPluginState);
         }
         return newPluginState;
       }

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

@@ -3,8 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.canMentionBeCreatedInRange = void 0;
 exports.getMentionPluginState = getMentionPluginState;
 var _key = require("./key");
+var _prosemirrorUtils = require("prosemirror-utils");
 function getMentionPluginState(state) {
   return _key.mentionPluginKey.getState(state);
-}
+}
+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 && (0, _prosemirrorUtils.canInsert)($from, mention)) {
+      return true;
+    }
+    return false;
+  };
+};
+exports.canMentionBeCreatedInRange = canMentionBeCreatedInRange;

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

@@ -17,7 +17,7 @@ var toolbarLineHeight = 56;
 // box-shadow is overriden by the mainToolbar
 var mainToolbarWithKeyline = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  box-shadow: 0 ", "px 0 0\n    ", ";\n"])), _editorSharedStyles.akEditorToolbarKeylineHeight, "var(--ds-border, ".concat(_colors.N30, ")"));
 var mainToolbarTwoLineStyle = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  @media (max-width: ", "px) {\n    flex-wrap: wrap;\n    height: calc(", "px * 2);\n  }\n"])), MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, toolbarLineHeight);
-var mainToolbar = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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"])), _editorSharedStyles.akEditorSwoopCubicBezier, _editorSharedStyles.akEditorMenuZIndex, toolbarLineHeight, "var(--ds-surface, white)", _editorSharedStyles.akEditorMobileMaxWidth, toolbarLineHeight);
+var mainToolbar = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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"])), _editorSharedStyles.akEditorSwoopCubicBezier, _editorSharedStyles.akEditorFloatingDialogZIndex, toolbarLineHeight, "var(--ds-surface, white)", _editorSharedStyles.akEditorMobileMaxWidth, toolbarLineHeight);
 var mainToolbarStyle = function mainToolbarStyle(showKeyline, twoLineEditorToolbar) {
   return [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
 };

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.6.0";
+var version = "187.6.10";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

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

@@ -5,6 +5,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 const setExpandRef = ref => createCommand({
   type: 'SET_EXPAND_REF',
   data: {
@@ -102,7 +103,7 @@ export const insertExpand = (state, dispatch) => {
   if (!expandNode) {
     return false;
   }
-  const tr = createWrapSelectionTransaction({
+  const tr = state.selection.empty ? safeInsert(expandNode)(state.tr).scrollIntoView() : createWrapSelectionTransaction({
     state,
     type: expandNode.type
   });

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

@@ -56,7 +56,7 @@ const expandPlugin = (options = {}, api) => {
             if (!node) {
               return false;
             }
-            const tr = createWrapSelectionTransaction({
+            const tr = state.selection.empty ? insert(node) : createWrapSelectionTransaction({
               state,
               type: node.type
             });

package/dist/es2019/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';
@@ -62,14 +61,12 @@ const insertBlockPlugin = (options = {}, api) => {
             typeAheadState: typeAheadPluginKey,
             blockTypeState: blockTypeStateKey,
             mediaState: mediaStateKey,
-            mentionState: mentionPluginKey,
             macroState: macroStateKey,
             emojiState: emojiPluginKey,
             placeholderTextState: placeholderTextStateKey,
             layoutState: layoutStateKey
           },
           render: ({
-            mentionState,
             blockTypeState,
             mediaState,
             macroState = {},
@@ -90,7 +87,6 @@ const insertBlockPlugin = (options = {}, api) => {
             isToolbarReducedSpacing: isToolbarReducedSpacing,
             isLastItem: isLastItem,
             featureFlags: featureFlags,
-            mentionState: mentionState,
             blockTypeState: blockTypeState,
             mediaState: mediaState,
             macroState: macroState,
@@ -125,7 +121,6 @@ function ToolbarInsertBlockWithInjectionApi({
   providers,
   pluginInjectionApi,
   options,
-  mentionState,
   blockTypeState,
   mediaState,
   macroState,
@@ -139,8 +134,9 @@ function ToolbarInsertBlockWithInjectionApi({
   const {
     dateState,
     hyperlinkState,
-    imageUploadState
-  } = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload']);
+    imageUploadState,
+    mentionState
+  } = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention']);
   return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
     pluginInjectionApi: pluginInjectionApi,
     buttons: buttons,
@@ -151,6 +147,7 @@ function ToolbarInsertBlockWithInjectionApi({
     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/es2019/plugins/insert-block/ui/ToolbarInsertBlock/create-items.js

@@ -30,6 +30,7 @@ const createInsertBlockItems = config => {
     imageUploadSupported,
     imageUploadEnabled,
     mentionsSupported,
+    mentionsDisabled,
     availableWrapperBlockTypes,
     actionSupported,
     decisionSupported,
@@ -83,7 +84,7 @@ const createInsertBlockItems = config => {
     items.push(mention({
       content: formatMessage(messages.mention),
       tooltipDescription: formatMessage(messages.mentionDescription),
-      disabled: !isTypeAheadAllowed,
+      disabled: !isTypeAheadAllowed || !!mentionsDisabled,
       'aria-haspopup': 'listbox'
     }));
   }

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

@@ -165,17 +165,23 @@ export class ToolbarInsertBlock extends React.PureComponent {
       return true;
     });
     _defineProperty(this, "insertMention", inputMethod => {
+      var _pluginInjectionApi$d3;
       const {
-        editorView
+        editorView,
+        pluginInjectionApi
       } = this.props;
       if (!editorView) {
         return true;
       }
+      const 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(this, "insertTable", inputMethod => {
-      var _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _pluginInjectionApi$d6;
+      var _pluginInjectionApi$d4, _pluginInjectionApi$d5, _pluginInjectionApi$d6, _pluginInjectionApi$d7;
       const {
         pluginInjectionApi,
         editorView
@@ -184,7 +190,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
         state,
         dispatch
       } = editorView;
-      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,
@@ -192,7 +198,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
           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(this, "createDate", inputMethod => {
       const {
@@ -398,6 +404,7 @@ export class ToolbarInsertBlock extends 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/es2019/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 };
+const getSharedState = editorState => {
+  if (!editorState) {
+    return undefined;
+  }
+  return mentionPluginKey.getState(editorState);
+};
 const mentionsPlugin = (options, api) => {
   let sessionId = uuid();
   const fireEvent = payload => {
@@ -65,6 +71,7 @@ const mentionsPlugin = (options, api) => {
         })
       });
     },
+    getSharedState,
     pluginsOptions: {
       quickInsert: ({
         formatMessage
@@ -79,6 +86,10 @@ const mentionsPlugin = (options, api) => {
         action(insert, state) {
           var _api$dependencies$ana3;
           const tr = insert(undefined);
+          const pluginState = getSharedState(state);
+          if (pluginState && pluginState.canInsertMention === false) {
+            return false;
+          }
           openTypeAheadAtCursor({
             triggerHandler: typeAhead,
             inputMethod: INPUT_METHOD.QUICK_INSERT