@atlaskit/editor-core 188.0.12 → 188.2.0

package/dist/esm/plugins/media/utils/media-common.js

@@ -1,11 +1,8 @@
+import { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, endPositionOfParent, GapCursorSelection, startPositionOfParent } from '@atlaskit/editor-common/selection';
+import { createNewParagraphBelow, createParagraphNear } from '@atlaskit/editor-common/utils';
 import { deleteSelection, splitBlock } from '@atlaskit/editor-prosemirror/commands';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
-import { createParagraphNear, createNewParagraphBelow } from '@atlaskit/editor-common/utils';
-import { mapSlice } from '@atlaskit/editor-common/utils';
-import { walkUpTreeUntil, removeNestedEmptyEls, unwrap } from '@atlaskit/editor-common/utils';
-import { isImage } from './is-image';
-import { GapCursorSelection, atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, endPositionOfParent, startPositionOfParent } from '@atlaskit/editor-common/selection';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
 var isTemporary = function isTemporary(id) {
   return id.indexOf('temporary:') === 0;
@@ -164,107 +161,6 @@ export var copyOptionalAttrsFromMediaState = function copyOptionalAttrsFromMedia
     }
   });
 };
-export var transformSliceToCorrectMediaWrapper = function transformSliceToCorrectMediaWrapper(slice, schema) {
-  var _schema$nodes = schema.nodes,
-    mediaGroup = _schema$nodes.mediaGroup,
-    mediaSingle = _schema$nodes.mediaSingle,
-    media = _schema$nodes.media;
-  return mapSlice(slice, function (node, parent) {
-    if (!parent && node.type === media) {
-      if (mediaSingle && (isImage(node.attrs.__fileMimeType) || node.attrs.type === 'external')) {
-        return mediaSingle.createChecked({}, node);
-      } else {
-        return mediaGroup.createChecked({}, [node]);
-      }
-    }
-    return node;
-  });
-};
-
-/**
- * Check base styles to see if an element will be invisible when rendered in a document.
- * @param element
- */
-var isElementInvisible = function isElementInvisible(element) {
-  return element.style.opacity === '0' || element.style.display === 'none' || element.style.visibility === 'hidden';
-};
-var VALID_TAGS_CONTAINER = ['DIV', 'TD'];
-function canContainImage(element) {
-  if (!element) {
-    return false;
-  }
-  return VALID_TAGS_CONTAINER.indexOf(element.tagName) !== -1;
-}
-
-/**
- * Given a html string, we attempt to hoist any nested `<img>` tags,
- * not directly wrapped by a `<div>` as ProseMirror no-op's
- * on those scenarios.
- * @param html
- */
-export var unwrapNestedMediaElements = function unwrapNestedMediaElements(html) {
-  var parser = new DOMParser();
-  var doc = parser.parseFromString(html, 'text/html');
-  var wrapper = doc.body;
-
-  // Remove Google Doc's wrapper <b> el
-  var docsWrapper = wrapper.querySelector('b[id^="docs-internal-guid-"]');
-  if (docsWrapper) {
-    unwrap(wrapper, docsWrapper);
-  }
-  var imageTags = wrapper.querySelectorAll('img');
-  if (!imageTags.length) {
-    return html;
-  }
-  imageTags.forEach(function (imageTag) {
-    // Capture the immediate parent, we may remove the media from here later.
-    var mediaParent = imageTag.parentElement;
-    if (!mediaParent) {
-      return;
-    }
-
-    // If either the parent or the image itself contains styles that would make
-    // them invisible on copy, dont paste them.
-    if (isElementInvisible(mediaParent) || isElementInvisible(imageTag)) {
-      mediaParent.removeChild(imageTag);
-      return;
-    }
-
-    // If its wrapped by a valid container we assume its safe to bypass.
-    // ProseMirror should handle these cases properly.
-    if (canContainImage(mediaParent) || mediaParent instanceof HTMLSpanElement && mediaParent.closest('[class*="emoji-common"]')) {
-      return;
-    }
-
-    // Find the top most element that the parent has a valid container for the image.
-    // Stop just before found the wrapper
-    var insertBeforeElement = walkUpTreeUntil(mediaParent, function (element) {
-      // If is at the top just use this element as reference
-      if (element.parentElement === wrapper) {
-        return true;
-      }
-      return canContainImage(element.parentElement);
-    });
-
-    // Here we try to insert the media right after its top most valid parent element
-    // Unless its the last element in our structure then we will insert above it.
-    if (insertBeforeElement && insertBeforeElement.parentElement) {
-      // Insert as close as possible to the most closest valid element index in the tree.
-      insertBeforeElement.parentElement.insertBefore(imageTag, insertBeforeElement.nextElementSibling || insertBeforeElement);
-
-      // Attempt to clean up lines left behind by the image
-      mediaParent.innerText = mediaParent.innerText.trim();
-      // Walk up and delete empty elements left over after removing the image tag
-      removeNestedEmptyEls(mediaParent);
-    }
-  });
-
-  // If last child is a hardbreak we don't want it
-  if (wrapper.lastElementChild && wrapper.lastElementChild.tagName === 'BR') {
-    wrapper.removeChild(wrapper.lastElementChild);
-  }
-  return wrapper.innerHTML;
-};
 export var getMediaNodeFromSelection = function getMediaNodeFromSelection(state) {
   if (!isSelectionMediaSingleNode(state)) {
     return null;

package/dist/esm/plugins/media/utils/media-single.js

@@ -1,17 +1,16 @@
 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 { getMaxWidthForNestedNodeNext, getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
+import { checkNodeDown, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { safeInsert as pmSafeInsert, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { checkNodeDown, isEmptyParagraph, mapSlice } from '@atlaskit/editor-common/utils';
-import { getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
-import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { safeInsert, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
-import { isImage } from './is-image';
+import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
-import { getRandomHex } from '@atlaskit/media-common';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { isImage } from './is-image';
 var getInsertMediaAnalytics = function getInsertMediaAnalytics(inputMethod, fileExtension) {
   return {
     action: ACTION.INSERTED,
@@ -160,65 +159,6 @@ export var createMediaSingleNode = function createMediaSingleNode(schema, collec
     return mediaSingle.createChecked(extendedMediaSingleAttrs, mediaNode);
   };
 };
-export function transformSliceForMedia(slice, schema) {
-  var _schema$nodes2 = schema.nodes,
-    mediaSingle = _schema$nodes2.mediaSingle,
-    layoutSection = _schema$nodes2.layoutSection,
-    table = _schema$nodes2.table,
-    bulletList = _schema$nodes2.bulletList,
-    orderedList = _schema$nodes2.orderedList,
-    media = _schema$nodes2.media,
-    mediaInline = _schema$nodes2.mediaInline,
-    expand = _schema$nodes2.expand,
-    nestedExpand = _schema$nodes2.nestedExpand;
-  return function (selection) {
-    var newSlice = slice;
-    if (hasParentNodeOfType([layoutSection, table, bulletList, orderedList, expand, nestedExpand])(selection)) {
-      newSlice = mapSlice(newSlice, function (node) {
-        var extendedOrLegacyAttrs = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
-          layout: node.attrs.layout,
-          widthType: node.attrs.widthType,
-          width: node.attrs.width
-        } : {
-          layout: node.attrs.layout
-        };
-        var attrs = {};
-        if (hasParentNodeOfType([layoutSection, table])(selection)) {
-          // Supports layouts
-          attrs = _objectSpread({}, extendedOrLegacyAttrs);
-        } else if (hasParentNodeOfType([bulletList, orderedList, expand, nestedExpand])(selection)) {
-          // does not support other layouts
-          attrs = _objectSpread(_objectSpread({}, extendedOrLegacyAttrs), {}, {
-            layout: 'center'
-          });
-        }
-        return node.type.name === 'mediaSingle' ? mediaSingle.createChecked(attrs, node.content, node.marks) : node;
-      });
-    }
-    var __mediaTraceId = getRandomHex(8);
-    newSlice = mapSlice(newSlice, function (node) {
-      // This logic is duplicated in editor-plugin-ai where external images can be inserted
-      // from external sources through the use of AI.  The editor-plugin-ai package is avoiding
-      // sharing dependencies with editor-core to support products using it with various versions
-      // of editor packages.
-      // The duplication is in the following file:
-      // packages/editor/editor-plugin-ai/src/prebuilt/content-transformers/markdown-to-pm/markdown-transformer.ts
-      if (node.type.name === 'media') {
-        return media.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
-          __external: node.attrs.type === 'external',
-          __mediaTraceId: node.attrs.type === 'external' ? null : __mediaTraceId
-        }), node.content, node.marks);
-      }
-      if (node.type.name === 'mediaInline') {
-        return mediaInline.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
-          __mediaTraceId: __mediaTraceId
-        }), node.content, node.marks);
-      }
-      return node;
-    });
-    return newSlice;
-  };
-}
 export function isCaptionNode(editorView) {
   var $from = editorView.state.selection.$from;
   var immediateWrapperParentNode = editorView.state.doc.nodeAt($from.before(Math.max($from.depth, 1)));

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

@@ -6,7 +6,7 @@ import keymap from './pm-plugins/keymaps';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../analytics';
 import { IconPanel, IconPanelNote, IconPanelSuccess, IconPanelWarning, IconPanelError } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { messages } from '@atlaskit/editor-plugin-block-type/messages';
+import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCustomPanel } from '@atlaskit/editor-common/quick-insert';
 import { T50 } from '@atlaskit/theme/colors';
 import { insertPanelWithAnalytics } from './actions';
@@ -49,9 +49,9 @@ var panelPlugin = function panelPlugin(_ref) {
         var formatMessage = _ref3.formatMessage;
         var quickInsertOptions = [{
           id: 'infopanel',
-          title: formatMessage(messages.infoPanel),
+          title: formatMessage(blockTypeMessages.infoPanel),
           keywords: ['panel'],
-          description: formatMessage(messages.infoPanelDescription),
+          description: formatMessage(blockTypeMessages.infoPanelDescription),
           priority: 800,
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconPanel, null);
@@ -66,8 +66,8 @@ var panelPlugin = function panelPlugin(_ref) {
           }
         }, {
           id: 'notepanel',
-          title: formatMessage(messages.notePanel),
-          description: formatMessage(messages.notePanelDescription),
+          title: formatMessage(blockTypeMessages.notePanel),
+          description: formatMessage(blockTypeMessages.notePanelDescription),
           priority: 1000,
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconPanelNote, null);
@@ -82,8 +82,8 @@ var panelPlugin = function panelPlugin(_ref) {
           }
         }, {
           id: 'successpanel',
-          title: formatMessage(messages.successPanel),
-          description: formatMessage(messages.successPanelDescription),
+          title: formatMessage(blockTypeMessages.successPanel),
+          description: formatMessage(blockTypeMessages.successPanelDescription),
           keywords: ['tip'],
           priority: 1000,
           icon: function icon() {
@@ -99,8 +99,8 @@ var panelPlugin = function panelPlugin(_ref) {
           }
         }, {
           id: 'warningpanel',
-          title: formatMessage(messages.warningPanel),
-          description: formatMessage(messages.warningPanelDescription),
+          title: formatMessage(blockTypeMessages.warningPanel),
+          description: formatMessage(blockTypeMessages.warningPanelDescription),
           priority: 1000,
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconPanelWarning, null);
@@ -115,8 +115,8 @@ var panelPlugin = function panelPlugin(_ref) {
           }
         }, {
           id: 'errorpanel',
-          title: formatMessage(messages.errorPanel),
-          description: formatMessage(messages.errorPanelDescription),
+          title: formatMessage(blockTypeMessages.errorPanel),
+          description: formatMessage(blockTypeMessages.errorPanelDescription),
           priority: 1000,
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconPanelError, null);
@@ -133,8 +133,8 @@ var panelPlugin = function panelPlugin(_ref) {
         if (options.allowCustomPanel && options.allowCustomPanelEdit) {
           quickInsertOptions.push({
             id: 'custompanel',
-            title: formatMessage(messages.customPanel),
-            description: formatMessage(messages.customPanelDescription),
+            title: formatMessage(blockTypeMessages.customPanel),
+            description: formatMessage(blockTypeMessages.customPanelDescription),
             priority: 1000,
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconCustomPanel, null);

package/dist/esm/plugins/paste/handlers.js

@@ -14,10 +14,9 @@ import uuid from 'uuid/v4';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell, isInListItem } from '../../utils';
 import { mapSlice } from '../../utils/slice';
-import { INPUT_METHOD } from '../analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { runMacroAutoConvert } from '../macro';
-import { insertMediaAsMediaSingle } from '../media/utils/media-single';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
 import { linkifyContent, isListItemNode, isListNode, canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
 import { insertSliceForLists } from './edge-cases';
@@ -543,12 +542,13 @@ function isOnlyMediaSingle(state, slice) {
   var mediaSingle = state.schema.nodes.mediaSingle;
   return mediaSingle && slice.content.childCount === 1 && slice.content.firstChild.type === mediaSingle;
 }
-export function handleMediaSingle(inputMethod, editorAnalyticsAPI) {
+export function handleMediaSingle(inputMethod, insertMediaAsMediaSingle) {
   return function (slice) {
     return function (state, dispatch, view) {
       if (view) {
         if (isOnlyMedia(state, slice)) {
-          return insertMediaAsMediaSingle(view, slice.content.firstChild, inputMethod, editorAnalyticsAPI);
+          var _insertMediaAsMediaSi;
+          return (_insertMediaAsMediaSi = insertMediaAsMediaSingle === null || insertMediaAsMediaSingle === void 0 ? void 0 : insertMediaAsMediaSingle(view, slice.content.firstChild, inputMethod)) !== null && _insertMediaAsMediaSi !== void 0 ? _insertMediaAsMediaSi : false;
         }
         if (insideTable(state) && isOnlyMediaSingle(state, slice)) {
           var tr = state.tr.replaceSelection(slice);

package/dist/esm/plugins/paste/plugins/media.js

@@ -0,0 +1,172 @@
+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 { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { mapSlice, unwrap, removeNestedEmptyEls, walkUpTreeUntil } from '@atlaskit/editor-common/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { getRandomHex } from '@atlaskit/media-common';
+export function transformSliceForMedia(slice, schema) {
+  var _schema$nodes = schema.nodes,
+    mediaSingle = _schema$nodes.mediaSingle,
+    layoutSection = _schema$nodes.layoutSection,
+    table = _schema$nodes.table,
+    bulletList = _schema$nodes.bulletList,
+    orderedList = _schema$nodes.orderedList,
+    media = _schema$nodes.media,
+    mediaInline = _schema$nodes.mediaInline,
+    expand = _schema$nodes.expand,
+    nestedExpand = _schema$nodes.nestedExpand;
+  return function (selection) {
+    var newSlice = slice;
+    if (hasParentNodeOfType([layoutSection, table, bulletList, orderedList, expand, nestedExpand])(selection)) {
+      newSlice = mapSlice(newSlice, function (node) {
+        var extendedOrLegacyAttrs = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
+          layout: node.attrs.layout,
+          widthType: node.attrs.widthType,
+          width: node.attrs.width
+        } : {
+          layout: node.attrs.layout
+        };
+        var attrs = {};
+        if (hasParentNodeOfType([layoutSection, table])(selection)) {
+          // Supports layouts
+          attrs = _objectSpread({}, extendedOrLegacyAttrs);
+        } else if (hasParentNodeOfType([bulletList, orderedList, expand, nestedExpand])(selection)) {
+          // does not support other layouts
+          attrs = _objectSpread(_objectSpread({}, extendedOrLegacyAttrs), {}, {
+            layout: 'center'
+          });
+        }
+        return node.type.name === 'mediaSingle' ? mediaSingle.createChecked(attrs, node.content, node.marks) : node;
+      });
+    }
+    var __mediaTraceId = getRandomHex(8);
+    newSlice = mapSlice(newSlice, function (node) {
+      // This logic is duplicated in editor-plugin-ai where external images can be inserted
+      // from external sources through the use of AI.  The editor-plugin-ai package is avoiding
+      // sharing dependencies with editor-core to support products using it with various versions
+      // of editor packages.
+      // The duplication is in the following file:
+      // packages/editor/editor-plugin-ai/src/prebuilt/content-transformers/markdown-to-pm/markdown-transformer.ts
+      if (node.type.name === 'media') {
+        return media.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
+          __external: node.attrs.type === 'external',
+          __mediaTraceId: node.attrs.type === 'external' ? null : __mediaTraceId
+        }), node.content, node.marks);
+      }
+      if (node.type.name === 'mediaInline') {
+        return mediaInline.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
+          __mediaTraceId: __mediaTraceId
+        }), node.content, node.marks);
+      }
+      return node;
+    });
+    return newSlice;
+  };
+}
+
+// TODO move this to editor-common
+export var isImage = function isImage(fileType) {
+  return !!fileType && (fileType.indexOf('image/') > -1 || fileType.indexOf('video/') > -1);
+};
+export var transformSliceToCorrectMediaWrapper = function transformSliceToCorrectMediaWrapper(slice, schema) {
+  var _schema$nodes2 = schema.nodes,
+    mediaGroup = _schema$nodes2.mediaGroup,
+    mediaSingle = _schema$nodes2.mediaSingle,
+    media = _schema$nodes2.media;
+  return mapSlice(slice, function (node, parent) {
+    if (!parent && node.type === media) {
+      if (mediaSingle && (isImage(node.attrs.__fileMimeType) || node.attrs.type === 'external')) {
+        return mediaSingle.createChecked({}, node);
+      } else {
+        return mediaGroup.createChecked({}, [node]);
+      }
+    }
+    return node;
+  });
+};
+
+/**
+ * Check base styles to see if an element will be invisible when rendered in a document.
+ * @param element
+ */
+var isElementInvisible = function isElementInvisible(element) {
+  return element.style.opacity === '0' || element.style.display === 'none' || element.style.visibility === 'hidden';
+};
+var VALID_TAGS_CONTAINER = ['DIV', 'TD'];
+function canContainImage(element) {
+  if (!element) {
+    return false;
+  }
+  return VALID_TAGS_CONTAINER.indexOf(element.tagName) !== -1;
+}
+
+/**
+ * Given a html string, we attempt to hoist any nested `<img>` tags,
+ * not directly wrapped by a `<div>` as ProseMirror no-op's
+ * on those scenarios.
+ * @param html
+ */
+export var unwrapNestedMediaElements = function unwrapNestedMediaElements(html) {
+  var parser = new DOMParser();
+  var doc = parser.parseFromString(html, 'text/html');
+  var wrapper = doc.body;
+
+  // Remove Google Doc's wrapper <b> el
+  var docsWrapper = wrapper.querySelector('b[id^="docs-internal-guid-"]');
+  if (docsWrapper) {
+    unwrap(wrapper, docsWrapper);
+  }
+  var imageTags = wrapper.querySelectorAll('img');
+  if (!imageTags.length) {
+    return html;
+  }
+  imageTags.forEach(function (imageTag) {
+    // Capture the immediate parent, we may remove the media from here later.
+    var mediaParent = imageTag.parentElement;
+    if (!mediaParent) {
+      return;
+    }
+
+    // If either the parent or the image itself contains styles that would make
+    // them invisible on copy, dont paste them.
+    if (isElementInvisible(mediaParent) || isElementInvisible(imageTag)) {
+      mediaParent.removeChild(imageTag);
+      return;
+    }
+
+    // If its wrapped by a valid container we assume its safe to bypass.
+    // ProseMirror should handle these cases properly.
+    if (canContainImage(mediaParent) || mediaParent instanceof HTMLSpanElement && mediaParent.closest('[class*="emoji-common"]')) {
+      return;
+    }
+
+    // Find the top most element that the parent has a valid container for the image.
+    // Stop just before found the wrapper
+    var insertBeforeElement = walkUpTreeUntil(mediaParent, function (element) {
+      // If is at the top just use this element as reference
+      if (element.parentElement === wrapper) {
+        return true;
+      }
+      return canContainImage(element.parentElement);
+    });
+
+    // Here we try to insert the media right after its top most valid parent element
+    // Unless its the last element in our structure then we will insert above it.
+    if (insertBeforeElement && insertBeforeElement.parentElement) {
+      // Insert as close as possible to the most closest valid element index in the tree.
+      insertBeforeElement.parentElement.insertBefore(imageTag, insertBeforeElement.nextElementSibling || insertBeforeElement);
+
+      // Attempt to clean up lines left behind by the image
+      mediaParent.innerText = mediaParent.innerText.trim();
+      // Walk up and delete empty elements left over after removing the image tag
+      removeNestedEmptyEls(mediaParent);
+    }
+  });
+
+  // If last child is a hardbreak we don't want it
+  if (wrapper.lastElementChild && wrapper.lastElementChild.tagName === 'BR') {
+    wrapper.removeChild(wrapper.lastElementChild);
+  }
+  return wrapper.innerHTML;
+};

package/dist/esm/plugins/paste/pm-plugins/analytics.js

@@ -239,10 +239,10 @@ export var handleCodeBlockWithAnalytics = function handleCodeBlockWithAnalytics(
     type: PasteTypes.plain
   }))(handleCodeBlock(text));
 };
-export var handleMediaSingleWithAnalytics = function handleMediaSingleWithAnalytics(view, event, slice, type, editorAnalyticsAPI) {
+export var handleMediaSingleWithAnalytics = function handleMediaSingleWithAnalytics(view, event, slice, type, insertMediaAsMediaSingle) {
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
-  }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD, editorAnalyticsAPI)(slice));
+  }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD, insertMediaAsMediaSingle)(slice));
 };
 export var handlePastePreservingMarksWithAnalytics = function handlePastePreservingMarksWithAnalytics(view, event, slice, type, pluginInjectionApi) {
   var _pluginInjectionApi$c2;

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

@@ -8,7 +8,7 @@ import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { mapChildren } from '../../../utils/slice';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
 import { isPastedFile as isPastedFileFromEvent } from '@atlaskit/editor-common/paste';
-import { transformSliceForMedia } from '../../media/utils/media-single';
+import { transformSliceForMedia, transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../plugins/media';
 import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExcel, htmlHasInvalidLinkTags, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from '../util';
 import { linkifyContent } from '@atlaskit/editor-common/utils';
 import { transformSliceNestedExpandToExpand } from '../../expand/utils';
@@ -18,7 +18,6 @@ import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextW
 import { ACTION, analyticsPluginKey, INPUT_METHOD, PasteTypes } from '../../analytics';
 import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
 import { measureRender } from '@atlaskit/editor-common/utils';
-import { transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../../media/utils/media-common';
 import { upgradeTextToLists, splitParagraphs } from '../commands';
 import { md } from '@atlaskit/editor-common/paste';
 import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
@@ -102,7 +101,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
       },
       handlePaste: function handlePaste(view, rawEvent, slice) {
-        var _text, _analyticsPlugin$perf, _schema$nodes, _schema$nodes2, _schema$nodes3, _pluginInjectionApi$a;
+        var _text, _analyticsPlugin$perf, _schema$nodes, _schema$nodes2, _schema$nodes3, _pluginInjectionApi$m;
         var event = rawEvent;
         if (!event.clipboardData) {
           return false;
@@ -266,7 +265,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (handleCodeBlockWithAnalytics(view, event, slice, text)(state, dispatch)) {
           return true;
         }
-        if (handleMediaSingleWithAnalytics(view, event, slice, isPastedFile ? PasteTypes.binary : PasteTypes.richText, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(state, dispatch, view)) {
+        if (handleMediaSingleWithAnalytics(view, event, slice, isPastedFile ? PasteTypes.binary : PasteTypes.richText, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$m = pluginInjectionApi.media) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.actions.insertMediaAsMediaSingle)(state, dispatch, view)) {
           return true;
         }
         if (handleSelectedTableWithAnalytics(view, event, slice)(state, dispatch)) {

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

@@ -14,7 +14,7 @@ import RedoIcon from '@atlaskit/icon/glyph/redo';
 import { undo as undoKeymap, redo as redoKeymap, ToolTipContent, tooltip } from '../../../../keymaps';
 import { separatorStyles, buttonGroupStyle } from '@atlaskit/editor-common/styles';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
-import { messages } from '../../messages';
+import { undoRedoMessages } from '@atlaskit/editor-common/messages';
 import { createTypeAheadTools } from '../../../type-ahead/api';
 import { undoFromToolbar, redoFromToolbar } from '../../commands';
 import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
@@ -64,8 +64,8 @@ export var ToolbarUndoRedo = /*#__PURE__*/function (_PureComponent) {
       var handleRedo = function handleRedo() {
         forceFocus(editorView)(redoFromToolbar);
       };
-      var labelUndo = formatMessage(messages.undo);
-      var labelRedo = formatMessage(messages.redo);
+      var labelUndo = formatMessage(undoRedoMessages.undo);
+      var labelRedo = formatMessage(undoRedoMessages.redo);
       var canUndo = historyState.canUndo,
         canRedo = historyState.canRedo;
       return jsx("span", {

package/dist/esm/ui/Alignment/index.js

@@ -11,7 +11,7 @@ import { PureComponent } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { IconMap } from '../../plugins/alignment/ui/ToolbarAlignment/icon-map';
 import AlignmentButton from './AlignmentButton';
-import { alignmentMessages } from './messages';
+import { alignmentMessages } from '@atlaskit/editor-common/messages';
 import { alignmentWrapper } from './styles';
 import { alignLeft } from '../../keymaps';
 var alignmentOptions = [{

package/dist/esm/ui/WithHelpTrigger/index.js

@@ -12,12 +12,7 @@ import PropTypes from 'prop-types';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '../../plugins/analytics';
 import { createDispatch } from '../../event-dispatcher';
 import { analyticsEventKey } from '../../plugins/analytics/consts';
-// TODO - ED-20189 Source deprecatedOpenHelpCommand from help-dialog-plugin
-import { openHelpCommand } from '../../plugins/help-dialog/commands';
-/**
- * @deprecated
- * Use WithHelpTrigger from @atlaskit/editor-plugin-help-dialog which uses pluginInjectionApi
- */
+import { deprecatedOpenHelpCommand } from '@atlaskit/editor-plugin-help-dialog';
 var WithHelpTrigger = /*#__PURE__*/function (_React$Component) {
   _inherits(WithHelpTrigger, _React$Component);
   var _super = _createSuper(WithHelpTrigger);
@@ -44,7 +39,7 @@ var WithHelpTrigger = /*#__PURE__*/function (_React$Component) {
       });
       var editorView = editorActions._privateGetEditorView();
       if (editorView) {
-        openHelpCommand(editorView.state.tr, editorView.dispatch);
+        deprecatedOpenHelpCommand(editorView.state.tr, editorView.dispatch);
       }
     });
     return _this;

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "188.0.12";
+export var version = "188.2.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/labs/next/presets/default.d.ts

@@ -259,6 +259,9 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             };
         }, undefined>];
         sharedState: import("../../../plugins/media/pm-plugins/types").MediaPluginState | null;
+        actions: {
+            insertMediaAsMediaSingle: import("../../../plugins/media/utils/media-single").InsertMediaAsMediaSingle;
+        };
     }, import("@atlaskit/editor-plugin-media/types").MediaOptions | undefined>>];
 }, ((editorView: import("prosemirror-view").EditorView) => void) | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
     sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;
@@ -586,6 +589,9 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             };
         }, undefined>];
         sharedState: import("../../../plugins/media/pm-plugins/types").MediaPluginState | null;
+        actions: {
+            insertMediaAsMediaSingle: import("../../../plugins/media/utils/media-single").InsertMediaAsMediaSingle;
+        };
     }, import("@atlaskit/editor-plugin-media/types").MediaOptions | undefined>>];
 }, ((editorView: import("prosemirror-view").EditorView) => void) | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
     sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;

package/dist/types/plugins/annotation/toolbar.d.ts

@@ -1,21 +1,4 @@
 import type { IntlShape } from 'react-intl-next';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { FloatingToolbarConfig } from '@atlaskit/editor-common/types';
-export declare const annotationMessages: {
-    createComment: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    createCommentInvalid: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    toolbar: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-};
 export declare const buildToolbar: (state: EditorState, intl: IntlShape, isToolbarAbove?: boolean) => FloatingToolbarConfig | undefined;

package/dist/types/plugins/index.d.ts

@@ -5,7 +5,6 @@ export { default as collabEditPlugin } from './collab-edit';
 export { default as datePlugin } from './date';
 export { default as extensionPlugin } from './extension';
 export { default as fakeTextCursorPlugin } from './fake-text-cursor';
-export { default as helpDialogPlugin } from './help-dialog';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as layoutPlugin } from './layout';