@atlaskit/editor-core 188.3.0 → 188.4.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-core
 
+## 188.4.0
+
+### Minor Changes
+
+- [#41203](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41203) [`4aa3dc2fa1a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4aa3dc2fa1a) - [ED-20291] New package for Editor border plugin
+
+### Patch Changes
+
+- [#41143](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41143) [`7d6dfe2befa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7d6dfe2befa) - [ED-20003] Replace TyepAhead API for Editor Plugin Injection API
+- Updated dependencies
+
+## 188.3.1
+
+### Patch Changes
+
+- [#41187](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41187) [`c09b3a047f4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c09b3a047f4) - Extract media plugin from `@atlaskit/editor-core` to `@atlaskit/editor-plugin-media.
+- Updated dependencies
+
 ## 188.3.0
 
 ### Minor Changes

package/dist/cjs/labs/next/presets/universal.js

@@ -10,7 +10,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _api = require("../../../selection-api/api");
 var _plugins = require("../../../plugins");
 var _editorPluginCaption = require("@atlaskit/editor-plugin-caption");
+var _editorPluginBorder = require("@atlaskit/editor-plugin-border");
 var _editorPluginHelpDialog = require("@atlaskit/editor-plugin-help-dialog");
+var _editorPluginMedia = require("@atlaskit/editor-plugin-media");
 var _editorPluginRule = require("@atlaskit/editor-plugin-rule");
 var _editorPluginEmoji = require("@atlaskit/editor-plugin-emoji");
 var _editorPluginList = require("@atlaskit/editor-plugin-list");
@@ -106,7 +108,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.mediaPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginMedia.mediaPlugin, function (plugin, builder) {
     if (props.media) {
       var alignLeftOnInsert = typeof props.media.alignLeftOnInsert !== 'undefined' ? props.media.alignLeftOnInsert : isComment;
       var showMediaLayoutOptions = typeof props.media.allowAdvancedToolBarOptions !== 'undefined' ? props.media.allowAdvancedToolBarOptions : isFullPage || isComment;
@@ -199,7 +201,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(_plugins.mediaPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginMedia.mediaPlugin, function (plugin, builder) {
     if (props.legacyImageUploadProvider && !props.media) {
       return builder.add([plugin, {
         allowMediaSingle: {
@@ -381,7 +383,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.borderPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginBorder.borderPlugin, function (plugin, builder) {
     if (props.allowBorderMark || props.UNSAFE_allowBorderMark) {
       return builder.add(plugin);
     }

package/dist/cjs/plugins/index.js

@@ -41,12 +41,6 @@ Object.defineProperty(exports, "betterTypeHistoryPlugin", {
     return _betterTypeHistory.default;
   }
 });
-Object.defineProperty(exports, "borderPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _border.default;
-  }
-});
 Object.defineProperty(exports, "breakoutPlugin", {
   enumerable: true,
   get: function get() {
@@ -179,12 +173,6 @@ Object.defineProperty(exports, "maxContentSizePlugin", {
     return _maxContentSize.default;
   }
 });
-Object.defineProperty(exports, "mediaPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _media.default;
-  }
-});
 Object.defineProperty(exports, "mentionsPlugin", {
   enumerable: true,
   get: function get() {
@@ -300,7 +288,6 @@ var _layout = _interopRequireDefault(require("./layout"));
 var _toolbarListsIndentation = _interopRequireDefault(require("./toolbar-lists-indentation"));
 var _macro = _interopRequireDefault(require("./macro"));
 var _maxContentSize = _interopRequireDefault(require("./max-content-size"));
-var _media = _interopRequireDefault(require("./media"));
 var _mentions = _interopRequireDefault(require("./mentions"));
 var _panel = _interopRequireDefault(require("./panel"));
 var _paste = _interopRequireDefault(require("./paste"));
@@ -332,6 +319,5 @@ var _avatarGroup = _interopRequireDefault(require("./avatar-group"));
 var _viewUpdateSubscription = _interopRequireDefault(require("./view-update-subscription"));
 var _beforePrimaryToolbar = _interopRequireDefault(require("./before-primaryToolbar"));
 var _codeBidiWarning = _interopRequireDefault(require("./code-bidi-warning"));
-var _border = _interopRequireDefault(require("./border"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

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

@@ -27,7 +27,6 @@ var _actions2 = require("../../../placeholder-text/actions");
 var _actions3 = require("../../../layout/actions");
 var _commands = require("../../../tasks-and-decisions/commands");
 var _commands2 = require("../../../expand/commands");
-var _api = require("../../../type-ahead/api");
 var _actions4 = require("../../../status/actions");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("./messages");
@@ -174,7 +173,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       return (_pluginInjectionApi$c = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$h = pluginInjectionApi.hyperlink) === null || _pluginInjectionApi$h === void 0 ? void 0 : _pluginInjectionApi$h.commands.showLinkToolbar(inputMethod))) !== null && _pluginInjectionApi$c !== void 0 ? _pluginInjectionApi$c : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertMention", function (inputMethod) {
-      var _pluginInjectionApi$m;
+      var _pluginInjectionApi$m, _pluginInjectionApi$m2;
       var _this$props = _this.props,
         editorView = _this$props.editorView,
         pluginInjectionApi = _this$props.pluginInjectionApi;
@@ -185,8 +184,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       if (pluginState && pluginState.canInsertMention === false) {
         return false;
       }
-      (0, _api.createTypeAheadTools)(editorView).openMention(inputMethod);
-      return true;
+      return Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$m2 = pluginInjectionApi.mention) === null || _pluginInjectionApi$m2 === void 0 || (_pluginInjectionApi$m2 = _pluginInjectionApi$m2.actions) === null || _pluginInjectionApi$m2 === void 0 ? void 0 : _pluginInjectionApi$m2.openTypeAhead(inputMethod));
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertTable", function (inputMethod) {
       var _pluginInjectionApi$t, _pluginInjectionApi$t2, _pluginInjectionApi$t3, _pluginInjectionApi$t4;

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

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "mentionPluginKey", {
     return _key.mentionPluginKey;
   }
 });
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _resource = require("@atlaskit/mention/resource");
@@ -23,12 +24,8 @@ var _messages = require("@atlaskit/editor-common/messages");
 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);
-};
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var mentionsPlugin = function mentionsPlugin(_ref) {
   var options = _ref.config,
     api = _ref.api;
@@ -70,6 +67,13 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
     secondaryToolbarComponent: function secondaryToolbarComponent(_ref3) {
       var editorView = _ref3.editorView,
         disabled = _ref3.disabled;
+      var openMentionTypeAhead = function openMentionTypeAhead() {
+        var _api$typeAhead;
+        api === null || api === void 0 || (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 || (_api$typeAhead = _api$typeAhead.actions) === null || _api$typeAhead === void 0 || _api$typeAhead.open({
+          triggerHandler: typeAhead,
+          inputMethod: _analytics.INPUT_METHOD.INSERT_MENU
+        });
+      };
       return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
         editorView: editorView,
         plugins: {
@@ -80,12 +84,30 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
             mentionState = _ref4$mentionState === void 0 ? {} : _ref4$mentionState;
           return !mentionState.mentionProvider ? null : /*#__PURE__*/_react.default.createElement(_ToolbarMention.default, {
             editorView: editorView,
+            onInsertMention: openMentionTypeAhead,
             isDisabled: disabled || (api === null || api === void 0 ? void 0 : api.typeAhead.actions.isAllowed(editorView.state))
           });
         }
       });
     },
-    getSharedState: getSharedState,
+    actions: {
+      openTypeAhead: function openTypeAhead(inputMethod) {
+        var _api$typeAhead2;
+        return Boolean(api === null || api === void 0 || (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 || (_api$typeAhead2 = _api$typeAhead2.actions) === null || _api$typeAhead2 === void 0 ? void 0 : _api$typeAhead2.open({
+          triggerHandler: typeAhead,
+          inputMethod: inputMethod
+        }));
+      }
+    },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      var mentionPluginState = _key.mentionPluginKey.getState(editorState);
+      return _objectSpread(_objectSpread({}, mentionPluginState), {}, {
+        typeAheadHandler: typeAhead
+      });
+    },
     pluginsOptions: {
       quickInsert: function quickInsert(_ref5) {
         var formatMessage = _ref5.formatMessage;
@@ -100,26 +122,14 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconMention, null);
           },
           action: function action(insert, state) {
-            var _api$analytics2;
             var tr = insert(undefined);
-            var pluginState = getSharedState(state);
+            var pluginState = _key.mentionPluginKey.getState(state);
             if (pluginState && pluginState.canInsertMention === false) {
               return false;
             }
-            api === null || api === void 0 || api.typeAhead.commands.openTypeAheadAtCursor({
+            api === null || api === void 0 || api.typeAhead.actions.openAtTransaction({
               triggerHandler: typeAhead,
               inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
-            })({
-              tr: tr
-            });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
-              action: _analytics.ACTION.INVOKED,
-              actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_MENTION,
-              attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: _analytics.EVENT_TYPE.UI
             })(tr);
             return tr;
           }

package/dist/cjs/plugins/mentions/ui/ToolbarMention/index.js

@@ -16,8 +16,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _mention = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/mention"));
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _api = require("../../../type-ahead/api");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("../../messages");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -38,7 +36,7 @@ var ToolbarMention = /*#__PURE__*/function (_PureComponent) {
       if (!_this.props.editorView) {
         return false;
       }
-      (0, _api.createTypeAheadTools)(_this.props.editorView).openMention(_analytics.INPUT_METHOD.INSERT_MENU);
+      _this.props.onInsertMention();
       return true;
     });
     return _this;

package/dist/cjs/plugins/placeholder-text/index.js

@@ -21,19 +21,18 @@ var _pluginKey = require("./plugin-key");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _selectionUtils = require("./selection-utils");
-var _api = require("../type-ahead/api");
-var getOpenTypeAhead = function getOpenTypeAhead(view, content) {
-  var typeAheadAPI = (0, _api.createInternalTypeAheadTools)(view);
-  var typeAheadHandler = typeAheadAPI.findTypeAheadHandler(content);
+var getOpenTypeAhead = function getOpenTypeAhead(trigger, api) {
+  var _api$typeAhead, _api$typeAhead2;
+  var typeAheadHandler = api === null || api === void 0 || (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 || (_api$typeAhead = _api$typeAhead.actions) === null || _api$typeAhead === void 0 ? void 0 : _api$typeAhead.findHandlerByTrigger(trigger);
   if (!typeAheadHandler || !typeAheadHandler.id) {
     return null;
   }
-  return typeAheadAPI.openTypeAheadHandler({
+  return api === null || api === void 0 || (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 || (_api$typeAhead2 = _api$typeAhead2.actions) === null || _api$typeAhead2 === void 0 ? void 0 : _api$typeAhead2.openAtTransaction({
     triggerHandler: typeAheadHandler,
     inputMethod: _analytics.INPUT_METHOD.KEYBOARD
   });
 };
-function createPlugin(dispatch, options) {
+function createPlugin(dispatch, options, api) {
   var allowInserting = !!options.allowInserting;
   return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey,
@@ -111,7 +110,7 @@ function createPlugin(dispatch, options) {
             var content = event.data || '';
             var tr = view.state.tr;
             tr.delete(startNodePosition, startNodePosition + 1);
-            var openTypeAhead = getOpenTypeAhead(view, content);
+            var openTypeAhead = getOpenTypeAhead(content, api);
             if (openTypeAhead) {
               openTypeAhead(tr);
             } else {
@@ -132,7 +131,8 @@ function createPlugin(dispatch, options) {
   });
 }
 var basePlaceholderTextPlugin = function basePlaceholderTextPlugin(_ref) {
-  var options = _ref.config;
+  var api = _ref.api,
+    options = _ref.config;
   return {
     name: 'placeholderText',
     nodes: function nodes() {
@@ -146,7 +146,7 @@ var basePlaceholderTextPlugin = function basePlaceholderTextPlugin(_ref) {
         name: 'placeholderText',
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch;
-          return createPlugin(dispatch, options);
+          return createPlugin(dispatch, options, api);
         }
       }];
     },

package/dist/cjs/plugins/type-ahead/api.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createTypeAheadTools = exports.createInternalTypeAheadTools = void 0;
+exports.createTypeAheadTools = void 0;
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _utils = require("./utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -186,32 +186,14 @@ var currentQuery = function currentQuery(_ref8) {
     return (0, _utils.getTypeAheadQuery)(editorView.state);
   };
 };
-var find = function find(_ref9) {
-  var editorView = _ref9.editorView;
-  return function (trigger) {
-    var editorState = editorView.state;
-    var handler = (0, _utils.findHandlerByTrigger)({
-      trigger: trigger,
-      editorState: editorState
-    });
-    if (!handler) {
-      return null;
-    }
-    return handler;
-  };
-};
 
-// This is an internal tool to be used inside of others Editor Plugins
-// We shouldn't public export this method.
-var createInternalTypeAheadTools = exports.createInternalTypeAheadTools = function createInternalTypeAheadTools(editorView) {
-  var props = {
-    editorView: editorView
-  };
-  return {
-    findTypeAheadHandler: find(props),
-    openTypeAheadHandler: _openTypeaheadAtCursor.openTypeAhead
-  };
-};
+/**
+ * Please do not use it. Ping #help-editor and talk to the Lego team before use it.
+ *
+ * @private
+ * @deprecated
+ *
+ */
 var createTypeAheadTools = exports.createTypeAheadTools = function createTypeAheadTools(editorView) {
   var props = {
     editorView: editorView

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

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "typeAheadPluginKey", {
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireDefault(require("react"));
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _main = require("./pm-plugins/main");
 var _insertItemPlugin = require("./pm-plugins/insert-item-plugin");
 var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
@@ -27,6 +28,8 @@ var _updateSelectedIndex = require("./commands/update-selected-index");
 var _statsModifier = require("./stats-modifier");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _openTypeaheadAtCursor = require("./transforms/open-typeahead-at-cursor");
+var _closeTypeAhead = require("./transforms/close-type-ahead");
+var _insertTypeAheadItem = require("./commands/insert-type-ahead-item");
 /**
  *
  * Revamped typeahead using decorations instead of the `typeAheadQuery` mark
@@ -118,6 +121,103 @@ var TypeAheadMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
     cancel: cancel
   });
 });
+var createOpenAtTransaction = function createOpenAtTransaction(editorAnalyticsAPI) {
+  return function (props) {
+    return function (tr) {
+      var triggerHandler = props.triggerHandler,
+        inputMethod = props.inputMethod;
+      (0, _openTypeaheadAtCursor.openTypeAheadAtCursor)({
+        triggerHandler: triggerHandler,
+        inputMethod: inputMethod
+      })({
+        tr: tr
+      });
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+        action: _analytics.ACTION.INVOKED,
+        actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
+        actionSubjectId: triggerHandler.id,
+        attributes: {
+          inputMethod: inputMethod
+        },
+        eventType: _analytics.EVENT_TYPE.UI
+      })(tr);
+      return true;
+    };
+  };
+};
+var createOpenTypeAhead = function createOpenTypeAhead(editorViewRef, editorAnalyticsAPI) {
+  return function (props) {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    var view = editorViewRef.current;
+    var tr = view.state.tr;
+    createOpenAtTransaction(editorAnalyticsAPI)(props)(tr);
+    view.dispatch(tr);
+    return true;
+  };
+};
+var createInsertTypeAheadItem = function createInsertTypeAheadItem(editorViewRef) {
+  return function (props) {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    var view = editorViewRef.current;
+    var triggerHandler = props.triggerHandler,
+      contentItem = props.contentItem,
+      query = props.query,
+      sourceListItem = props.sourceListItem,
+      mode = props.mode;
+    (0, _insertTypeAheadItem.insertTypeAheadItem)(view)({
+      handler: triggerHandler,
+      item: contentItem,
+      mode: mode || _typeAhead.SelectItemMode.SELECTED,
+      query: query,
+      sourceListItem: sourceListItem
+    });
+    return true;
+  };
+};
+var createFindHandlerByTrigger = function createFindHandlerByTrigger(editorViewRef) {
+  return function (trigger) {
+    if (!editorViewRef.current) {
+      return null;
+    }
+    var view = editorViewRef.current;
+    return (0, _utils.findHandler)(trigger, view.state);
+  };
+};
+var createCloseTypeAhead = function createCloseTypeAhead(editorViewRef) {
+  return function (options) {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    var view = editorViewRef.current;
+    var currentQuery = (0, _utils.getTypeAheadQuery)(view.state) || '';
+    var state = view.state;
+    var tr = state.tr;
+    if (options.attachCommand) {
+      var fakeDispatch = function fakeDispatch(customTr) {
+        tr = customTr;
+      };
+      options.attachCommand(state, fakeDispatch);
+    }
+    (0, _closeTypeAhead.closeTypeAhead)(tr);
+    if (options.insertCurrentQueryAsRawText && currentQuery && currentQuery.length > 0) {
+      var handler = (0, _utils.getTypeAheadHandler)(state);
+      if (!handler) {
+        return false;
+      }
+      var text = handler.trigger.concat(currentQuery);
+      tr.replaceSelectionWith(state.schema.text(text));
+    }
+    view.dispatch(tr);
+    if (!view.hasFocus()) {
+      view.focus();
+    }
+    return true;
+  };
+};
 
 /**
  *
@@ -128,11 +228,16 @@ var TypeAheadMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
  *
  */
 var typeAheadPlugin = function typeAheadPlugin(_ref4) {
-  var options = _ref4.config;
+  var _api$analytics, _api$analytics2;
+  var options = _ref4.config,
+    api = _ref4.api;
   var fireAnalyticsCallback = (0, _analytics.fireAnalyticsEvent)(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
   var popupMountRef = {
     current: null
   };
+  var editorViewRef = {
+    current: null
+  };
   return {
     name: 'typeAhead',
     marks: function marks() {
@@ -158,6 +263,20 @@ var typeAheadPlugin = function typeAheadPlugin(_ref4) {
             createAnalyticsEvent: options === null || options === void 0 ? void 0 : options.createAnalyticsEvent
           });
         }
+      }, {
+        name: 'typeAheadEditorViewRef',
+        plugin: function plugin() {
+          return new _safePlugin.SafePlugin({
+            view: function view(_view) {
+              editorViewRef.current = _view;
+              return {
+                destroy: function destroy() {
+                  editorViewRef.current = null;
+                }
+              };
+            }
+          });
+        }
       }, {
         name: 'typeAheadInsertItem',
         plugin: _insertItemPlugin.createPlugin
@@ -170,12 +289,24 @@ var typeAheadPlugin = function typeAheadPlugin(_ref4) {
         }
       }];
     },
-    commands: {
-      openTypeAheadAtCursor: _openTypeaheadAtCursor.openTypeAheadAtCursor
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return {
+          query: ''
+        };
+      }
+      return {
+        query: (0, _utils.getTypeAheadQuery)(editorState) || ''
+      };
     },
     actions: {
       isOpen: _utils.isTypeAheadOpen,
-      isAllowed: _utils.isTypeAheadAllowed
+      isAllowed: _utils.isTypeAheadAllowed,
+      open: createOpenTypeAhead(editorViewRef, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      openAtTransaction: createOpenAtTransaction(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
+      findHandlerByTrigger: createFindHandlerByTrigger(editorViewRef),
+      insert: createInsertTypeAheadItem(editorViewRef),
+      close: createCloseTypeAhead(editorViewRef)
     },
     contentComponent: function contentComponent(_ref7) {
       var editorView = _ref7.editorView,

package/dist/cjs/plugins/undo-redo/index.js

@@ -11,7 +11,8 @@ var _main = require("./pm-plugins/main");
 var _history = require("../history");
 var _ToolbarUndoRedo = _interopRequireDefault(require("./ui/ToolbarUndoRedo"));
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
-var undoRedoPlugin = function undoRedoPlugin() {
+var undoRedoPlugin = function undoRedoPlugin(_ref) {
+  var api = _ref.api;
   return {
     name: 'undoRedoPlugin',
     pmPlugins: function pmPlugins() {
@@ -27,21 +28,22 @@ var undoRedoPlugin = function undoRedoPlugin() {
         }
       }];
     },
-    primaryToolbarComponent: function primaryToolbarComponent(_ref) {
-      var editorView = _ref.editorView,
-        disabled = _ref.disabled,
-        isToolbarReducedSpacing = _ref.isToolbarReducedSpacing;
+    primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
+      var editorView = _ref2.editorView,
+        disabled = _ref2.disabled,
+        isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing;
       return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
         plugins: {
           historyState: _history.historyPluginKey
         },
-        render: function render(_ref2) {
-          var historyState = _ref2.historyState;
+        render: function render(_ref3) {
+          var historyState = _ref3.historyState;
           return /*#__PURE__*/_react.default.createElement(_ToolbarUndoRedo.default, {
             isReducedSpacing: isToolbarReducedSpacing,
             disabled: disabled,
             historyState: historyState,
-            editorView: editorView
+            editorView: editorView,
+            api: api
           });
         }
       });

package/dist/cjs/plugins/undo-redo/ui/ToolbarUndoRedo/index.js

@@ -20,21 +20,21 @@ var _keymaps = require("../../../../keymaps");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ToolbarButton = _interopRequireWildcard(require("../../../../ui/ToolbarButton"));
 var _messages = require("@atlaskit/editor-common/messages");
-var _api = require("../../../type-ahead/api");
 var _commands = require("../../commands");
 var _keymaps2 = require("@atlaskit/editor-common/keymaps");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
-var closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorView) {
+var closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorView, api) {
   return function (command) {
+    var _api$typeAhead;
     if (!editorView) {
       return;
     }
-    var tool = (0, _api.createTypeAheadTools)(editorView);
-    if (tool.isOpen()) {
-      tool.close({
+    if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead = _api$typeAhead.actions) !== null && _api$typeAhead !== void 0 && _api$typeAhead.isOpen(editorView.state)) {
+      var _api$typeAhead2;
+      api === null || api === void 0 || (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 || (_api$typeAhead2 = _api$typeAhead2.actions) === null || _api$typeAhead2 === void 0 || _api$typeAhead2.close({
         attachCommand: command,
         insertCurrentQueryAsRawText: false
       });
@@ -43,9 +43,9 @@ var closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorVie
     }
   };
 };
-var forceFocus = function forceFocus(editorView) {
+var forceFocus = function forceFocus(editorView, api) {
   return function (command) {
-    closeTypeAheadAndRunCommand(editorView)(command);
+    closeTypeAheadAndRunCommand(editorView, api)(command);
     if (!editorView.hasFocus()) {
       editorView.focus();
     }
@@ -66,12 +66,13 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = /*#__PURE__*/function (_PureComp
         isReducedSpacing = _this$props.isReducedSpacing,
         historyState = _this$props.historyState,
         editorView = _this$props.editorView,
+        api = _this$props.api,
         formatMessage = _this$props.intl.formatMessage;
       var handleUndo = function handleUndo() {
-        forceFocus(editorView)(_commands.undoFromToolbar);
+        forceFocus(editorView, api)(_commands.undoFromToolbar);
       };
       var handleRedo = function handleRedo() {
-        forceFocus(editorView)(_commands.redoFromToolbar);
+        forceFocus(editorView, api)(_commands.redoFromToolbar);
       };
       var labelUndo = formatMessage(_messages.undoRedoMessages.undo);
       var labelRedo = formatMessage(_messages.undoRedoMessages.redo);

package/dist/cjs/test-utils.js

@@ -23,12 +23,6 @@ Object.defineProperty(exports, "GapCursorSide", {
   }
 });
 exports.createPMSchemaAndPlugins = void 0;
-Object.defineProperty(exports, "createTypeAheadTools", {
-  enumerable: true,
-  get: function get() {
-    return _api.createTypeAheadTools;
-  }
-});
 exports.getFireAnalytics = getFireAnalytics;
 exports.isElementBySelectorInDocument = void 0;
 exports.setTextSelection = setTextSelection;
@@ -40,7 +34,6 @@ var _createSchema = require("./create-editor/create-schema");
 var _sortByOrder = require("./create-editor/sort-by-order");
 var _pluginKey = require("./plugins/analytics/plugin-key");
 var _editorPluginBase = require("@atlaskit/editor-plugin-base");
-var _api = require("./plugins/type-ahead/api");
 var _eventDispatcher = require("./event-dispatcher");
 var _selection = require("@atlaskit/editor-common/selection");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }