@atlaskit/editor-core 188.3.1 → 188.5.0

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

@@ -9,12 +9,10 @@ import { Popup } from '@atlaskit/editor-common/ui';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 import { separatorStyles, buttonGroupStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import { insertDate } from '../../../date/actions';
 import { showPlaceholderFloatingToolbar } from '../../../placeholder-text/actions';
 import { insertLayoutColumnsWithAnalytics } from '../../../layout/actions';
 import { insertTaskDecisionCommand } from '../../../tasks-and-decisions/commands';
 import { insertExpand } from '../../../expand/commands';
-import { createTypeAheadTools } from '../../../type-ahead/api';
 import { updateStatusWithAnalytics } from '../../../status/actions';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from './messages';
@@ -157,7 +155,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
       return (_pluginInjectionApi$c = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? 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;
     });
     _defineProperty(this, "insertMention", inputMethod => {
-      var _pluginInjectionApi$m;
+      var _pluginInjectionApi$m, _pluginInjectionApi$m2, _pluginInjectionApi$m3;
       const {
         editorView,
         pluginInjectionApi
@@ -169,8 +167,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
       if (pluginState && pluginState.canInsertMention === false) {
         return false;
       }
-      createTypeAheadTools(editorView).openMention(inputMethod);
-      return true;
+      return Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m2 = pluginInjectionApi.mention) === null || _pluginInjectionApi$m2 === void 0 ? void 0 : (_pluginInjectionApi$m3 = _pluginInjectionApi$m2.actions) === null || _pluginInjectionApi$m3 === void 0 ? void 0 : _pluginInjectionApi$m3.openTypeAhead(inputMethod));
     });
     _defineProperty(this, "insertTable", inputMethod => {
       var _pluginInjectionApi$t, _pluginInjectionApi$t2, _pluginInjectionApi$t3, _pluginInjectionApi$t4;
@@ -193,11 +190,12 @@ export class ToolbarInsertBlock extends React.PureComponent {
       })(state, dispatch)) !== null && _pluginInjectionApi$t !== void 0 ? _pluginInjectionApi$t : false;
     });
     _defineProperty(this, "createDate", inputMethod => {
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
       const {
+        pluginInjectionApi,
         editorView
       } = this.props;
-      insertDate(undefined, inputMethod)(editorView.state, editorView.dispatch);
-      return true;
+      return (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.date) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.insertDate(undefined, inputMethod)(editorView.state, editorView.dispatch)) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : false;
     });
     _defineProperty(this, "createPlaceholderText", () => {
       const {

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

@@ -4,19 +4,13 @@ import { ELEMENTS_CHANNEL } from '@atlaskit/mention/resource';
 import { mention } from '@atlaskit/adf-schema';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import ToolbarMention from './ui/ToolbarMention';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { IconMention } from '@atlaskit/editor-common/quick-insert';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 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 = ({
   config: options,
   api
@@ -59,6 +53,13 @@ const mentionsPlugin = ({
       editorView,
       disabled
     }) {
+      const openMentionTypeAhead = () => {
+        var _api$typeAhead, _api$typeAhead$action;
+        api === null || api === void 0 ? void 0 : (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 ? void 0 : (_api$typeAhead$action = _api$typeAhead.actions) === null || _api$typeAhead$action === void 0 ? void 0 : _api$typeAhead$action.open({
+          triggerHandler: typeAhead,
+          inputMethod: INPUT_METHOD.INSERT_MENU
+        });
+      };
       return /*#__PURE__*/React.createElement(WithPluginState, {
         editorView: editorView,
         plugins: {
@@ -68,11 +69,30 @@ const mentionsPlugin = ({
           mentionState = {}
         }) => !mentionState.mentionProvider ? null : /*#__PURE__*/React.createElement(ToolbarMention, {
           editorView: editorView,
+          onInsertMention: openMentionTypeAhead,
           isDisabled: disabled || (api === null || api === void 0 ? void 0 : api.typeAhead.actions.isAllowed(editorView.state))
         })
       });
     },
-    getSharedState,
+    actions: {
+      openTypeAhead(inputMethod) {
+        var _api$typeAhead2, _api$typeAhead2$actio;
+        return Boolean(api === null || api === void 0 ? void 0 : (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 ? void 0 : (_api$typeAhead2$actio = _api$typeAhead2.actions) === null || _api$typeAhead2$actio === void 0 ? void 0 : _api$typeAhead2$actio.open({
+          triggerHandler: typeAhead,
+          inputMethod
+        }));
+      }
+    },
+    getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      const mentionPluginState = mentionPluginKey.getState(editorState);
+      return {
+        ...mentionPluginState,
+        typeAheadHandler: typeAhead
+      };
+    },
     pluginsOptions: {
       quickInsert: ({
         formatMessage
@@ -85,26 +105,14 @@ const mentionsPlugin = ({
         keyshortcut: '@',
         icon: () => /*#__PURE__*/React.createElement(IconMention, null),
         action(insert, state) {
-          var _api$analytics2;
           const tr = insert(undefined);
-          const pluginState = getSharedState(state);
+          const pluginState = mentionPluginKey.getState(state);
           if (pluginState && pluginState.canInsertMention === false) {
             return false;
           }
-          api === null || api === void 0 ? void 0 : api.typeAhead.commands.openTypeAheadAtCursor({
+          api === null || api === void 0 ? void 0 : api.typeAhead.actions.openAtTransaction({
             triggerHandler: typeAhead,
             inputMethod: INPUT_METHOD.QUICK_INSERT
-          })({
-            tr
-          });
-          api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
-            action: ACTION.INVOKED,
-            actionSubject: ACTION_SUBJECT.TYPEAHEAD,
-            actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_MENTION,
-            attributes: {
-              inputMethod: INPUT_METHOD.QUICK_INSERT
-            },
-            eventType: EVENT_TYPE.UI
           })(tr);
           return tr;
         }

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

@@ -1,10 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React from 'react';
-import { PureComponent } from 'react';
+import React, { PureComponent } from 'react';
 import MentionIcon from '@atlaskit/icon/glyph/editor/mention';
 import { ToolbarButton, TOOLBAR_BUTTON } from '@atlaskit/editor-common/ui-menu';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { createTypeAheadTools } from '../../../type-ahead/api';
 import { injectIntl } from 'react-intl-next';
 import { messages } from '../../messages';
 class ToolbarMention extends PureComponent {
@@ -14,7 +11,7 @@ class ToolbarMention extends PureComponent {
       if (!this.props.editorView) {
         return false;
       }
-      createTypeAheadTools(this.props.editorView).openMention(INPUT_METHOD.INSERT_MENU);
+      this.props.onInsertMention();
       return true;
     });
   }

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

@@ -13,19 +13,18 @@ import { pluginKey } from './plugin-key';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { isSelectionAtPlaceholder } from './selection-utils';
-import { createInternalTypeAheadTools } from '../type-ahead/api';
-const getOpenTypeAhead = (view, content) => {
-  const typeAheadAPI = createInternalTypeAheadTools(view);
-  const typeAheadHandler = typeAheadAPI.findTypeAheadHandler(content);
+const getOpenTypeAhead = (trigger, api) => {
+  var _api$typeAhead, _api$typeAhead$action, _api$typeAhead2, _api$typeAhead2$actio;
+  const typeAheadHandler = api === null || api === void 0 ? void 0 : (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 ? void 0 : (_api$typeAhead$action = _api$typeAhead.actions) === null || _api$typeAhead$action === void 0 ? void 0 : _api$typeAhead$action.findHandlerByTrigger(trigger);
   if (!typeAheadHandler || !typeAheadHandler.id) {
     return null;
   }
-  return typeAheadAPI.openTypeAheadHandler({
+  return api === null || api === void 0 ? void 0 : (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 ? void 0 : (_api$typeAhead2$actio = _api$typeAhead2.actions) === null || _api$typeAhead2$actio === void 0 ? void 0 : _api$typeAhead2$actio.openAtTransaction({
     triggerHandler: typeAheadHandler,
     inputMethod: INPUT_METHOD.KEYBOARD
   });
 };
-export function createPlugin(dispatch, options) {
+export function createPlugin(dispatch, options, api) {
   const allowInserting = !!options.allowInserting;
   return new SafePlugin({
     key: pluginKey,
@@ -106,7 +105,7 @@ export function createPlugin(dispatch, options) {
             const content = event.data || '';
             const tr = view.state.tr;
             tr.delete(startNodePosition, startNodePosition + 1);
-            const openTypeAhead = getOpenTypeAhead(view, content);
+            const openTypeAhead = getOpenTypeAhead(content, api);
             if (openTypeAhead) {
               openTypeAhead(tr);
             } else {
@@ -125,6 +124,7 @@ export function createPlugin(dispatch, options) {
   });
 }
 const basePlaceholderTextPlugin = ({
+  api,
   config: options
 }) => ({
   name: 'placeholderText',
@@ -139,7 +139,7 @@ const basePlaceholderTextPlugin = ({
       name: 'placeholderText',
       plugin: ({
         dispatch
-      }) => createPlugin(dispatch, options)
+      }) => createPlugin(dispatch, options, api)
     }];
   },
   contentComponent({

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

@@ -1,7 +1,7 @@
 import { TypeAheadAvailableNodes, SelectItemMode } from '@atlaskit/editor-common/type-ahead';
-import { findHandler, findHandlerByTrigger, isTypeAheadOpen, getTypeAheadHandler, getTypeAheadQuery } from './utils';
+import { findHandler, isTypeAheadOpen, getTypeAheadHandler, getTypeAheadQuery } from './utils';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { openTypeAheadAtCursor, openTypeAhead } from './transforms/open-typeahead-at-cursor';
+import { openTypeAheadAtCursor } from './transforms/open-typeahead-at-cursor';
 import { closeTypeAhead } from './transforms/close-type-ahead';
 import { updateQuery } from './commands/update-query';
 import { insertTypeAheadItem } from './commands/insert-type-ahead-item';
@@ -176,33 +176,14 @@ const currentQuery = ({
 }) => () => {
   return getTypeAheadQuery(editorView.state);
 };
-const find = ({
-  editorView
-}) => trigger => {
-  const {
-    state: editorState
-  } = editorView;
-  const handler = findHandlerByTrigger({
-    trigger,
-    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.
-export const createInternalTypeAheadTools = editorView => {
-  const props = {
-    editorView
-  };
-  return {
-    findTypeAheadHandler: find(props),
-    openTypeAheadHandler: openTypeAhead
-  };
-};
+/**
+ * Please do not use it. Ping #help-editor and talk to the Lego team before use it.
+ *
+ * @private
+ * @deprecated
+ *
+ */
 export const createTypeAheadTools = editorView => {
   const props = {
     editorView

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

@@ -8,6 +8,7 @@
  */
 import React from 'react';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createPlugin } from './pm-plugins/main';
 import { createPlugin as createInsertItemPlugin } from './pm-plugins/insert-item-plugin';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
@@ -15,12 +16,14 @@ import { typeAheadQuery } from '@atlaskit/adf-schema';
 import { pluginKey as typeAheadPluginKey } from './pm-plugins/key';
 import { inputRulePlugin } from './pm-plugins/input-rules';
 import { TypeAheadPopup } from './ui/TypeAheadPopup';
-import { getPluginState, isTypeAheadOpen, isTypeAheadAllowed } from './utils';
+import { findHandler, getPluginState, isTypeAheadOpen, isTypeAheadAllowed, getTypeAheadQuery, getTypeAheadHandler } from './utils';
 import { useItemInsert } from './ui/hooks/use-item-insert';
 import { updateSelectedIndex } from './commands/update-selected-index';
 import { StatsModifier } from './stats-modifier';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { openTypeAheadAtCursor } from './transforms/open-typeahead-at-cursor';
+import { closeTypeAhead } from './transforms/close-type-ahead';
+import { insertTypeAheadItem } from './commands/insert-type-ahead-item';
 const TypeAheadMenu = /*#__PURE__*/React.memo(({
   editorView,
   popupMountRef,
@@ -102,6 +105,107 @@ const TypeAheadMenu = /*#__PURE__*/React.memo(({
     cancel: cancel
   });
 });
+const createOpenAtTransaction = editorAnalyticsAPI => props => tr => {
+  const {
+    triggerHandler,
+    inputMethod
+  } = props;
+  openTypeAheadAtCursor({
+    triggerHandler,
+    inputMethod
+  })({
+    tr
+  });
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+    action: ACTION.INVOKED,
+    actionSubject: ACTION_SUBJECT.TYPEAHEAD,
+    actionSubjectId: triggerHandler.id,
+    attributes: {
+      inputMethod
+    },
+    eventType: EVENT_TYPE.UI
+  })(tr);
+  return true;
+};
+const createOpenTypeAhead = (editorViewRef, editorAnalyticsAPI) => props => {
+  if (!editorViewRef.current) {
+    return false;
+  }
+  const {
+    current: view
+  } = editorViewRef;
+  const {
+    tr
+  } = view.state;
+  createOpenAtTransaction(editorAnalyticsAPI)(props)(tr);
+  view.dispatch(tr);
+  return true;
+};
+const createInsertTypeAheadItem = editorViewRef => props => {
+  if (!editorViewRef.current) {
+    return false;
+  }
+  const {
+    current: view
+  } = editorViewRef;
+  const {
+    triggerHandler,
+    contentItem,
+    query,
+    sourceListItem,
+    mode
+  } = props;
+  insertTypeAheadItem(view)({
+    handler: triggerHandler,
+    item: contentItem,
+    mode: mode || SelectItemMode.SELECTED,
+    query,
+    sourceListItem
+  });
+  return true;
+};
+const createFindHandlerByTrigger = editorViewRef => trigger => {
+  if (!editorViewRef.current) {
+    return null;
+  }
+  const {
+    current: view
+  } = editorViewRef;
+  return findHandler(trigger, view.state);
+};
+const createCloseTypeAhead = editorViewRef => options => {
+  if (!editorViewRef.current) {
+    return false;
+  }
+  const {
+    current: view
+  } = editorViewRef;
+  const currentQuery = getTypeAheadQuery(view.state) || '';
+  const {
+    state
+  } = view;
+  let tr = state.tr;
+  if (options.attachCommand) {
+    const fakeDispatch = customTr => {
+      tr = customTr;
+    };
+    options.attachCommand(state, fakeDispatch);
+  }
+  closeTypeAhead(tr);
+  if (options.insertCurrentQueryAsRawText && currentQuery && currentQuery.length > 0) {
+    const handler = getTypeAheadHandler(state);
+    if (!handler) {
+      return false;
+    }
+    const text = handler.trigger.concat(currentQuery);
+    tr.replaceSelectionWith(state.schema.text(text));
+  }
+  view.dispatch(tr);
+  if (!view.hasFocus()) {
+    view.focus();
+  }
+  return true;
+};
 
 /**
  *
@@ -112,12 +216,17 @@ const TypeAheadMenu = /*#__PURE__*/React.memo(({
  *
  */
 const typeAheadPlugin = ({
-  config: options
+  config: options,
+  api
 }) => {
+  var _api$analytics, _api$analytics2;
   const fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
   const popupMountRef = {
     current: null
   };
+  const editorViewRef = {
+    current: null
+  };
   return {
     name: 'typeAhead',
     marks() {
@@ -141,6 +250,20 @@ const typeAheadPlugin = ({
           typeAheadHandlers: typeAhead,
           createAnalyticsEvent: options === null || options === void 0 ? void 0 : options.createAnalyticsEvent
         })
+      }, {
+        name: 'typeAheadEditorViewRef',
+        plugin: () => {
+          return new SafePlugin({
+            view(view) {
+              editorViewRef.current = view;
+              return {
+                destroy() {
+                  editorViewRef.current = null;
+                }
+              };
+            }
+          });
+        }
       }, {
         name: 'typeAheadInsertItem',
         plugin: createInsertItemPlugin
@@ -152,12 +275,24 @@ const typeAheadPlugin = ({
         }) => inputRulePlugin(schema, typeAhead, featureFlags)
       }];
     },
-    commands: {
-      openTypeAheadAtCursor
+    getSharedState(editorState) {
+      if (!editorState) {
+        return {
+          query: ''
+        };
+      }
+      return {
+        query: getTypeAheadQuery(editorState) || ''
+      };
     },
     actions: {
       isOpen: isTypeAheadOpen,
-      isAllowed: isTypeAheadAllowed
+      isAllowed: isTypeAheadAllowed,
+      open: createOpenTypeAhead(editorViewRef, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      openAtTransaction: createOpenAtTransaction(api === null || api === void 0 ? 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({
       editorView,

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

@@ -4,7 +4,9 @@ import { createPlugin } from './pm-plugins/main';
 import { historyPluginKey } from '../history';
 import ToolbarUndoRedo from './ui/ToolbarUndoRedo';
 import WithPluginState from '../../ui/WithPluginState';
-const undoRedoPlugin = () => ({
+const undoRedoPlugin = ({
+  api
+}) => ({
   name: 'undoRedoPlugin',
   pmPlugins() {
     return [{
@@ -31,7 +33,8 @@ const undoRedoPlugin = () => ({
           isReducedSpacing: isToolbarReducedSpacing,
           disabled: disabled,
           historyState: historyState,
-          editorView: editorView
+          editorView: editorView,
+          api: api
         });
       }
     });

package/dist/es2019/plugins/undo-redo/types.js

@@ -0,0 +1 @@
+export {};

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

@@ -8,16 +8,16 @@ import { undo as undoKeymap, redo as redoKeymap, ToolTipContent, tooltip } from
 import { separatorStyles, buttonGroupStyle } from '@atlaskit/editor-common/styles';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
 import { undoRedoMessages } from '@atlaskit/editor-common/messages';
-import { createTypeAheadTools } from '../../../type-ahead/api';
 import { undoFromToolbar, redoFromToolbar } from '../../commands';
 import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
-const closeTypeAheadAndRunCommand = editorView => command => {
+const closeTypeAheadAndRunCommand = (editorView, api) => command => {
+  var _api$typeAhead, _api$typeAhead$action;
   if (!editorView) {
     return;
   }
-  const tool = createTypeAheadTools(editorView);
-  if (tool.isOpen()) {
-    tool.close({
+  if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead$action = _api$typeAhead.actions) !== null && _api$typeAhead$action !== void 0 && _api$typeAhead$action.isOpen(editorView.state)) {
+    var _api$typeAhead2, _api$typeAhead2$actio;
+    api === null || api === void 0 ? void 0 : (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 ? void 0 : (_api$typeAhead2$actio = _api$typeAhead2.actions) === null || _api$typeAhead2$actio === void 0 ? void 0 : _api$typeAhead2$actio.close({
       attachCommand: command,
       insertCurrentQueryAsRawText: false
     });
@@ -25,8 +25,8 @@ const closeTypeAheadAndRunCommand = editorView => command => {
     command(editorView.state, editorView.dispatch);
   }
 };
-const forceFocus = editorView => command => {
-  closeTypeAheadAndRunCommand(editorView)(command);
+const forceFocus = (editorView, api) => command => {
+  closeTypeAheadAndRunCommand(editorView, api)(command);
   if (!editorView.hasFocus()) {
     editorView.focus();
   }
@@ -38,15 +38,16 @@ export class ToolbarUndoRedo extends PureComponent {
       isReducedSpacing,
       historyState,
       editorView,
+      api,
       intl: {
         formatMessage
       }
     } = this.props;
     const handleUndo = () => {
-      forceFocus(editorView)(undoFromToolbar);
+      forceFocus(editorView, api)(undoFromToolbar);
     };
     const handleRedo = () => {
-      forceFocus(editorView)(redoFromToolbar);
+      forceFocus(editorView, api)(redoFromToolbar);
     };
     const labelUndo = formatMessage(undoRedoMessages.undo);
     const labelRedo = formatMessage(undoRedoMessages.redo);

package/dist/es2019/test-utils.js

@@ -4,7 +4,6 @@ import { createSchema } from './create-editor/create-schema';
 import { sortByOrder } from './create-editor/sort-by-order';
 import { analyticsPluginKey } from './plugins/analytics/plugin-key';
 import { basePlugin } from '@atlaskit/editor-plugin-base';
-export { createTypeAheadTools } from './plugins/type-ahead/api';
 export function getFireAnalytics(editorView) {
   var _analyticsPluginKey$g;
   return analyticsPluginKey === null || analyticsPluginKey === void 0 ? void 0 : (_analyticsPluginKey$g = analyticsPluginKey.getState(editorView.state)) === null || _analyticsPluginKey$g === void 0 ? void 0 : _analyticsPluginKey$g.fireAnalytics;

package/dist/es2019/ui/ContentStyles/index.js

@@ -20,7 +20,7 @@ import { MediaSharedClassNames } from '@atlaskit/editor-common/styles';
 import { findReplaceStyles } from '../../plugins/find-replace/styles';
 import { taskDecisionStyles } from '../../plugins/tasks-and-decisions/styles';
 import { statusStyles } from '../../plugins/status/styles';
-import { dateStyles } from '../../plugins/date/styles';
+import { dateStyles } from './date';
 import { InlineNodeViewSharedStyles } from '../../nodeviews/getInlineNodeViewProducer.styles';
 import { linkSharedStyle, codeMarkSharedStyles, ruleSharedStyles } from '@atlaskit/editor-common/styles';
 import { browser } from '@atlaskit/editor-common/utils';

package/dist/es2019/version-wrapper.js

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

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

@@ -3,8 +3,10 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 import { createEditorSelectionAPI } from '../../../selection-api/api';
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, borderPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../../../plugins';
+import { datePlugin } from '../../../plugins/date';
 import { captionPlugin } from '@atlaskit/editor-plugin-caption';
+import { borderPlugin } from '@atlaskit/editor-plugin-border';
 import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { mediaPlugin } from '@atlaskit/editor-plugin-media';
 import { rulePlugin } from '@atlaskit/editor-plugin-rule';

package/dist/esm/plugins/date/actions.js

@@ -2,7 +2,7 @@ import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { todayTimestampInUTC } from '@atlaskit/editor-common/utils';
 import { pluginKey } from './pm-plugins/plugin-key';
-import { withAnalytics, addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { isToday } from './utils/internal';
 import { canInsert } from '@atlaskit/editor-prosemirror/utils';
 export var createDate = function createDate(isQuickInsertAction) {
@@ -63,6 +63,7 @@ export var focusDateInput = function focusDateInput() {
 };
 export var insertDate = function insertDate(date, inputMethod, commitMethod) {
   var enterPressed = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var pluginInjectionApi = arguments.length > 4 ? arguments[4] : undefined;
   return function (state, dispatch) {
     var schema = state.schema;
     var timestamp;
@@ -73,7 +74,8 @@ export var insertDate = function insertDate(date, inputMethod, commitMethod) {
     }
     var tr = state.tr;
     if (inputMethod) {
-      addAnalytics(state, tr, {
+      var _pluginInjectionApi$a;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 || (_pluginInjectionApi$a = _pluginInjectionApi$a.actions) === null || _pluginInjectionApi$a === void 0 || _pluginInjectionApi$a.attachAnalyticsEvent({
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: ACTION_SUBJECT_ID.DATE,
@@ -81,10 +83,11 @@ export var insertDate = function insertDate(date, inputMethod, commitMethod) {
         attributes: {
           inputMethod: inputMethod
         }
-      });
+      })(tr);
     }
     if (commitMethod) {
-      addAnalytics(state, tr, {
+      var _pluginInjectionApi$a2;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 || (_pluginInjectionApi$a2 = _pluginInjectionApi$a2.actions) === null || _pluginInjectionApi$a2 === void 0 || _pluginInjectionApi$a2.attachAnalyticsEvent({
         eventType: EVENT_TYPE.TRACK,
         action: ACTION.COMMITTED,
         actionSubject: ACTION_SUBJECT.DATE,
@@ -93,7 +96,7 @@ export var insertDate = function insertDate(date, inputMethod, commitMethod) {
           isValid: date !== undefined,
           isToday: isToday(date)
         }
-      });
+      })(tr);
     }
     var _ref = pluginKey.getState(state) || {},
       showDatePickerAt = _ref.showDatePickerAt;
@@ -170,8 +173,10 @@ export var closeDatePicker = function closeDatePicker() {
   };
 };
 export var closeDatePickerWithAnalytics = function closeDatePickerWithAnalytics(_ref3) {
-  var date = _ref3.date;
-  return withAnalytics({
+  var _pluginInjectionApi$a3;
+  var date = _ref3.date,
+    pluginInjectionApi = _ref3.pluginInjectionApi;
+  pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 || (_pluginInjectionApi$a3 = _pluginInjectionApi$a3.actions) === null || _pluginInjectionApi$a3 === void 0 || _pluginInjectionApi$a3.attachAnalyticsEvent({
     eventType: EVENT_TYPE.TRACK,
     action: ACTION.COMMITTED,
     actionSubject: ACTION_SUBJECT.DATE,
@@ -180,7 +185,8 @@ export var closeDatePickerWithAnalytics = function closeDatePickerWithAnalytics(
       isValid: date !== undefined,
       isToday: isToday(date)
     }
-  })(closeDatePicker());
+  });
+  return closeDatePicker();
 };
 export var openDatePicker = function openDatePicker() {
   return function (state, dispatch) {