@atlaskit/editor-core 188.3.1 → 188.5.0

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

@@ -1,175 +1 @@
-import React from 'react';
-import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import Loadable from 'react-loadable';
-import { date } from '@atlaskit/adf-schema';
-import { insertDate, closeDatePicker as _closeDatePicker, closeDatePickerWithAnalytics as _closeDatePickerWithAnalytics, createDate, deleteDate } from './actions';
-import createDatePlugin from './pm-plugins/main';
-import keymap from './pm-plugins/keymap';
-import { IconDate } from '@atlaskit/editor-common/quick-insert';
-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 { pluginKey as datePluginKey } from './pm-plugins/plugin-key';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-var DatePicker = Loadable({
-  loader: function loader() {
-    return import( /* webpackChunkName: "@atlaskit-internal_editor-datepicker" */'./ui/DatePicker').then(function (mod) {
-      return mod.default;
-    });
-  },
-  loading: function loading() {
-    return null;
-  }
-});
-function ContentComponent(_ref) {
-  var editorView = _ref.editorView,
-    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
-    popupsMountPoint = _ref.popupsMountPoint,
-    popupsBoundariesElement = _ref.popupsBoundariesElement,
-    popupsScrollableElement = _ref.popupsScrollableElement,
-    dependencyApi = _ref.dependencyApi,
-    weekStartDay = _ref.weekStartDay;
-  var dispatch = editorView.dispatch;
-  var domAtPos = editorView.domAtPos.bind(editorView);
-  var _useSharedPluginState = useSharedPluginState(dependencyApi, ['date', 'editorDisabled']),
-    editorDisabledState = _useSharedPluginState.editorDisabledState,
-    dateState = _useSharedPluginState.dateState;
-  if (!(dateState !== null && dateState !== void 0 && dateState.showDatePickerAt) || editorDisabledState !== null && editorDisabledState !== void 0 && editorDisabledState.editorDisabled) {
-    return null;
-  }
-  var showDatePickerAt = dateState.showDatePickerAt,
-    isNew = dateState.isNew,
-    focusDateInput = dateState.focusDateInput;
-  var element = findDomRefAtPos(showDatePickerAt, domAtPos);
-  return /*#__PURE__*/React.createElement(DatePicker, {
-    mountTo: popupsMountPoint,
-    boundariesElement: popupsBoundariesElement,
-    scrollableElement: popupsScrollableElement,
-    key: showDatePickerAt,
-    element: element,
-    isNew: isNew,
-    autoFocus: focusDateInput,
-    onDelete: function onDelete() {
-      deleteDate()(editorView.state, dispatch);
-      editorView.focus();
-      return;
-    },
-    onSelect: function onSelect(date, commitMethod) {
-      // Undefined means couldn't parse date, null means invalid (out of bounds) date
-      if (date === undefined || date === null) {
-        return;
-      }
-      insertDate(date, undefined, commitMethod)(editorView.state, dispatch);
-      editorView.focus();
-    },
-    onTextChanged: function onTextChanged(date) {
-      insertDate(date, undefined, undefined, false)(editorView.state, dispatch);
-    },
-    closeDatePicker: function closeDatePicker() {
-      _closeDatePicker()(editorView.state, dispatch);
-      editorView.focus();
-    },
-    closeDatePickerWithAnalytics: function closeDatePickerWithAnalytics(_ref2) {
-      var date = _ref2.date;
-      _closeDatePickerWithAnalytics({
-        date: date
-      })(editorView.state, dispatch);
-      editorView.focus();
-    },
-    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    weekStartDay: weekStartDay
-  });
-}
-var datePlugin = function datePlugin(_ref3) {
-  var _ref3$config = _ref3.config,
-    options = _ref3$config === void 0 ? {} : _ref3$config,
-    api = _ref3.api;
-  return {
-    name: 'date',
-    getSharedState: function getSharedState(editorState) {
-      if (!editorState) {
-        return {
-          showDatePickerAt: null,
-          isNew: false,
-          focusDateInput: false
-        };
-      }
-      var _ref4 = datePluginKey.getState(editorState) || {},
-        showDatePickerAt = _ref4.showDatePickerAt,
-        isNew = _ref4.isNew,
-        focusDateInput = _ref4.focusDateInput;
-      return {
-        showDatePickerAt: showDatePickerAt,
-        isNew: !!isNew,
-        focusDateInput: !!focusDateInput
-      };
-    },
-    nodes: function nodes() {
-      return [{
-        name: 'date',
-        node: date
-      }];
-    },
-    pmPlugins: function pmPlugins() {
-      return [{
-        name: 'date',
-        plugin: function plugin(options) {
-          DatePicker.preload();
-          return createDatePlugin(options);
-        }
-      }, {
-        name: 'dateKeymap',
-        plugin: function plugin() {
-          DatePicker.preload();
-          return keymap();
-        }
-      }];
-    },
-    contentComponent: function contentComponent(_ref5) {
-      var editorView = _ref5.editorView,
-        dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent,
-        popupsMountPoint = _ref5.popupsMountPoint,
-        popupsBoundariesElement = _ref5.popupsBoundariesElement,
-        popupsScrollableElement = _ref5.popupsScrollableElement;
-      return /*#__PURE__*/React.createElement(ContentComponent, {
-        dependencyApi: api,
-        editorView: editorView,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        weekStartDay: options.weekStartDay
-      });
-    },
-    pluginsOptions: {
-      quickInsert: function quickInsert(_ref6) {
-        var formatMessage = _ref6.formatMessage;
-        return [{
-          id: 'date',
-          title: formatMessage(messages.date),
-          description: formatMessage(messages.dateDescription),
-          priority: 800,
-          keywords: ['calendar', 'day', 'time', 'today', '/'],
-          keyshortcut: '//',
-          icon: function icon() {
-            return /*#__PURE__*/React.createElement(IconDate, null);
-          },
-          action: function action(insert, state) {
-            var _api$analytics, _api$analytics$attach;
-            var tr = createDate(true)(insert, state);
-            api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || (_api$analytics$attach = _api$analytics.attachAnalyticsEvent) === null || _api$analytics$attach === void 0 || _api$analytics$attach.call(_api$analytics, {
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: ACTION_SUBJECT_ID.DATE,
-              eventType: EVENT_TYPE.TRACK,
-              attributes: {
-                inputMethod: INPUT_METHOD.QUICK_INSERT
-              }
-            })(tr);
-            return tr;
-          }
-        }];
-      }
-    }
-  };
-};
-export default datePlugin;
+export { default as datePlugin } from './plugin';

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

@@ -0,0 +1,179 @@
+import React from 'react';
+import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
+import Loadable from 'react-loadable';
+import { date } from '@atlaskit/adf-schema';
+import { insertDate, closeDatePicker as _closeDatePicker, closeDatePickerWithAnalytics as _closeDatePickerWithAnalytics, createDate, deleteDate } from './actions';
+import createDatePlugin from './pm-plugins/main';
+import keymap from './pm-plugins/keymap';
+import { IconDate } from '@atlaskit/editor-common/quick-insert';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { pluginKey as datePluginKey } from './pm-plugins/plugin-key';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+var DatePicker = Loadable({
+  loader: function loader() {
+    return import( /* webpackChunkName: "@atlaskit-internal_editor-datepicker" */'./ui/DatePicker').then(function (mod) {
+      return mod.default;
+    });
+  },
+  loading: function loading() {
+    return null;
+  }
+});
+function ContentComponent(_ref) {
+  var editorView = _ref.editorView,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsScrollableElement = _ref.popupsScrollableElement,
+    dependencyApi = _ref.dependencyApi,
+    weekStartDay = _ref.weekStartDay;
+  var dispatch = editorView.dispatch;
+  var domAtPos = editorView.domAtPos.bind(editorView);
+  var _useSharedPluginState = useSharedPluginState(dependencyApi, ['date', 'editorDisabled']),
+    editorDisabledState = _useSharedPluginState.editorDisabledState,
+    dateState = _useSharedPluginState.dateState;
+  if (!(dateState !== null && dateState !== void 0 && dateState.showDatePickerAt) || editorDisabledState !== null && editorDisabledState !== void 0 && editorDisabledState.editorDisabled) {
+    return null;
+  }
+  var showDatePickerAt = dateState.showDatePickerAt,
+    isNew = dateState.isNew,
+    focusDateInput = dateState.focusDateInput;
+  var element = findDomRefAtPos(showDatePickerAt, domAtPos);
+  return /*#__PURE__*/React.createElement(DatePicker, {
+    mountTo: popupsMountPoint,
+    boundariesElement: popupsBoundariesElement,
+    scrollableElement: popupsScrollableElement,
+    key: showDatePickerAt,
+    element: element,
+    isNew: isNew,
+    autoFocus: focusDateInput,
+    onDelete: function onDelete() {
+      deleteDate()(editorView.state, dispatch);
+      editorView.focus();
+      return;
+    },
+    onSelect: function onSelect(date, commitMethod) {
+      // Undefined means couldn't parse date, null means invalid (out of bounds) date
+      if (date === undefined || date === null) {
+        return;
+      }
+      insertDate(date, undefined, commitMethod)(editorView.state, dispatch);
+      editorView.focus();
+    },
+    onTextChanged: function onTextChanged(date) {
+      insertDate(date, undefined, undefined, false)(editorView.state, dispatch);
+    },
+    closeDatePicker: function closeDatePicker() {
+      _closeDatePicker()(editorView.state, dispatch);
+      editorView.focus();
+    },
+    closeDatePickerWithAnalytics: function closeDatePickerWithAnalytics(_ref2) {
+      var date = _ref2.date;
+      _closeDatePickerWithAnalytics({
+        date: date
+      })(editorView.state, dispatch);
+      editorView.focus();
+    },
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    weekStartDay: weekStartDay
+  });
+}
+var datePlugin = function datePlugin(_ref3) {
+  var _ref3$config = _ref3.config,
+    options = _ref3$config === void 0 ? {} : _ref3$config,
+    api = _ref3.api;
+  return {
+    name: 'date',
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return {
+          showDatePickerAt: null,
+          isNew: false,
+          focusDateInput: false
+        };
+      }
+      var _ref4 = datePluginKey.getState(editorState) || {},
+        showDatePickerAt = _ref4.showDatePickerAt,
+        isNew = _ref4.isNew,
+        focusDateInput = _ref4.focusDateInput;
+      return {
+        showDatePickerAt: showDatePickerAt,
+        isNew: !!isNew,
+        focusDateInput: !!focusDateInput
+      };
+    },
+    actions: {
+      insertDate: insertDate,
+      deleteDate: deleteDate
+    },
+    nodes: function nodes() {
+      return [{
+        name: 'date',
+        node: date
+      }];
+    },
+    pmPlugins: function pmPlugins() {
+      return [{
+        name: 'date',
+        plugin: function plugin(options) {
+          DatePicker.preload();
+          return createDatePlugin(options);
+        }
+      }, {
+        name: 'dateKeymap',
+        plugin: function plugin() {
+          DatePicker.preload();
+          return keymap();
+        }
+      }];
+    },
+    contentComponent: function contentComponent(_ref5) {
+      var editorView = _ref5.editorView,
+        dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent,
+        popupsMountPoint = _ref5.popupsMountPoint,
+        popupsBoundariesElement = _ref5.popupsBoundariesElement,
+        popupsScrollableElement = _ref5.popupsScrollableElement;
+      return /*#__PURE__*/React.createElement(ContentComponent, {
+        dependencyApi: api,
+        editorView: editorView,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        weekStartDay: options.weekStartDay
+      });
+    },
+    pluginsOptions: {
+      quickInsert: function quickInsert(_ref6) {
+        var formatMessage = _ref6.formatMessage;
+        return [{
+          id: 'date',
+          title: formatMessage(messages.date),
+          description: formatMessage(messages.dateDescription),
+          priority: 800,
+          keywords: ['calendar', 'day', 'time', 'today', '/'],
+          keyshortcut: '//',
+          icon: function icon() {
+            return /*#__PURE__*/React.createElement(IconDate, null);
+          },
+          action: function action(insert, state) {
+            var _api$analytics, _api$analytics$attach;
+            var tr = createDate(true)(insert, state);
+            api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || (_api$analytics$attach = _api$analytics.attachAnalyticsEvent) === null || _api$analytics$attach === void 0 || _api$analytics$attach.call(_api$analytics, {
+              action: ACTION.INSERTED,
+              actionSubject: ACTION_SUBJECT.DOCUMENT,
+              actionSubjectId: ACTION_SUBJECT_ID.DATE,
+              eventType: EVENT_TYPE.TRACK,
+              attributes: {
+                inputMethod: INPUT_METHOD.QUICK_INSERT
+              }
+            })(tr);
+            return tr;
+          }
+        }];
+      }
+    }
+  };
+};
+export default datePlugin;

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

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DateNodeView } from '../nodeviews/date';
 import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
-import { pluginFactory } from '../../../utils/plugin-state-factory';
+import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { reducer, mapping, onSelectionChanged } from './utils';
 import { pluginKey } from './plugin-key';
 var _pluginFactory = pluginFactory(pluginKey, reducer, {

package/dist/esm/plugins/date/ui/DatePicker/date-picker-input.js

@@ -10,15 +10,16 @@ var _templateObject;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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 */
+
 import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { defineMessages, injectIntl } from 'react-intl-next';
 import { findDateSegmentByPosition, adjustDate, isDatePossiblyValid } from '../../utils/internal';
 import { parseDateType, formatDateType } from '../../utils/formatParse';
-import { EVENT_TYPE, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../../../analytics/types/enums';
+import { EVENT_TYPE, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import TextField from '@atlaskit/textfield';
 import { ErrorMessage } from '@atlaskit/form';
-var dateTextFieldWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 22px;\n  padding-bottom: 12px;\n"])));
+var dateTextFieldWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 22px;\n  padding-bottom: ", ";\n"])), "var(--ds-space-150, 12px)");
 var messages = defineMessages({
   invalidDateError: {
     id: 'fabric.editor.invalidDateError',

package/dist/esm/plugins/date/ui/DatePicker/index.js

@@ -19,9 +19,9 @@ import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import Calendar from '@atlaskit/calendar';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N60A, N0 } from '@atlaskit/theme/colors';
-import withOuterListeners from '../../../../ui/with-outer-listeners';
+import { withOuterListeners } from '@atlaskit/editor-common/ui';
 var PopupWithListeners = withOuterListeners(Popup);
-import { INPUT_METHOD } from '../../../analytics/types/enums';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { injectIntl } from 'react-intl-next';
 import DatePickerInput from './date-picker-input';
 var popupContentWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  background-color: ", ";\n"])), "var(--ds-space-025, 2px)", borderRadius(), "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N60A, ", 0 0 1px ").concat(N60A), ")"), "var(--ds-surface-overlay, ".concat(N0, ")"));

package/dist/esm/plugins/index.js

@@ -2,7 +2,7 @@ export { default as betterTypeHistoryPlugin } from './better-type-history';
 export { default as clearMarksOnChangeToEmptyDocumentPlugin } from './clear-marks-on-change-to-empty-document';
 export { default as codeBlockPlugin } from './code-block';
 export { default as collabEditPlugin } from './collab-edit';
-export { default as datePlugin } from './date';
+export { datePlugin } from './date';
 export { default as extensionPlugin } from './extension';
 export { default as fakeTextCursorPlugin } from './fake-text-cursor';
 export { default as insertBlockPlugin } from './insert-block';
@@ -41,5 +41,4 @@ export { default as undoRedoPlugin } from './undo-redo';
 export { default as avatarGroupPlugin } from './avatar-group';
 export { default as viewUpdateSubscriptionPlugin } from './view-update-subscription';
 export { default as beforePrimaryToolbarPlugin } from './before-primaryToolbar';
-export { default as codeBidiWarningPlugin } from './code-bidi-warning';
-export { default as borderPlugin } from './border';
+export { default as codeBidiWarningPlugin } from './code-bidi-warning';

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

@@ -20,12 +20,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';
@@ -169,7 +167,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       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;
     });
     _defineProperty(_assertThisInitialized(_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;
@@ -180,8 +178,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       if (pluginState && pluginState.canInsertMention === false) {
         return false;
       }
-      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));
     });
     _defineProperty(_assertThisInitialized(_this), "insertTable", function (inputMethod) {
       var _pluginInjectionApi$t, _pluginInjectionApi$t2, _pluginInjectionApi$t3, _pluginInjectionApi$t4;
@@ -201,9 +198,11 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       })(state, dispatch)) !== null && _pluginInjectionApi$t !== void 0 ? _pluginInjectionApi$t : false;
     });
     _defineProperty(_assertThisInitialized(_this), "createDate", function (inputMethod) {
-      var editorView = _this.props.editorView;
-      insertDate(undefined, inputMethod)(editorView.state, editorView.dispatch);
-      return true;
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+      var _this$props3 = _this.props,
+        pluginInjectionApi = _this$props3.pluginInjectionApi,
+        editorView = _this$props3.editorView;
+      return (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === 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(_assertThisInitialized(_this), "createPlaceholderText", function () {
       var editorView = _this.props.editorView;
@@ -221,9 +220,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       return true;
     });
     _defineProperty(_assertThisInitialized(_this), "openMediaPicker", function (inputMethod) {
-      var _this$props3 = _this.props,
-        onShowMediaPicker = _this$props3.onShowMediaPicker,
-        dispatchAnalyticsEvent = _this$props3.dispatchAnalyticsEvent;
+      var _this$props4 = _this.props,
+        onShowMediaPicker = _this$props4.onShowMediaPicker,
+        dispatchAnalyticsEvent = _this$props4.dispatchAnalyticsEvent;
       if (onShowMediaPicker) {
         onShowMediaPicker();
         if (dispatchAnalyticsEvent) {
@@ -251,11 +250,11 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     _defineProperty(_assertThisInitialized(_this), "insertHorizontalRule", function (inputMethod) {
       var _pluginInjectionApi$r, _pluginInjectionApi$r2;
-      var _this$props4 = _this.props,
-        _this$props4$editorVi = _this$props4.editorView,
-        state = _this$props4$editorVi.state,
-        dispatch = _this$props4$editorVi.dispatch,
-        pluginInjectionApi = _this$props4.pluginInjectionApi;
+      var _this$props5 = _this.props,
+        _this$props5$editorVi = _this$props5.editorView,
+        state = _this$props5$editorVi.state,
+        dispatch = _this$props5$editorVi.dispatch,
+        pluginInjectionApi = _this$props5.pluginInjectionApi;
       return (_pluginInjectionApi$r = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$r2 = pluginInjectionApi.rule) === null || _pluginInjectionApi$r2 === void 0 ? void 0 : _pluginInjectionApi$r2.actions.insertHorizontalRule(inputMethod)(state, dispatch)) !== null && _pluginInjectionApi$r !== void 0 ? _pluginInjectionApi$r : false;
     });
     _defineProperty(_assertThisInitialized(_this), "insertExpand", function () {
@@ -266,9 +265,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     _defineProperty(_assertThisInitialized(_this), "insertBlockType", function (itemName) {
       return function () {
-        var _this$props5 = _this.props,
-          editorView = _this$props5.editorView,
-          onInsertBlockType = _this$props5.onInsertBlockType;
+        var _this$props6 = _this.props,
+          editorView = _this$props6.editorView,
+          onInsertBlockType = _this$props6.onInsertBlockType;
         var state = editorView.state,
           dispatch = editorView.dispatch;
         onInsertBlockType(itemName)(state, dispatch);
@@ -291,11 +290,11 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "onItemActivated", function (_ref2) {
       var item = _ref2.item,
         inputMethod = _ref2.inputMethod;
-      var _this$props6 = _this.props,
-        editorView = _this$props6.editorView,
-        editorActions = _this$props6.editorActions,
-        handleImageUpload = _this$props6.handleImageUpload,
-        expandEnabled = _this$props6.expandEnabled;
+      var _this$props7 = _this.props,
+        editorView = _this$props7.editorView,
+        editorActions = _this$props7.editorActions,
+        handleImageUpload = _this$props7.handleImageUpload,
+        expandEnabled = _this$props7.expandEnabled;
 
       // need to do this before inserting nodes so scrollIntoView works properly
       if (!editorView.hasFocus()) {
@@ -411,12 +410,12 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     key: "renderPopup",
     value: function renderPopup() {
       var emojiPickerOpen = this.state.emojiPickerOpen;
-      var _this$props7 = this.props,
-        popupsMountPoint = _this$props7.popupsMountPoint,
-        popupsBoundariesElement = _this$props7.popupsBoundariesElement,
-        popupsScrollableElement = _this$props7.popupsScrollableElement,
-        emojiProvider = _this$props7.emojiProvider,
-        replacePlusMenuWithElementBrowser = _this$props7.replacePlusMenuWithElementBrowser;
+      var _this$props8 = this.props,
+        popupsMountPoint = _this$props8.popupsMountPoint,
+        popupsBoundariesElement = _this$props8.popupsBoundariesElement,
+        popupsScrollableElement = _this$props8.popupsScrollableElement,
+        emojiProvider = _this$props8.emojiProvider,
+        replacePlusMenuWithElementBrowser = _this$props8.replacePlusMenuWithElementBrowser;
       var dropdownEmoji = this.state.dropdownItems.some(function (_ref4) {
         var name = _ref4.value.name;
         return name === 'emoji';
@@ -453,9 +452,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         buttons = _this$state.buttons,
         dropdownItems = _this$state.dropdownItems,
         emojiPickerOpen = _this$state.emojiPickerOpen;
-      var _this$props8 = this.props,
-        isDisabled = _this$props8.isDisabled,
-        isReducedSpacing = _this$props8.isReducedSpacing;
+      var _this$props9 = this.props,
+        isDisabled = _this$props9.isDisabled,
+        isReducedSpacing = _this$props9.isReducedSpacing;
       if (buttons.length === 0 && dropdownItems.length === 0) {
         return null;
       }

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

@@ -1,22 +1,19 @@
+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 React from 'react';
 import uuid from 'uuid';
 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 };
-var getSharedState = function getSharedState(editorState) {
-  if (!editorState) {
-    return undefined;
-  }
-  return mentionPluginKey.getState(editorState);
-};
 var mentionsPlugin = function mentionsPlugin(_ref) {
   var options = _ref.config,
     api = _ref.api;
@@ -58,6 +55,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: INPUT_METHOD.INSERT_MENU
+        });
+      };
       return /*#__PURE__*/React.createElement(WithPluginState, {
         editorView: editorView,
         plugins: {
@@ -68,12 +72,30 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
             mentionState = _ref4$mentionState === void 0 ? {} : _ref4$mentionState;
           return !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: 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 = mentionPluginKey.getState(editorState);
+      return _objectSpread(_objectSpread({}, mentionPluginState), {}, {
+        typeAheadHandler: typeAhead
+      });
+    },
     pluginsOptions: {
       quickInsert: function quickInsert(_ref5) {
         var formatMessage = _ref5.formatMessage;
@@ -88,26 +110,14 @@ var mentionsPlugin = function mentionsPlugin(_ref) {
             return /*#__PURE__*/React.createElement(IconMention, null);
           },
           action: function action(insert, state) {
-            var _api$analytics2;
             var tr = insert(undefined);
-            var pluginState = getSharedState(state);
+            var pluginState = 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: 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: 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;
           }