@atlaskit/editor-core 187.23.0 → 187.23.2

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/help-dialog/ui/index.js

@@ -8,7 +8,7 @@ import { browser } from '@atlaskit/editor-common/utils';
 import CrossIcon from '@atlaskit/icon/glyph/cross';
 import AkModalDialog, { ModalTransition, useModal } from '@atlaskit/modal-dialog';
 import { header, footer, contentWrapper, line, content, row, codeSm, codeMd, codeLg, title, column, dialogHeader } from './styles';
-import * as keymaps from '../../../keymaps';
+import { navToFloatingToolbar, navToEditorToolbar, toggleBold, toggleItalic, toggleUnderline, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleOrderedList, insertRule, addLink, setNormalText, alignLeft, clearFormatting, undo, redo, pastePlainText, addInlineComment, toggleCode, openHelp, toggleBulletList, toggleBlockQuote } from '@atlaskit/editor-common/keymaps';
 import ToolbarButton from '../../../ui/ToolbarButton';
 import { toolbarMessages, listMessages } from '@atlaskit/editor-common/messages';
 import { messages as insertBlockMessages } from '../../insert-block/ui/ToolbarInsertBlock/messages';
@@ -65,51 +65,51 @@ const navigationKeymaps = ({
 }) => [{
   name: formatMessage(toolbarMessages.navigateToEditorToolbar),
   type: 'navigation',
-  keymap: () => keymaps.navToEditorToolbar
+  keymap: () => navToEditorToolbar
 }, {
   name: formatMessage(toolbarMessages.navigateToFloatingToolbar),
   type: 'navigation',
-  keymap: () => keymaps.navToFloatingToolbar
+  keymap: () => navToFloatingToolbar
 }];
 export const formatting = ({
   formatMessage
 }) => [{
   name: formatMessage(toolbarMessages.bold),
   type: 'strong',
-  keymap: () => keymaps.toggleBold,
+  keymap: () => toggleBold,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "**", jsx(FormattedMessage, toolbarMessages.bold), "**"))
 }, {
   name: formatMessage(toolbarMessages.italic),
   type: 'em',
-  keymap: () => keymaps.toggleItalic,
+  keymap: () => toggleItalic,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "*", jsx(FormattedMessage, toolbarMessages.italic), "*"))
 }, {
   name: formatMessage(toolbarMessages.underline),
   type: 'underline',
-  keymap: () => keymaps.toggleUnderline
+  keymap: () => toggleUnderline
 }, {
   name: formatMessage(toolbarMessages.strike),
   type: 'strike',
-  keymap: () => keymaps.toggleStrikethrough,
+  keymap: () => toggleStrikethrough,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "~~", jsx(FormattedMessage, toolbarMessages.strike), "~~"))
 }, {
   name: formatMessage(toolbarMessages.subscript),
   type: 'subsup',
-  keymap: () => keymaps.toggleSubscript
+  keymap: () => toggleSubscript
 }, {
   name: formatMessage(toolbarMessages.superscript),
   type: 'subsup',
-  keymap: () => keymaps.toggleSuperscript
+  keymap: () => toggleSuperscript
 }, {
   name: formatMessage(blockTypeMessages.heading1),
   type: 'heading',
-  keymap: () => keymaps.toggleHeading1,
+  keymap: () => toggleHeading1,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeSm
   }, "#"), " ", jsx("span", {
@@ -118,7 +118,7 @@ export const formatting = ({
 }, {
   name: formatMessage(blockTypeMessages.heading2),
   type: 'heading',
-  keymap: () => keymaps.toggleHeading2,
+  keymap: () => toggleHeading2,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "##"), " ", jsx("span", {
@@ -127,7 +127,7 @@ export const formatting = ({
 }, {
   name: formatMessage(blockTypeMessages.heading3),
   type: 'heading',
-  keymap: () => keymaps.toggleHeading3,
+  keymap: () => toggleHeading3,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "###"), " ", jsx("span", {
@@ -136,7 +136,7 @@ export const formatting = ({
 }, {
   name: formatMessage(blockTypeMessages.heading4),
   type: 'heading',
-  keymap: () => keymaps.toggleHeading4,
+  keymap: () => toggleHeading4,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "####"), " ", jsx("span", {
@@ -145,7 +145,7 @@ export const formatting = ({
 }, {
   name: formatMessage(blockTypeMessages.heading5),
   type: 'heading',
-  keymap: () => keymaps.toggleHeading5,
+  keymap: () => toggleHeading5,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "#####"), " ", jsx("span", {
@@ -154,7 +154,7 @@ export const formatting = ({
 }, {
   name: formatMessage(blockTypeMessages.heading6),
   type: 'heading',
-  keymap: () => keymaps.toggleHeading6,
+  keymap: () => toggleHeading6,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "######"), " ", jsx("span", {
@@ -163,11 +163,11 @@ export const formatting = ({
 }, {
   name: formatMessage(blockTypeMessages.normal),
   type: 'paragraph',
-  keymap: () => keymaps.setNormalText
+  keymap: () => setNormalText
 }, {
   name: formatMessage(listMessages.orderedList),
   type: 'orderedList',
-  keymap: () => keymaps.toggleOrderedList,
+  keymap: () => toggleOrderedList,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeSm
   }, "1."), " ", jsx("span", {
@@ -176,7 +176,7 @@ export const formatting = ({
 }, {
   name: formatMessage(listMessages.unorderedList),
   type: 'bulletList',
-  keymap: () => keymaps.toggleBulletList,
+  keymap: () => toggleBulletList,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeSm
   }, "*"), " ", jsx("span", {
@@ -185,7 +185,7 @@ export const formatting = ({
 }, {
   name: formatMessage(blockTypeMessages.blockquote),
   type: 'blockquote',
-  keymap: () => keymaps.toggleBlockQuote,
+  keymap: () => toggleBlockQuote,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, '>'), " ", jsx("span", {
@@ -200,21 +200,21 @@ export const formatting = ({
 }, {
   name: formatMessage(insertBlockMessages.horizontalRule),
   type: 'rule',
-  keymap: () => keymaps.insertRule,
+  keymap: () => insertRule,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "---"))
 }, {
   name: formatMessage(insertBlockMessages.link),
   type: 'link',
-  keymap: () => keymaps.addLink,
+  keymap: () => addLink,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "[", jsx(FormattedMessage, insertBlockMessages.link), "](http://a.com)"))
 }, {
   name: formatMessage(toolbarMessages.code),
   type: 'code',
-  keymap: () => keymaps.toggleCode,
+  keymap: () => toggleCode,
   autoFormatting: () => jsx("span", null, jsx("span", {
     css: codeLg
   }, "`", jsx(FormattedMessage, toolbarMessages.code), "`"))
@@ -249,7 +249,7 @@ export const formatting = ({
 }, {
   name: formatMessage(alignmentMessages.alignLeft),
   type: 'alignment',
-  keymap: () => keymaps.alignLeft
+  keymap: () => alignLeft
 }, {
   name: formatMessage(alignmentMessages.alignRight),
   type: 'alignment'
@@ -260,23 +260,23 @@ const otherFormatting = ({
 }) => [{
   name: formatMessage(toolbarMessages.clearFormatting),
   type: 'clearFormatting',
-  keymap: () => keymaps.clearFormatting
+  keymap: () => clearFormatting
 }, {
   name: formatMessage(undoRedoMessages.undo),
   type: 'undo',
-  keymap: () => keymaps.undo
+  keymap: () => undo
 }, {
   name: formatMessage(undoRedoMessages.redo),
   type: 'redo',
-  keymap: () => keymaps.redo
+  keymap: () => redo
 }, {
   name: formatMessage(messages.pastePlainText),
   type: 'paste',
-  keymap: () => keymaps.pastePlainText
+  keymap: () => pastePlainText
 }, {
   name: formatMessage(annotationMessages.createComment),
   type: 'annotation',
-  keymap: () => keymaps.addInlineComment
+  keymap: () => addInlineComment
 }];
 const imageAutoFormat = {
   name: 'Image',
@@ -362,7 +362,7 @@ const ModalFooter = () => jsx("div", {
   css: footer
 }, jsx(FormattedMessage, _extends({}, messages.helpDialogTips, {
   values: {
-    keyMap: getComponentFromKeymap(keymaps.openHelp)
+    keyMap: getComponentFromKeymap(openHelp)
   }
 })));
 class HelpDialog extends React.Component {

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

@@ -1,13 +1,13 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, findShortcutByKeymap, outdent, indent, backspace } from '@atlaskit/editor-common/keymaps';
 import { isTextSelection } from '../../../utils';
 import { getIndentCommand, getOutdentCommand } from '../commands';
-import { INPUT_METHOD } from '../../analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 export function keymapPlugin() {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.indent), getIndentCommand(INPUT_METHOD.KEYBOARD), list);
-  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.outdent), getOutdentCommand(INPUT_METHOD.KEYBOARD), list);
-  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.backspace), (state, dispatch) => {
+  bindKeymapWithCommand(findShortcutByKeymap(indent), getIndentCommand(INPUT_METHOD.KEYBOARD), list);
+  bindKeymapWithCommand(findShortcutByKeymap(outdent), getOutdentCommand(INPUT_METHOD.KEYBOARD), list);
+  bindKeymapWithCommand(findShortcutByKeymap(backspace), (state, dispatch) => {
     const {
       selection
     } = state;

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

@@ -1,20 +1,19 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../keymaps';
-import { indentList, enterKeyCommand, toggleList, backspaceKeyCommand, deleteKeyCommand } from '../commands';
-import { outdentList } from '../commands';
+import { bindKeymapWithCommand, findShortcutByKeymap, toggleOrderedList, toggleBulletList, indentList, outdentList, enter, backspace, deleteKey, findKeyMapForBrowser, forwardDelete } from '@atlaskit/editor-common/keymaps';
+import { indentList as indentListCommand, outdentList as outdentListCommand, enterKeyCommand, toggleList, backspaceKeyCommand, deleteKeyCommand } from '../commands';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 export function keymapPlugin(featureFlags, editorAnalyticsAPI) {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleOrderedList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
-  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBulletList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
-  keymaps.bindKeymapWithCommand(keymaps.indentList.common, indentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), list);
-  keymaps.bindKeymapWithCommand(keymaps.outdentList.common, outdentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags), list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, enterKeyCommand(editorAnalyticsAPI)(featureFlags), list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspaceKeyCommand(editorAnalyticsAPI)(featureFlags), list);
-  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteKeyCommand(editorAnalyticsAPI), list);
+  bindKeymapWithCommand(findShortcutByKeymap(toggleOrderedList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
+  bindKeymapWithCommand(findShortcutByKeymap(toggleBulletList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
+  bindKeymapWithCommand(indentList.common, indentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), list);
+  bindKeymapWithCommand(outdentList.common, outdentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags), list);
+  bindKeymapWithCommand(enter.common, enterKeyCommand(editorAnalyticsAPI)(featureFlags), list);
+  bindKeymapWithCommand(backspace.common, backspaceKeyCommand(editorAnalyticsAPI)(featureFlags), list);
+  bindKeymapWithCommand(deleteKey.common, deleteKeyCommand(editorAnalyticsAPI), list);
 
   // This shortcut is Mac only
-  keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.forwardDelete), deleteKeyCommand(editorAnalyticsAPI), list);
+  bindKeymapWithCommand(findKeyMapForBrowser(forwardDelete), deleteKeyCommand(editorAnalyticsAPI), list);
   return keymap(list);
 }
 export default keymapPlugin;

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-media-single.js

@@ -1,5 +1,5 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, backspace } from '@atlaskit/editor-common/keymaps';
 import { isEmptyNode, isSelectionInsideLastNodeInDocument } from '../../../utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { selectNodeBackward } from '@atlaskit/editor-prosemirror/commands';
@@ -167,6 +167,6 @@ const maybeRemoveMediaSingleNode = schema => {
 export default function keymapPlugin(schema) {
   const list = {};
   const removeMediaSingleCommand = maybeRemoveMediaSingleNode(schema);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, removeMediaSingleCommand, list);
+  bindKeymapWithCommand(backspace.common, removeMediaSingleCommand, list);
   return keymap(list);
 }

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/media/toolbar/index.js

@@ -262,7 +262,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
 
     // Pixel Entry Toolbar Support
     if (getBooleanFF('platform.editor.media.extended-resize-experience') && allowResizing) {
-      toolbarButtons.push({
+      const sizeInput = {
         type: 'custom',
         fallback: [],
         render: editorView => {
@@ -325,7 +325,12 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             }
           });
         }
-      });
+      };
+      if (pluginState.isResizing) {
+        // If the image is resizing then only return `sizeInput` as the only toolbar item
+        return [sizeInput];
+      }
+      toolbarButtons.push(sizeInput);
       toolbarButtons.push({
         type: 'separator'
       });

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

@@ -1,11 +1,11 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../keymaps';
-import { INPUT_METHOD } from '../../analytics';
+import { bindKeymapWithCommand, insertRule, escape } from '@atlaskit/editor-common/keymaps';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { insertHorizontalRule } from '../commands';
 export function keymapPlugin(featureFlags) {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.insertRule.common, insertHorizontalRule(INPUT_METHOD.SHORTCUT, featureFlags), list);
-  keymaps.bindKeymapWithCommand(keymaps.escape.common, () => true, list);
+  bindKeymapWithCommand(insertRule.common, insertHorizontalRule(INPUT_METHOD.SHORTCUT, featureFlags), list);
+  bindKeymapWithCommand(escape.common, () => true, list);
   return keymap(list);
 }
 export default keymapPlugin;

package/dist/es2019/plugins/selection/pm-plugins/gap-cursor-keymap.js

@@ -1,12 +1,12 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, insertNewLine, moveLeft, moveRight, moveUp, moveDown, backspace, deleteKey } from '@atlaskit/editor-common/keymaps';
 import { arrow, deleteNode } from '../gap-cursor/actions';
 import { Direction } from '../gap-cursor/direction';
 import { GapCursorSelection } from '../gap-cursor/selection';
 import { createParagraphNear } from '@atlaskit/editor-prosemirror/commands';
 export default function keymapPlugin() {
   const map = {};
-  keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, (state, dispatch, view) => {
+  bindKeymapWithCommand(insertNewLine.common, (state, dispatch, view) => {
     const isInGapCursor = state.selection instanceof GapCursorSelection;
     // Only operate in gap cursor
     if (!isInGapCursor) {
@@ -14,27 +14,27 @@ export default function keymapPlugin() {
     }
     return createParagraphNear(state, dispatch);
   }, map);
-  keymaps.bindKeymapWithCommand(keymaps.moveLeft.common, (state, dispatch, view) => {
+  bindKeymapWithCommand(moveLeft.common, (state, dispatch, view) => {
     const endOfTextblock = view ? view.endOfTextblock.bind(view) : undefined;
     return arrow(Direction.LEFT, endOfTextblock)(state, dispatch, view);
   }, map);
-  keymaps.bindKeymapWithCommand(keymaps.moveRight.common, (state, dispatch, view) => {
+  bindKeymapWithCommand(moveRight.common, (state, dispatch, view) => {
     const endOfTextblock = view ? view.endOfTextblock.bind(view) : undefined;
     return arrow(Direction.RIGHT, endOfTextblock)(state, dispatch);
   }, map);
-  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, (state, dispatch, view) => {
+  bindKeymapWithCommand(moveUp.common, (state, dispatch, view) => {
     const endOfTextblock = view ? view.endOfTextblock.bind(view) : undefined;
     return arrow(Direction.UP, endOfTextblock)(state, dispatch);
   }, map);
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, (state, dispatch, view) => {
+  bindKeymapWithCommand(moveDown.common, (state, dispatch, view) => {
     const endOfTextblock = view ? view.endOfTextblock.bind(view) : undefined;
     return arrow(Direction.DOWN, endOfTextblock)(state, dispatch);
   }, map);
 
   // default PM's Backspace doesn't handle removing block nodes when cursor is after it
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, deleteNode(Direction.BACKWARD), map);
+  bindKeymapWithCommand(backspace.common, deleteNode(Direction.BACKWARD), map);
 
   // handle Delete key (remove node after the cursor)
-  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteNode(Direction.FORWARD), map);
+  bindKeymapWithCommand(deleteKey.common, deleteNode(Direction.FORWARD), map);
   return keymap(map);
 }

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/undo-redo/pm-plugins/keymaps.js

@@ -1,9 +1,8 @@
-import * as keymaps from '../../../keymaps';
-import { keymap } from '@atlaskit/editor-common/keymaps';
+import { undo, redo, keymap, bindKeymapWithCommand, findKeyMapForBrowser } from '@atlaskit/editor-common/keymaps';
 import { redoFromKeyboard, undoFromKeyboard } from '../commands';
 export function keymapPlugin() {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), redoFromKeyboard, list);
-  keymaps.bindKeymapWithCommand(keymaps.undo.common, undoFromKeyboard, list);
+  bindKeymapWithCommand(findKeyMapForBrowser(redo), redoFromKeyboard, list);
+  bindKeymapWithCommand(undo.common, undoFromKeyboard, list);
   return keymap(list);
 }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.23.0";
+export const version = "187.23.2";
 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.0",
+	"version": "187.23.2",
 	"sideEffects": false
 }

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) {