@atlaskit/editor-core 187.23.1 → 187.24.0

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

@@ -4,7 +4,7 @@ import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
-import * as keymaps from '@atlaskit/editor-common/keymaps';
+import { tooltip, toggleBlockQuote, keymap } from '@atlaskit/editor-common/keymaps';
 import { createPlugin, pluginKey } from './pm-plugins/main';
 import keymapPlugin from './pm-plugins/keymap';
 import inputRulePlugin from './pm-plugins/input-rule';
@@ -22,7 +22,7 @@ const headingPluginOptions = ({
   }, (_v, idx) => {
     const level = idx + 1;
     const descriptionDescriptor = messages[`heading${level}Description`];
-    const keyshortcut = keymaps.tooltip(keymaps[`toggleHeading${level}`]);
+    const keyshortcut = tooltip(keymap[`toggleHeading${level}`]);
     const id = `heading${level}`;
     return {
       id,
@@ -64,7 +64,7 @@ const blockquotePluginOptions = ({
     title: formatMessage(messages.blockquote),
     description: formatMessage(messages.blockquoteDescription),
     priority: 1300,
-    keyshortcut: keymaps.tooltip(keymaps.toggleBlockQuote),
+    keyshortcut: tooltip(toggleBlockQuote),
     icon: () => /*#__PURE__*/React.createElement(IconQuote, null),
     action(insert, state) {
       const tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));

package/dist/es2019/plugins/block-type/pm-plugins/keymap.js

@@ -1,26 +1,25 @@
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import * as keymaps from '@atlaskit/editor-common/keymaps';
-import { keymap } from '@atlaskit/editor-common/keymaps';
+import { bindKeymapWithCommand, moveUp, moveDown, findKeyMapForBrowser, undo as undoKeymap, redo as redoKeymap, backspace, deleteKey, forwardDelete, toggleBlockQuote, keymap, insertNewLine, findShortcutByKeymap } from '@atlaskit/editor-common/keymaps';
 import { insertNewLineWithAnalytics, createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import * as blockTypes from '../types';
 import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockTypesWithAnalytics } from '../commands';
 import { isNodeAWrappingBlockNode } from '../utils';
-const backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
+const backspaceCommand = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 const del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 export default function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
-  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, createNewParagraphAbove, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, createNewParagraphBelow, list);
-  keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), redo, list);
-  keymaps.bindKeymapWithCommand(keymaps.undo.common, undo, list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspace, list);
-  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, del, list);
-  keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, del, list);
+  bindKeymapWithCommand(insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
+  bindKeymapWithCommand(moveUp.common, createNewParagraphAbove, list);
+  bindKeymapWithCommand(moveDown.common, createNewParagraphBelow, list);
+  bindKeymapWithCommand(findKeyMapForBrowser(redoKeymap), redo, list);
+  bindKeymapWithCommand(undoKeymap.common, undo, list);
+  bindKeymapWithCommand(backspace.common, backspaceCommand, list);
+  bindKeymapWithCommand(deleteKey.common, del, list);
+  bindKeymapWithCommand(forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    bindKeymapWithCommand(findShortcutByKeymap(toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return keymap(list);
 }

package/dist/es2019/plugins/caption/pm-plugins/keymap.js

@@ -1,19 +1,19 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, moveDown, enter, moveUp, shiftTab, tab, moveLeft } from '@atlaskit/editor-common/keymaps';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createNewParagraphBelow } from '@atlaskit/editor-common/utils';
 import { GapCursorSelection } from '../../selection/gap-cursor/selection';
 export function captionKeymap() {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, createNewParagraphBelowCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, createNewParagraphBelowCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, getOutOfCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, getOutOfCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, selectParentMediaSingle, list);
-  keymaps.bindKeymapWithCommand(keymaps.shiftTab.common, selectParentMediaSingle, list);
-  keymaps.bindKeymapWithCommand(keymaps.tab.common, getOutOfCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveLeft.common, gapCursorSelectLeftParentMediaSingle, list);
+  bindKeymapWithCommand(moveDown.common, createNewParagraphBelowCaption, list);
+  bindKeymapWithCommand(enter.common, createNewParagraphBelowCaption, list);
+  bindKeymapWithCommand(moveDown.common, getOutOfCaption, list);
+  bindKeymapWithCommand(enter.common, getOutOfCaption, list);
+  bindKeymapWithCommand(moveUp.common, selectParentMediaSingle, list);
+  bindKeymapWithCommand(shiftTab.common, selectParentMediaSingle, list);
+  bindKeymapWithCommand(tab.common, getOutOfCaption, list);
+  bindKeymapWithCommand(moveLeft.common, gapCursorSelectLeftParentMediaSingle, list);
   return keymap(list);
 }
 const createNewParagraphBelowCaption = (state, dispatch) => {

package/dist/es2019/plugins/help-dialog/index.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import * as keymaps from '../../keymaps';
-import { openHelp, tooltip } from '../../keymaps';
+import { bindKeymapWithCommand, openHelp, tooltip } from '@atlaskit/editor-common/keymaps';
 import WithPluginState from '../../ui/WithPluginState';
 import { HelpDialogLoader } from './ui/HelpDialogLoader';
 import { pluginKey as quickInsertPluginKey } from '../quick-insert';
@@ -105,7 +104,7 @@ const helpDialog = (imageUploadProviderExists = false, api) => ({
 });
 const keymapPlugin = editorAnalyticsAPI => {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.openHelp.common, (state, dispatch) => {
+  bindKeymapWithCommand(openHelp.common, (state, dispatch) => {
     let {
       tr
     } = state;

package/dist/es2019/plugins/media/pm-plugins/alt-text/keymap.js

@@ -1,9 +1,9 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../../keymaps';
+import { bindKeymapWithCommand, addAltText, escape } from '@atlaskit/editor-common/keymaps';
 import { openMediaAltTextMenu, closeMediaAltTextMenu } from './commands';
 export default function keymapPlugin(schema, editorAnalyticsAPI) {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.addAltText.common, openMediaAltTextMenu(editorAnalyticsAPI), list);
-  keymaps.bindKeymapWithCommand(keymaps.escape.common, closeMediaAltTextMenu, list);
+  bindKeymapWithCommand(addAltText.common, openMediaAltTextMenu(editorAnalyticsAPI), list);
+  bindKeymapWithCommand(escape.common, closeMediaAltTextMenu, list);
   return keymap(list);
 }

package/dist/es2019/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -10,7 +10,7 @@ import { messages } from '../messages';
 import { injectIntl } from 'react-intl-next';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { PanelTextInput } from '@atlaskit/editor-common/ui';
-import * as keymaps from '../../../../../keymaps';
+import { escape } from '@atlaskit/editor-common/keymaps';
 import { ToolTipContent } from '../../../../../keymaps';
 import { closeMediaAltTextMenu, updateAltText } from '../commands';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
@@ -157,7 +157,7 @@ export class AltTextEditComponent extends React.Component {
     const backButtonMessage = formatMessage(messages.back);
     const backButtonMessageComponent = jsx(ToolTipContent, {
       description: backButtonMessage,
-      keymap: keymaps.escape,
+      keymap: escape,
       shortcutOverride: "Esc"
     });
     const errorsList = (this.state.validationErrors || []).map(function (error, index) {

package/dist/es2019/plugins/media/pm-plugins/keymap.js

@@ -1,6 +1,6 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, undo, enter, tab, moveLeft, moveRight, moveDown, insertNewLine } from '@atlaskit/editor-common/keymaps';
 import { stateKey } from '../pm-plugins/plugin-key';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
@@ -10,15 +10,15 @@ export function keymapPlugin(options, editorAnalyticsAPI) {
   const {
     featureFlags
   } = options || {};
-  keymaps.bindKeymapWithCommand(keymaps.undo.common, ignoreLinksInSteps, list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, splitMediaGroup, list);
+  bindKeymapWithCommand(undo.common, ignoreLinksInSteps, list);
+  bindKeymapWithCommand(enter.common, splitMediaGroup, list);
   if (getMediaFeatureFlag('captions', featureFlags)) {
-    keymaps.bindKeymapWithCommand(keymaps.moveDown.common, insertAndSelectCaption(editorAnalyticsAPI), list);
-    keymaps.bindKeymapWithCommand(keymaps.tab.common, insertAndSelectCaption(editorAnalyticsAPI), list);
-    keymaps.bindKeymapWithCommand(keymaps.moveLeft.common, arrowLeftFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
-    keymaps.bindKeymapWithCommand(keymaps.moveRight.common, arrowRightFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
+    bindKeymapWithCommand(moveDown.common, insertAndSelectCaption(editorAnalyticsAPI), list);
+    bindKeymapWithCommand(tab.common, insertAndSelectCaption(editorAnalyticsAPI), list);
+    bindKeymapWithCommand(moveLeft.common, arrowLeftFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
+    bindKeymapWithCommand(moveRight.common, arrowRightFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
   }
-  keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, splitMediaGroup, list);
+  bindKeymapWithCommand(insertNewLine.common, splitMediaGroup, list);
   return keymap(list);
 }
 const ignoreLinksInSteps = state => {

package/dist/es2019/plugins/media/pm-plugins/linking/keymap.js

@@ -1,8 +1,8 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../../keymaps';
+import { bindKeymapWithCommand, addLink } from '@atlaskit/editor-common/keymaps';
 import { showLinkingToolbarWithMediaTypeCheck } from '../../commands/linking';
 export default function keymapPlugin(schema) {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.addLink.common, showLinkingToolbarWithMediaTypeCheck, list);
+  bindKeymapWithCommand(addLink.common, showLinkingToolbarWithMediaTypeCheck, list);
   return keymap(list);
 }

package/dist/es2019/plugins/status/keymap.js

@@ -1,10 +1,10 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../keymaps';
+import { bindKeymapWithCommand, enter, tab } from '../../keymaps';
 import { mayGetStatusAtSelection } from './utils';
 export function keymapPlugin() {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, consumeKeyEvent, list);
-  keymaps.bindKeymapWithCommand(keymaps.tab.common, consumeKeyEvent, list);
+  bindKeymapWithCommand(enter.common, consumeKeyEvent, list);
+  bindKeymapWithCommand(tab.common, consumeKeyEvent, list);
   return keymap(list);
 }
 

package/dist/es2019/plugins/submit-editor/index.js

@@ -1,6 +1,6 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../keymaps';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../plugins/analytics';
+import { submit } from '@atlaskit/editor-common/keymaps';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { stateKey as mediaPluginKey } from '../../plugins/media/pm-plugins/plugin-key';
 import { analyticsEventKey } from '../analytics/consts';
 export function createPlugin(eventDispatch, onSave) {
@@ -8,7 +8,7 @@ export function createPlugin(eventDispatch, onSave) {
     return;
   }
   return keymap({
-    [`${keymaps.submit.common}`]: (state, _dispatch, editorView) => {
+    [`${submit.common}`]: (state, _dispatch, editorView) => {
       const mediaState = mediaPluginKey.getState(state);
       if (mediaState && mediaState.waitForMediaUpload && !mediaState.allUploadsFinished) {
         return true;

package/dist/es2019/plugins/text-color/commands/toggle-color.js

@@ -1,7 +1,7 @@
 import { toggleMark } from '@atlaskit/editor-common/mark';
 import { ACTIONS, pluginKey } from '../pm-plugins/main';
 import { getDisabledState } from '../utils/disabled';
-import { pluginCommandToPMCommand } from '@atlaskit/editor-common/preset';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 export const toggleColor = color => (state, dispatch) => {
   const {
     textColor
@@ -22,7 +22,7 @@ export const toggleColor = color => (state, dispatch) => {
       color
     });
     state.tr.scrollIntoView();
-    pluginCommandToPMCommand(toggleMark(textColor, {
+    editorCommandToPMCommand(toggleMark(textColor, {
       color
     }))(state, dispatch);
   }

package/dist/es2019/presets/context.js

@@ -0,0 +1,25 @@
+import React, { useState, useContext } from 'react';
+export const EditorAPIContext = /*#__PURE__*/React.createContext({});
+export const PresetContextProvider = ({
+  children
+}) => {
+  const [editorApi, setEditorApi] = useState();
+  return /*#__PURE__*/React.createElement(EditorAPIContext.Provider, {
+    value: {
+      editorApi,
+      setEditorApi
+    }
+  }, children);
+};
+export const usePresetContext = () => {
+  const {
+    editorApi
+  } = useContext(EditorAPIContext);
+  return editorApi;
+};
+export const useSetPresetContext = () => {
+  const {
+    setEditorApi
+  } = useContext(EditorAPIContext);
+  return setEditorApi;
+};

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

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import PropTypes from 'prop-types';
 import EditorActions from '../../actions';
+import { PresetContextProvider } from '../../presets/context';
 const EditorContext = /*#__PURE__*/React.createContext({});
 export const useEditorContext = () => React.useContext(EditorContext);
 export default class LegacyEditorContext extends React.Component {
@@ -17,7 +18,7 @@ export default class LegacyEditorContext extends React.Component {
   render() {
     return /*#__PURE__*/React.createElement(EditorContext.Provider, {
       value: this.getChildContext()
-    }, this.props.children);
+    }, /*#__PURE__*/React.createElement(PresetContextProvider, null, this.props.children));
   }
 }
 _defineProperty(LegacyEditorContext, "childContextTypes", {

package/dist/es2019/use-preset.js

@@ -0,0 +1,45 @@
+import { useMemo } from 'react';
+import { usePresetContext } from './presets/context';
+/**
+ * Creates a preset.
+ *
+ * Takes an input function that returns a preset (and memoizes it) depending
+ * on the dependency array provided.
+ *
+ * Returns a pluginInjectionApi in order to apply actions and subscribe to plugin
+ * changes outside of the editor.
+ *
+ * @param createPreset
+ * @param dependencies
+ * @returns PresetAPI ({ pluginInjectionApi, preset, actionBuilder })
+ *
+ * Example:
+ * ```ts
+ * function ExampleEditor() {
+ *   const { preset, editorApi } = usePreset(() =>
+ *     new EditorPresetBuilder().add(plugin1).add(plugin2)
+ *   , []);
+ *
+ *   // Can execute typesafe commands based on plugin1 or 2
+ *   const runCommand = () => editorApi.executeCommand(
+ *     editorApi.dependencies.plugin1.commands.doSomething()
+ *   )
+ *   return (
+ *     <>
+ *       <Editor preset={preset} />
+ *       <Button onClick={runCommand}>Run command</Button>
+ *     </>
+ *   )
+ * }
+ * ```
+ */
+export function usePreset(createPreset, dependencies) {
+  const editorApi = usePresetContext();
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const preset = useMemo(createPreset, dependencies);
+  return {
+    editorApi,
+    preset
+  };
+}

package/dist/es2019/version-wrapper.js

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

package/dist/es2019/version.json

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

package/dist/esm/create-editor/ReactEditorViewInternal.js

@@ -80,7 +80,7 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
   _inherits(ReactEditorView, _React$Component);
   var _super = _createSuper(ReactEditorView);
   function ReactEditorView(props, context) {
-    var _props$editorProps, _props$editorProps$pe, _props$editorProps$pe2;
+    var _props$setEditorApi, _props$editorProps, _props$editorProps$pe, _props$editorProps$pe2;
     var _this;
     _classCallCheck(this, ReactEditorView);
     _this = _super.call(this, props, context);
@@ -529,6 +529,7 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       getEditorState: _this.getEditorState,
       getEditorView: _this.getEditorView
     });
+    (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 ? void 0 : _props$setEditorApi.call(props, _this.pluginInjectionAPI.api());
     _this.eventDispatcher = new EventDispatcher();
     _this.dispatch = createDispatch(_this.eventDispatcher);
     _this.errorReporter = createErrorReporter(props.editorProps.errorReporterHandler);

package/dist/esm/editor-next/editor-internal.js

@@ -13,6 +13,7 @@ import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from
 import ReactEditorView from '../create-editor/ReactEditorViewNext';
 import { ContextAdapter } from '../nodeviews/context-adapter';
 import EditorContext from '../ui/EditorContext';
+import { useSetPresetContext } from '../presets/context';
 import { RenderTracking } from '../utils/performance/components/RenderTracking';
 import useMeasureEditorMountTime from './hooks/useMeasureEditorMountTime';
 import useProviderFactory from './hooks/useProviderFactory';
@@ -50,6 +51,7 @@ export function EditorInternalWithoutHooks(_ref) {
     onEditorDestroyed = _ref.onEditorDestroyed,
     preset = _ref.preset;
   var Component = getUiComponent(props.appearance);
+  var setEditorApi = useSetPresetContext();
   var overriddenEditorProps = _objectSpread(_objectSpread({}, props), {}, {
     onSave: props.onSave ? handleSave : undefined,
     // noop all analytic events, even if a handler is still passed.
@@ -94,6 +96,7 @@ export function EditorInternalWithoutHooks(_ref) {
         onEditorDestroyed: onEditorDestroyed,
         disabled: props.disabled,
         preset: preset,
+        setEditorApi: setEditorApi,
         render: function render(_ref2) {
           var _props$featureFlags, _props$featureFlags2;
           var editor = _ref2.editor,

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

@@ -5,7 +5,7 @@ import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
-import * as keymaps from '@atlaskit/editor-common/keymaps';
+import { tooltip, toggleBlockQuote, keymap } from '@atlaskit/editor-common/keymaps';
 import { createPlugin, pluginKey } from './pm-plugins/main';
 import keymapPlugin from './pm-plugins/keymap';
 import inputRulePlugin from './pm-plugins/input-rule';
@@ -22,7 +22,7 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editor
   }, function (_v, idx) {
     var level = idx + 1;
     var descriptionDescriptor = messages["heading".concat(level, "Description")];
-    var keyshortcut = keymaps.tooltip(keymaps["toggleHeading".concat(level)]);
+    var keyshortcut = tooltip(keymap["toggleHeading".concat(level)]);
     var id = "heading".concat(level);
     return {
       id: id,
@@ -65,7 +65,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
     title: formatMessage(messages.blockquote),
     description: formatMessage(messages.blockquoteDescription),
     priority: 1300,
-    keyshortcut: keymaps.tooltip(keymaps.toggleBlockQuote),
+    keyshortcut: tooltip(toggleBlockQuote),
     icon: function icon() {
       return /*#__PURE__*/React.createElement(IconQuote, null);
     },

package/dist/esm/plugins/block-type/pm-plugins/keymap.js

@@ -1,26 +1,25 @@
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import * as keymaps from '@atlaskit/editor-common/keymaps';
-import { keymap } from '@atlaskit/editor-common/keymaps';
+import { bindKeymapWithCommand, moveUp, moveDown, findKeyMapForBrowser, undo as undoKeymap, redo as redoKeymap, backspace, deleteKey, forwardDelete, toggleBlockQuote, keymap, insertNewLine, findShortcutByKeymap } from '@atlaskit/editor-common/keymaps';
 import { insertNewLineWithAnalytics, createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import * as blockTypes from '../types';
 import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockTypesWithAnalytics } from '../commands';
 import { isNodeAWrappingBlockNode } from '../utils';
-var backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
+var backspaceCommand = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 var del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 export default function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
-  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, createNewParagraphAbove, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, createNewParagraphBelow, list);
-  keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), redo, list);
-  keymaps.bindKeymapWithCommand(keymaps.undo.common, undo, list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspace, list);
-  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, del, list);
-  keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, del, list);
+  bindKeymapWithCommand(insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
+  bindKeymapWithCommand(moveUp.common, createNewParagraphAbove, list);
+  bindKeymapWithCommand(moveDown.common, createNewParagraphBelow, list);
+  bindKeymapWithCommand(findKeyMapForBrowser(redoKeymap), redo, list);
+  bindKeymapWithCommand(undoKeymap.common, undo, list);
+  bindKeymapWithCommand(backspace.common, backspaceCommand, list);
+  bindKeymapWithCommand(deleteKey.common, del, list);
+  bindKeymapWithCommand(forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    bindKeymapWithCommand(findShortcutByKeymap(toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return keymap(list);
 }

package/dist/esm/plugins/caption/pm-plugins/keymap.js

@@ -1,19 +1,19 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, moveDown, enter, moveUp, shiftTab, tab, moveLeft } from '@atlaskit/editor-common/keymaps';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createNewParagraphBelow } from '@atlaskit/editor-common/utils';
 import { GapCursorSelection } from '../../selection/gap-cursor/selection';
 export function captionKeymap() {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, createNewParagraphBelowCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, createNewParagraphBelowCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, getOutOfCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, getOutOfCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, selectParentMediaSingle, list);
-  keymaps.bindKeymapWithCommand(keymaps.shiftTab.common, selectParentMediaSingle, list);
-  keymaps.bindKeymapWithCommand(keymaps.tab.common, getOutOfCaption, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveLeft.common, gapCursorSelectLeftParentMediaSingle, list);
+  bindKeymapWithCommand(moveDown.common, createNewParagraphBelowCaption, list);
+  bindKeymapWithCommand(enter.common, createNewParagraphBelowCaption, list);
+  bindKeymapWithCommand(moveDown.common, getOutOfCaption, list);
+  bindKeymapWithCommand(enter.common, getOutOfCaption, list);
+  bindKeymapWithCommand(moveUp.common, selectParentMediaSingle, list);
+  bindKeymapWithCommand(shiftTab.common, selectParentMediaSingle, list);
+  bindKeymapWithCommand(tab.common, getOutOfCaption, list);
+  bindKeymapWithCommand(moveLeft.common, gapCursorSelectLeftParentMediaSingle, list);
   return keymap(list);
 }
 var createNewParagraphBelowCaption = function createNewParagraphBelowCaption(state, dispatch) {

package/dist/esm/plugins/help-dialog/index.js

@@ -4,8 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React from 'react';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import * as keymaps from '../../keymaps';
-import { openHelp, tooltip } from '../../keymaps';
+import { bindKeymapWithCommand, openHelp, tooltip } from '@atlaskit/editor-common/keymaps';
 import WithPluginState from '../../ui/WithPluginState';
 import { HelpDialogLoader } from './ui/HelpDialogLoader';
 import { pluginKey as quickInsertPluginKey } from '../quick-insert';
@@ -116,7 +115,7 @@ var helpDialog = function helpDialog() {
 };
 var keymapPlugin = function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.openHelp.common, function (state, dispatch) {
+  bindKeymapWithCommand(openHelp.common, function (state, dispatch) {
     var tr = state.tr;
     var isVisible = tr.getMeta(pluginKey);
     if (!isVisible) {

package/dist/esm/plugins/media/pm-plugins/alt-text/keymap.js

@@ -1,9 +1,9 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../../keymaps';
+import { bindKeymapWithCommand, addAltText, escape } from '@atlaskit/editor-common/keymaps';
 import { openMediaAltTextMenu, closeMediaAltTextMenu } from './commands';
 export default function keymapPlugin(schema, editorAnalyticsAPI) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.addAltText.common, openMediaAltTextMenu(editorAnalyticsAPI), list);
-  keymaps.bindKeymapWithCommand(keymaps.escape.common, closeMediaAltTextMenu, list);
+  bindKeymapWithCommand(addAltText.common, openMediaAltTextMenu(editorAnalyticsAPI), list);
+  bindKeymapWithCommand(escape.common, closeMediaAltTextMenu, list);
   return keymap(list);
 }

package/dist/esm/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -20,7 +20,7 @@ import { messages } from '../messages';
 import { injectIntl } from 'react-intl-next';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { PanelTextInput } from '@atlaskit/editor-common/ui';
-import * as keymaps from '../../../../../keymaps';
+import { escape } from '@atlaskit/editor-common/keymaps';
 import { ToolTipContent } from '../../../../../keymaps';
 import { closeMediaAltTextMenu, updateAltText } from '../commands';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
@@ -133,7 +133,7 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
       var backButtonMessage = formatMessage(messages.back);
       var backButtonMessageComponent = jsx(ToolTipContent, {
         description: backButtonMessage,
-        keymap: keymaps.escape,
+        keymap: escape,
         shortcutOverride: "Esc"
       });
       var errorsList = (this.state.validationErrors || []).map(function (error, index) {

package/dist/esm/plugins/media/pm-plugins/keymap.js

@@ -1,6 +1,6 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, undo, enter, tab, moveLeft, moveRight, moveDown, insertNewLine } from '@atlaskit/editor-common/keymaps';
 import { stateKey } from '../pm-plugins/plugin-key';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
@@ -9,15 +9,15 @@ export function keymapPlugin(options, editorAnalyticsAPI) {
   var list = {};
   var _ref = options || {},
     featureFlags = _ref.featureFlags;
-  keymaps.bindKeymapWithCommand(keymaps.undo.common, ignoreLinksInSteps, list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, splitMediaGroup, list);
+  bindKeymapWithCommand(undo.common, ignoreLinksInSteps, list);
+  bindKeymapWithCommand(enter.common, splitMediaGroup, list);
   if (getMediaFeatureFlag('captions', featureFlags)) {
-    keymaps.bindKeymapWithCommand(keymaps.moveDown.common, insertAndSelectCaption(editorAnalyticsAPI), list);
-    keymaps.bindKeymapWithCommand(keymaps.tab.common, insertAndSelectCaption(editorAnalyticsAPI), list);
-    keymaps.bindKeymapWithCommand(keymaps.moveLeft.common, arrowLeftFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
-    keymaps.bindKeymapWithCommand(keymaps.moveRight.common, arrowRightFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
+    bindKeymapWithCommand(moveDown.common, insertAndSelectCaption(editorAnalyticsAPI), list);
+    bindKeymapWithCommand(tab.common, insertAndSelectCaption(editorAnalyticsAPI), list);
+    bindKeymapWithCommand(moveLeft.common, arrowLeftFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
+    bindKeymapWithCommand(moveRight.common, arrowRightFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
   }
-  keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, splitMediaGroup, list);
+  bindKeymapWithCommand(insertNewLine.common, splitMediaGroup, list);
   return keymap(list);
 }
 var ignoreLinksInSteps = function ignoreLinksInSteps(state) {

package/dist/esm/plugins/media/pm-plugins/linking/keymap.js

@@ -1,8 +1,8 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../../keymaps';
+import { bindKeymapWithCommand, addLink } from '@atlaskit/editor-common/keymaps';
 import { showLinkingToolbarWithMediaTypeCheck } from '../../commands/linking';
 export default function keymapPlugin(schema) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.addLink.common, showLinkingToolbarWithMediaTypeCheck, list);
+  bindKeymapWithCommand(addLink.common, showLinkingToolbarWithMediaTypeCheck, list);
   return keymap(list);
 }

package/dist/esm/plugins/status/keymap.js

@@ -1,10 +1,10 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../keymaps';
+import { bindKeymapWithCommand, enter, tab } from '../../keymaps';
 import { mayGetStatusAtSelection } from './utils';
 export function keymapPlugin() {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, consumeKeyEvent, list);
-  keymaps.bindKeymapWithCommand(keymaps.tab.common, consumeKeyEvent, list);
+  bindKeymapWithCommand(enter.common, consumeKeyEvent, list);
+  bindKeymapWithCommand(tab.common, consumeKeyEvent, list);
   return keymap(list);
 }