@atlaskit/editor-core 188.0.12 → 188.2.0

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

@@ -1,14 +1,13 @@
+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';
 const getInsertMediaAnalytics = (inputMethod, fileExtension) => ({
   action: ACTION.INSERTED,
   actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -164,71 +163,6 @@ export const createMediaSingleNode = (schema, collection, maxWidth, minWidth, al
   copyOptionalAttrsFromMediaState(mediaState, mediaNode);
   return mediaSingle.createChecked(extendedMediaSingleAttrs, mediaNode);
 };
-export function transformSliceForMedia(slice, schema) {
-  const {
-    mediaSingle,
-    layoutSection,
-    table,
-    bulletList,
-    orderedList,
-    media,
-    mediaInline,
-    expand,
-    nestedExpand
-  } = schema.nodes;
-  return selection => {
-    let newSlice = slice;
-    if (hasParentNodeOfType([layoutSection, table, bulletList, orderedList, expand, nestedExpand])(selection)) {
-      newSlice = mapSlice(newSlice, node => {
-        const extendedOrLegacyAttrs = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
-          layout: node.attrs.layout,
-          widthType: node.attrs.widthType,
-          width: node.attrs.width
-        } : {
-          layout: node.attrs.layout
-        };
-        let attrs = {};
-        if (hasParentNodeOfType([layoutSection, table])(selection)) {
-          // Supports layouts
-          attrs = {
-            ...extendedOrLegacyAttrs
-          };
-        } else if (hasParentNodeOfType([bulletList, orderedList, expand, nestedExpand])(selection)) {
-          // does not support other layouts
-          attrs = {
-            ...extendedOrLegacyAttrs,
-            layout: 'center'
-          };
-        }
-        return node.type.name === 'mediaSingle' ? mediaSingle.createChecked(attrs, node.content, node.marks) : node;
-      });
-    }
-    const __mediaTraceId = getRandomHex(8);
-    newSlice = mapSlice(newSlice, 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({
-          ...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({
-          ...node.attrs,
-          __mediaTraceId
-        }, node.content, node.marks);
-      }
-      return node;
-    });
-    return newSlice;
-  };
-}
 export function isCaptionNode(editorView) {
   const {
     $from

package/dist/es2019/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';
@@ -46,9 +46,9 @@ const panelPlugin = ({
     }) => {
       let quickInsertOptions = [{
         id: 'infopanel',
-        title: formatMessage(messages.infoPanel),
+        title: formatMessage(blockTypeMessages.infoPanel),
         keywords: ['panel'],
-        description: formatMessage(messages.infoPanelDescription),
+        description: formatMessage(blockTypeMessages.infoPanelDescription),
         priority: 800,
         icon: () => /*#__PURE__*/React.createElement(IconPanel, null),
         action(insert, state) {
@@ -61,8 +61,8 @@ const panelPlugin = ({
         }
       }, {
         id: 'notepanel',
-        title: formatMessage(messages.notePanel),
-        description: formatMessage(messages.notePanelDescription),
+        title: formatMessage(blockTypeMessages.notePanel),
+        description: formatMessage(blockTypeMessages.notePanelDescription),
         priority: 1000,
         icon: () => /*#__PURE__*/React.createElement(IconPanelNote, null),
         action(insert, state) {
@@ -75,8 +75,8 @@ const panelPlugin = ({
         }
       }, {
         id: 'successpanel',
-        title: formatMessage(messages.successPanel),
-        description: formatMessage(messages.successPanelDescription),
+        title: formatMessage(blockTypeMessages.successPanel),
+        description: formatMessage(blockTypeMessages.successPanelDescription),
         keywords: ['tip'],
         priority: 1000,
         icon: () => /*#__PURE__*/React.createElement(IconPanelSuccess, null),
@@ -90,8 +90,8 @@ const panelPlugin = ({
         }
       }, {
         id: 'warningpanel',
-        title: formatMessage(messages.warningPanel),
-        description: formatMessage(messages.warningPanelDescription),
+        title: formatMessage(blockTypeMessages.warningPanel),
+        description: formatMessage(blockTypeMessages.warningPanelDescription),
         priority: 1000,
         icon: () => /*#__PURE__*/React.createElement(IconPanelWarning, null),
         action(insert, state) {
@@ -104,8 +104,8 @@ const panelPlugin = ({
         }
       }, {
         id: 'errorpanel',
-        title: formatMessage(messages.errorPanel),
-        description: formatMessage(messages.errorPanelDescription),
+        title: formatMessage(blockTypeMessages.errorPanel),
+        description: formatMessage(blockTypeMessages.errorPanelDescription),
         priority: 1000,
         icon: () => /*#__PURE__*/React.createElement(IconPanelError, null),
         action(insert, state) {
@@ -120,8 +120,8 @@ const panelPlugin = ({
       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: () => /*#__PURE__*/React.createElement(IconCustomPanel, null),
           action(insert, state) {

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

@@ -6,10 +6,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';
@@ -555,12 +554,13 @@ function isOnlyMediaSingle(state, slice) {
   } = state.schema.nodes;
   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 (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)) {
           const tr = state.tr.replaceSelection(slice);

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

@@ -0,0 +1,176 @@
+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) {
+  const {
+    mediaSingle,
+    layoutSection,
+    table,
+    bulletList,
+    orderedList,
+    media,
+    mediaInline,
+    expand,
+    nestedExpand
+  } = schema.nodes;
+  return selection => {
+    let newSlice = slice;
+    if (hasParentNodeOfType([layoutSection, table, bulletList, orderedList, expand, nestedExpand])(selection)) {
+      newSlice = mapSlice(newSlice, node => {
+        const extendedOrLegacyAttrs = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
+          layout: node.attrs.layout,
+          widthType: node.attrs.widthType,
+          width: node.attrs.width
+        } : {
+          layout: node.attrs.layout
+        };
+        let attrs = {};
+        if (hasParentNodeOfType([layoutSection, table])(selection)) {
+          // Supports layouts
+          attrs = {
+            ...extendedOrLegacyAttrs
+          };
+        } else if (hasParentNodeOfType([bulletList, orderedList, expand, nestedExpand])(selection)) {
+          // does not support other layouts
+          attrs = {
+            ...extendedOrLegacyAttrs,
+            layout: 'center'
+          };
+        }
+        return node.type.name === 'mediaSingle' ? mediaSingle.createChecked(attrs, node.content, node.marks) : node;
+      });
+    }
+    const __mediaTraceId = getRandomHex(8);
+    newSlice = mapSlice(newSlice, 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({
+          ...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({
+          ...node.attrs,
+          __mediaTraceId
+        }, node.content, node.marks);
+      }
+      return node;
+    });
+    return newSlice;
+  };
+}
+
+// TODO move this to editor-common
+export const isImage = fileType => {
+  return !!fileType && (fileType.indexOf('image/') > -1 || fileType.indexOf('video/') > -1);
+};
+export const transformSliceToCorrectMediaWrapper = (slice, schema) => {
+  const {
+    mediaGroup,
+    mediaSingle,
+    media
+  } = schema.nodes;
+  return mapSlice(slice, (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
+ */
+const isElementInvisible = element => {
+  return element.style.opacity === '0' || element.style.display === 'none' || element.style.visibility === 'hidden';
+};
+const 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 const unwrapNestedMediaElements = html => {
+  const parser = new DOMParser();
+  let doc = parser.parseFromString(html, 'text/html');
+  const wrapper = doc.body;
+
+  // Remove Google Doc's wrapper <b> el
+  const docsWrapper = wrapper.querySelector('b[id^="docs-internal-guid-"]');
+  if (docsWrapper) {
+    unwrap(wrapper, docsWrapper);
+  }
+  const imageTags = wrapper.querySelectorAll('img');
+  if (!imageTags.length) {
+    return html;
+  }
+  imageTags.forEach(imageTag => {
+    // Capture the immediate parent, we may remove the media from here later.
+    const 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
+    const insertBeforeElement = walkUpTreeUntil(mediaParent, 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/es2019/plugins/paste/pm-plugins/analytics.js

@@ -238,9 +238,9 @@ export const handlePasteIntoCaptionWithAnalytics = (view, event, slice, type) =>
 export const handleCodeBlockWithAnalytics = (view, event, slice, text) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.plain
 }))(handleCodeBlock(text));
-export const handleMediaSingleWithAnalytics = (view, event, slice, type, editorAnalyticsAPI) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handleMediaSingleWithAnalytics = (view, event, slice, type, insertMediaAsMediaSingle) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
   type
-}))(handleMediaSingle(INPUT_METHOD.CLIPBOARD, editorAnalyticsAPI)(slice));
+}))(handleMediaSingle(INPUT_METHOD.CLIPBOARD, insertMediaAsMediaSingle)(slice));
 export const handlePastePreservingMarksWithAnalytics = (view, event, slice, type, pluginInjectionApi) => {
   var _pluginInjectionApi$c3, _pluginInjectionApi$c4;
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {

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

@@ -6,7 +6,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';
@@ -16,7 +16,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';
@@ -77,7 +76,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
       },
       handlePaste(view, rawEvent, slice) {
-        var _text, _analyticsPlugin$perf, _analyticsPlugin$perf2, _schema$nodes, _schema$nodes2, _schema$nodes3, _pluginInjectionApi$a;
+        var _text, _analyticsPlugin$perf, _analyticsPlugin$perf2, _schema$nodes, _schema$nodes2, _schema$nodes3, _pluginInjectionApi$m;
         const event = rawEvent;
         if (!event.clipboardData) {
           return false;
@@ -246,7 +245,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 ? 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 ? 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/es2019/plugins/undo-redo/ui/ToolbarUndoRedo/index.js

@@ -7,7 +7,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';
@@ -48,8 +48,8 @@ export class ToolbarUndoRedo extends PureComponent {
     const handleRedo = () => {
       forceFocus(editorView)(redoFromToolbar);
     };
-    const labelUndo = formatMessage(messages.undo);
-    const labelRedo = formatMessage(messages.redo);
+    const labelUndo = formatMessage(undoRedoMessages.undo);
+    const labelRedo = formatMessage(undoRedoMessages.redo);
     const {
       canUndo,
       canRedo

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

@@ -4,7 +4,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';
 const alignmentOptions = [{

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

@@ -4,12 +4,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';
 export default class WithHelpTrigger extends React.Component {
   constructor(...args) {
     super(...args);
@@ -31,7 +26,7 @@ export default class WithHelpTrigger extends React.Component {
       });
       const editorView = editorActions._privateGetEditorView();
       if (editorView) {
-        openHelpCommand(editorView.state.tr, editorView.dispatch);
+        deprecatedOpenHelpCommand(editorView.state.tr, editorView.dispatch);
       }
     });
   }

package/dist/es2019/version-wrapper.js

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

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

@@ -3,7 +3,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { createEditorSelectionAPI } from '../../../selection-api/api';
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, borderPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, borderPlugin } from '../../../plugins';
+import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { rulePlugin } from '@atlaskit/editor-plugin-rule';
 import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import { listPlugin } from '@atlaskit/editor-plugin-list';

package/dist/esm/plugins/annotation/toolbar.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import { defineMessages } from 'react-intl-next';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
 // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
@@ -7,23 +6,8 @@ import { addInlineComment, ToolTipContent } from '../../keymaps';
 import { setInlineCommentDraftState } from './commands';
 import { AnnotationTestIds, AnnotationSelectionType } from './types';
 import { isSelectionValid } from './utils';
-export var annotationMessages = defineMessages({
-  createComment: {
-    id: 'fabric.editor.createComment',
-    defaultMessage: 'Comment',
-    description: 'Create/add an inline comment based on the users selection'
-  },
-  createCommentInvalid: {
-    id: 'fabric.editor.createCommentInvalid',
-    defaultMessage: 'You can only comment on text and headings',
-    description: 'Error message to communicate to the user they can only do the current action in certain contexts'
-  },
-  toolbar: {
-    id: 'fabric.editor.annotationToolbar',
-    defaultMessage: 'Annotation toolbar',
-    description: 'A label for a toolbar (UI element) that creates annotations/comments in the document'
-  }
-});
+import { annotationMessages } from '@atlaskit/editor-common/messages';
+
 /**
  * Returns the coordintes at the bottom the selection.
  */

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

@@ -10,7 +10,7 @@ import ideUX from './pm-plugins/ide-ux';
 import { codeBlockCopySelectionPlugin } from './pm-plugins/codeBlockCopySelectionPlugin';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
-import { messages } from '@atlaskit/editor-plugin-block-type/messages';
+import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import refreshBrowserSelectionOnChange from './refresh-browser-selection';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './actions';
 import { createCodeBlockInputRule } from './pm-plugins/input-rule';
@@ -80,8 +80,8 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
         var formatMessage = _ref5.formatMessage;
         return [{
           id: 'codeblock',
-          title: formatMessage(messages.codeblock),
-          description: formatMessage(messages.codeblockDescription),
+          title: formatMessage(blockTypeMessages.codeblock),
+          description: formatMessage(blockTypeMessages.codeblockDescription),
           keywords: ['code block'],
           priority: 700,
           keyshortcut: '```',

package/dist/esm/plugins/code-block/pm-plugins/codeBlockCopySelectionPlugin.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getSelectedNodeOrNodeParentByNodeType } from '@atlaskit/editor-plugin-copy-button/utils';
+import { getSelectedNodeOrNodeParentByNodeType } from '@atlaskit/editor-common/copy-button';
 export var copySelectionPluginKey = new PluginKey('codeBlockCopySelectionPlugin');
 function getSelectionDecorationStartAndEnd(_ref) {
   var state = _ref.state,

package/dist/esm/plugins/index.js

@@ -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';

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

@@ -6,7 +6,7 @@ import React from 'react';
 import memoize from 'lodash/memoize';
 import memoizeOne from 'memoize-one';
 import { messages } from './messages';
-import { messages as blockTypeMessages } from '@atlaskit/editor-plugin-block-type/messages';
+import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { ToolTipContent } from '../../../../keymaps';
 import { sortItems } from './sort-items';
 import { action, link, media, mention, emoji, table, layout, codeblock, panel, blockquote, decision, horizontalrule, expand, date, placeholder, status, more, imageUpload } from './item';

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

@@ -23,6 +23,7 @@ import { ReactMediaNode } from './nodeviews/mediaNodeView';
 import { ReactMediaInlineNode } from './nodeviews/mediaInline';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { stateKey } from './pm-plugins/plugin-key';
+import { insertMediaAsMediaSingle as _insertMediaAsMediaSingle } from './utils/media-single';
 export { insertMediaSingleNode } from './utils/media-single';
 var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_ref) {
   var api = _ref.api,
@@ -54,6 +55,12 @@ var mediaPlugin = function mediaPlugin(_ref2) {
       }
       return stateKey.getState(editorState) || null;
     },
+    actions: {
+      insertMediaAsMediaSingle: function insertMediaAsMediaSingle(view, node, inputMethod) {
+        var _api$analytics;
+        return _insertMediaAsMediaSingle(view, node, inputMethod, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+      }
+    },
     nodes: function nodes() {
       var _ref3 = options || {},
         _ref3$allowMediaGroup = _ref3.allowMediaGroup,
@@ -134,8 +141,8 @@ var mediaPlugin = function mediaPlugin(_ref2) {
       }, {
         name: 'mediaKeymap',
         plugin: function plugin() {
-          var _api$analytics;
-          return keymapPlugin(options, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          var _api$analytics2;
+          return keymapPlugin(options, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
         }
       }];
       if (options && options.allowMediaSingle) {
@@ -155,9 +162,9 @@ var mediaPlugin = function mediaPlugin(_ref2) {
         pmPlugins.push({
           name: 'mediaAltTextKeymap',
           plugin: function plugin(_ref6) {
-            var _api$analytics2;
+            var _api$analytics3;
             var schema = _ref6.schema;
-            return keymapMediaAltTextPlugin(schema, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+            return keymapMediaAltTextPlugin(schema, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
           }
         });
       }
@@ -240,11 +247,11 @@ var mediaPlugin = function mediaPlugin(_ref2) {
             return /*#__PURE__*/React.createElement(IconImages, null);
           },
           action: function action(insert, state) {
-            var _api$analytics3;
+            var _api$analytics4;
             var pluginState = pluginKey.getState(state);
             pluginState === null || pluginState === void 0 || pluginState.showMediaPicker();
             var tr = insert('');
-            api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
+            api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || _api$analytics4.actions.attachAnalyticsEvent({
               action: ACTION.OPENED,
               actionSubject: ACTION_SUBJECT.PICKER,
               actionSubjectId: ACTION_SUBJECT_ID.PICKER_CLOUD,