@atlaskit/editor-core 188.12.1 → 188.12.3

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

@@ -1,9 +1,9 @@
-import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, PasteTypes, PasteContents } from '../../analytics';
+import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, PasteTypes, PasteContents } from '@atlaskit/editor-common/analytics';
+import { addAnalytics } from '../../analytics';
 import { getPasteSource } from '../util';
 import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelOrDecisionContentIntoList, handlePasteNonNestableBlockNodesIntoList } from '../handlers';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
-import { mapSlice } from '../../../utils/slice';
-import { getLinkDomain } from '@atlaskit/editor-common/utils';
+import { getLinkDomain, mapSlice } from '@atlaskit/editor-common/utils';
 const contentToPasteContent = {
   url: PasteContents.url,
   paragraph: PasteContents.text,

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

@@ -3,27 +3,24 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import uuid from 'uuid';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { mapChildren } from '../../../utils/slice';
+import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren, measureRender } from '@atlaskit/editor-common/utils';
+import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
-import { isPastedFile as isPastedFileFromEvent } from '@atlaskit/editor-common/paste';
-import { transformSliceForMedia, transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../plugins/media';
+import { ACTION, INPUT_METHOD, PasteTypes } from '@atlaskit/editor-common/analytics';
+import { md, isPastedFile as isPastedFileFromEvent } from '@atlaskit/editor-common/paste';
+import { transformSliceForMedia, transformSliceToCorrectMediaWrapper, transformSliceToMediaSingleWithNewExperience, 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';
+import { transformSliceNestedExpandToExpand, transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, transformSliceToDecisionList } from '@atlaskit/editor-common/transforms';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
-import { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark } from '../../code-block/utils';
 import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelOrDecisionIntoListWithAnalytics, handlePasteNonNestableBlockNodesIntoListWithAnalytics } from './analytics';
-import { ACTION, analyticsPluginKey, INPUT_METHOD, PasteTypes } from '../../analytics';
+// TODO: ED-20519 It requires full analytics extraction to use the plugin injection API
+import { analyticsPluginKey } from '../../analytics';
 import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
-import { measureRender } from '@atlaskit/editor-common/utils';
 import { upgradeTextToLists, splitParagraphs } from '../commands';
-import { md } from '@atlaskit/editor-common/paste';
-import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
-import { containsAnyAnnotations, stripNonExistingAnnotations } from '../../annotation/utils';
+// TODO: ED-20519 It requires annotation extraction to use the plugin injection API
+import { stripNonExistingAnnotations } from '../../annotation/utils';
 import { clipboardTextSerializer } from './clipboard-text-serializer';
 import { htmlHasIncompleteTable, tryRebuildCompleteTableHtml, isPastedFromTinyMCEConfluence } from '../util/tinyMCE';
-import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
-import { extractSliceFromStep } from '../../../utils/step';
 import { pluginKey as stateKey, createPluginState } from './plugin-factory';
 export { pluginKey as stateKey } from './plugin-factory';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
@@ -365,6 +362,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
         slice = transformSingleLineCodeBlockToCodeMark(slice, schema);
         slice = transformSliceToCorrectMediaWrapper(slice, schema);
+        slice = transformSliceToMediaSingleWithNewExperience(slice, schema);
         slice = transformSliceToDecisionList(slice, schema);
 
         // splitting linebreaks into paragraphs must happen before upgrading text to lists

package/dist/es2019/plugins/paste/util/index.js

@@ -4,7 +4,7 @@ import { ACTION_SUBJECT, addAnalytics, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION }
 import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
-import { sortByOrderWithTypeName } from '../../../create-editor/sort-by-order';
+import { sortByOrderWithTypeName } from '@atlaskit/editor-common/legacy-rank-plugins';
 import { isSupportedInParent, mapChildren } from '@atlaskit/editor-common/utils';
 export function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;

package/dist/es2019/plugins/rank.js

@@ -1,27 +1,2 @@
-export default {
-  plugins: ['featureFlagsContextPlugin', 'compositionPlugin', 'inlineCursorTargetPlugin', 'typeAhead', 'typeAheadInsertItem', 'focusHandlerPlugin', 'frozenEditor', 'submitEditor', 'saveOnEnter', 'customAutoformatting', 'newlinePreserveMarksPlugin', 'imageUpload', 'imageUploadInputRule', 'clipboard', 'paste', 'pasteKeymap', 'mention', 'mentionInputRule', 'mentionKeymap', 'emoji', 'placeholderText', 'emojiInputRule', 'emojiKeymap', 'emojiAsciiInputRule', 'blockType', 'quickInsert', 'tasksAndDecisions', 'blockTypeInputRule', 'tasksAndDecisionsInputRule', 'list', 'typeAheadKeymap', 'typeAheadInputRule', 'date',
-  // Needs to be before indentation to handle tab into input field
-  'dateKeymap',
-  // This should be always after `typeAheadKeymap` & `emojiKeymap`
-  'indentationKeymap', 'textColor', 'alignmentPlugin', 'listInputRule', 'listKeymap', 'codeBlock', 'codeBlockIDEKeyBindings', 'codeBlockKeyMap', 'textFormatting', 'textFormattingCursor', 'textFormattingInputRule', 'textFormattingSmartRule', 'textFormattingClear', 'textFormattingKeymap',
-  // task/decisions keymap needs to be above table keymap so can indent actions in a table
-  'tasksAndDecisionsKeyMap',
-  // expand and table keymaps need to be above selection keymap to add their custom selection behaviour:
-  // https://product-fabric.atlassian.net/wiki/spaces/E/pages/1113098008/Selection+Guide#Special-Cases
-  'expandKeymap', 'tableSelectionKeymap', 'tableKeymap', 'captionKeymap',
-  // media keymap above selection keymap to allow navigating past the mediaSingle node
-  'mediaKeymap',
-  // selection keymap needs to be above gap cursor keymap so it can set node selections from
-  // left/right arrows
-  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'selectionToolbar', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription', 'beforePrimaryToolbar', 'inlineCode'],
-  nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'rule', 'panel', 'mention', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'unsupportedBlock', 'unsupportedInline', 'confluenceJiraIssue', 'hardBreak', 'emoji', 'placeholder', 'mediaSingle', 'mediaGroup', 'table', 'expand', 'nestedExpand', 'media', 'tableHeader', 'decisionList', 'tableRow', 'decisionItem', 'tableCell', 'taskList', 'taskItem', 'extension', 'bodiedExtension', 'inlineExtension', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard'],
-  marks: [
-  // Fragment mark is both for inline and block elements
-  'fragment',
-  // Inline marks
-  'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'typeAheadQuery',
-  // Block marks
-  'alignment', 'breakout', 'indentation', 'annotation', 'dataConsumer', 'border',
-  // Unsupported mark
-  'unsupportedMark', 'unsupportedNodeAttribute']
-};
+import { rankEditorPlugins } from '@atlaskit/editor-common/legacy-rank-plugins';
+export default rankEditorPlugins;

package/dist/es2019/plugins/tasks-and-decisions/utils.js

@@ -1,16 +1,6 @@
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-
-// If slice is decisionItem, wrap it inside a decisionList. This prevents an
-// additional newline from being pasted along with the selected decision item.
-export const transformSliceToDecisionList = (slice, schema) => {
-  const node = slice.content.firstChild;
-  if (slice.content.childCount === 1 && node && node.type.name === 'decisionItem') {
-    const decisionListWrapperNode = schema.nodes.decisionList.create({}, node);
-    return new Slice(Fragment.from(decisionListWrapperNode), slice.openStart, slice.openEnd);
-  }
-  return slice;
-};
+import { transformSliceToDecisionList } from '@atlaskit/editor-common/transforms';
+export { transformSliceToDecisionList };
 function isTaskListNode(node) {
   return Boolean(node && node.type && 'taskList' === node.type.name);
 }

package/dist/es2019/version-wrapper.js

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

package/dist/esm/create-editor/sort-by-order.js

@@ -1,17 +1 @@
-import Ranks from '../plugins/rank';
-export function sortByOrder(item) {
-  return function (a, b) {
-    return Ranks[item].indexOf(a.name) - Ranks[item].indexOf(b.name);
-  };
-}
-
-// while functionally the same, in order to avoid potentially rewriting the ~10
-// existing implementations of the above function I decided creating a separate
-// function avoided that whole mess. If someone can think of a better way to implement
-// the above and below into a single function please do so
-
-export function sortByOrderWithTypeName(item) {
-  return function (a, b) {
-    return Ranks[item].indexOf(a.type.name) - Ranks[item].indexOf(b.type.name);
-  };
-}
+export { sortByOrder, sortByOrderWithTypeName } from '@atlaskit/editor-common/legacy-rank-plugins';

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

@@ -1,11 +1,16 @@
 import { PluginKey, TextSelection, AllSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, isText, isParagraph, hasAnnotationMark, containsAnyAnnotations } from '@atlaskit/editor-common/utils';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { AnnotationSelectionType } from './types';
-import { isText, isParagraph, sum } from '../../utils';
-import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, ACTION } from '../analytics';
+import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, ACTION } from '@atlaskit/editor-common/analytics';
+export { hasAnnotationMark, containsAnyAnnotations };
+function sum(arr, f) {
+  return arr.reduce(function (val, x) {
+    return val + f(x);
+  }, 0);
+}
 /**
  * Finds the marks in the nodes to the left and right.
  * @param $pos Position to center search around
@@ -285,14 +290,6 @@ export function hasInvalidWhitespaceNode(selection, schema) {
   return foundInvalidWhitespace;
 }
 
-/*
- * verifies if node contains annotation mark
- */
-export function hasAnnotationMark(node, state) {
-  var annotationMark = state.schema.marks.annotation;
-  return !!(annotationMark && node && node.marks.length && annotationMark.isInSet(node.marks));
-}
-
 /*
  * verifies that the annotation exists by the given id
  */
@@ -301,32 +298,6 @@ export function annotationExists(annotationId, state) {
   return !!(commentsPluginState !== null && commentsPluginState !== void 0 && commentsPluginState.annotations) && Object.keys(commentsPluginState.annotations).includes(annotationId);
 }
 
-/*
- * verifies that slice contains any annotations
- */
-export function containsAnyAnnotations(slice, state) {
-  if (!slice.content.size) {
-    return false;
-  }
-  var hasAnnotation = false;
-  slice.content.forEach(function (node) {
-    hasAnnotation = hasAnnotation || hasAnnotationMark(node, state);
-    // return early if annotation found already
-    if (hasAnnotation) {
-      return true;
-    }
-    // check annotations in descendants
-    node.descendants(function (node) {
-      if (hasAnnotationMark(node, state)) {
-        hasAnnotation = true;
-        return false;
-      }
-      return true;
-    });
-  });
-  return hasAnnotation;
-}
-
 /*
  * remove annotations that dont exsist in plugin state from slice
  */

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

@@ -1,42 +1 @@
-import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
-import { mapSlice } from '../../utils/slice';
-import { findSelectedNodeOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-function joinCodeBlocks(left, right) {
-  var textContext = "".concat(left.textContent, "\n").concat(right.textContent);
-  return left.type.create(left.attrs, left.type.schema.text(textContext));
-}
-function mergeAdjacentCodeBlocks(fragment) {
-  var children = [];
-  fragment.forEach(function (maybeCodeBlock) {
-    if (maybeCodeBlock.type === maybeCodeBlock.type.schema.nodes.codeBlock) {
-      var peekAtPrevious = children[children.length - 1];
-      if (peekAtPrevious && peekAtPrevious.type === maybeCodeBlock.type) {
-        return children.push(joinCodeBlocks(children.pop(), maybeCodeBlock));
-      }
-    }
-    return children.push(maybeCodeBlock);
-  });
-  return Fragment.from(children);
-}
-export function transformSliceToJoinAdjacentCodeBlocks(slice) {
-  slice = mapSlice(slice, function (node) {
-    return node.isBlock && !node.isTextblock ? node.copy(mergeAdjacentCodeBlocks(node.content)) : node;
-  });
-  // mapSlice won't be able to merge adjacent top-level code-blocks
-  return new Slice(mergeAdjacentCodeBlocks(slice.content), slice.openStart, slice.openEnd);
-}
-export var transformSingleLineCodeBlockToCodeMark = function transformSingleLineCodeBlockToCodeMark(slice, schema) {
-  if (slice.content.childCount === 1 && (slice.openStart || slice.openEnd)) {
-    var maybeCodeBlock = slice.content.firstChild;
-    if (maybeCodeBlock && maybeCodeBlock.type === schema.nodes.codeBlock) {
-      if (maybeCodeBlock.textContent && maybeCodeBlock.textContent.indexOf('\n') === -1) {
-        return new Slice(Fragment.from(schema.text(maybeCodeBlock.textContent, [schema.marks.code.create()])), 0, 0);
-      }
-    }
-  }
-  return slice;
-};
-export var findCodeBlock = function findCodeBlock(state, selection) {
-  var codeBlock = state.schema.nodes.codeBlock;
-  return findSelectedNodeOfType(codeBlock)(selection || state.selection) || findParentNodeOfType(codeBlock)(selection || state.selection);
-};
+export { findCodeBlock, transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark } from '@atlaskit/editor-common/transforms';

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

@@ -12,17 +12,37 @@ import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state
 import { canInsert, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 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 { canLinkBeCreatedInRange, insideTableCell, isInListItem, isLinkMark, isListItemNode, isListNode, isParagraph, isText, linkifyContent, mapSlice } from '@atlaskit/editor-common/utils';
+import { insideTable } from '@atlaskit/editor-common/core-utils';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
+// TODO: ED-20519 Needs Macro extraction
 import { runMacroAutoConvert } from '../macro';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
-import { linkifyContent, isListItemNode, isListNode, canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
 import { insertSliceForLists } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
+
+/** Helper type for single arg function */
+
+/**
+ * Compose 1 to n functions.
+ * @param func first function
+ * @param funcs additional functions
+ */
+function compose(func) {
+  for (var _len = arguments.length, funcs = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    funcs[_key - 1] = arguments[_key];
+  }
+  var allFuncs = [func].concat(funcs);
+  return function composed(raw) {
+    return allFuncs.reduceRight(function (memo, func) {
+      return func(memo);
+    }, raw);
+  };
+}
+
 // remove text attribute from mention for copy/paste (GDPR)
 export function handleMention(slice, schema) {
   return mapSlice(slice, function (node) {

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

@@ -5,6 +5,13 @@ 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';
+import { DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
+
+/**
+ * Ensure correct layout in nested mode
+ *
+ * TODO: this func is only used in handlePaste, so layout update won't work for drop event
+ */
 export function transformSliceForMedia(slice, schema) {
   var _schema$nodes = schema.nodes,
     mediaSingle = _schema$nodes.mediaSingle,
@@ -12,8 +19,6 @@ export function transformSliceForMedia(slice, schema) {
     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) {
@@ -40,27 +45,6 @@ export function transformSliceForMedia(slice, schema) {
         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;
   };
 }
@@ -86,6 +70,49 @@ export var transformSliceToCorrectMediaWrapper = function transformSliceToCorrec
   });
 };
 
+/**
+ * This func will be called when copy & paste, drag & drop external html with media, media files, and slices from editor
+ * Because width may not be available when transform, DEFAULT_IMAGE_WIDTH is used as a fallback
+ *
+ */
+export var transformSliceToMediaSingleWithNewExperience = function transformSliceToMediaSingleWithNewExperience(slice, schema) {
+  var _schema$nodes3 = schema.nodes,
+    mediaInline = _schema$nodes3.mediaInline,
+    mediaSingle = _schema$nodes3.mediaSingle,
+    media = _schema$nodes3.media;
+  var newSlice = mapSlice(slice, 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 === mediaSingle) {
+      return getBooleanFF('platform.editor.media.extended-resize-experience') ? mediaSingle.createChecked({
+        width: node.attrs.width || DEFAULT_IMAGE_WIDTH,
+        widthType: node.attrs.widthType || 'pixel',
+        layout: node.attrs.layout
+      }, node.content, node.marks) : node;
+    }
+    return node;
+  });
+  return mapSlice(newSlice, function (node) {
+    var __mediaTraceId = getRandomHex(8);
+    if (node.type === 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;
+  });
+};
+
 /**
  * Check base styles to see if an element will be invisible when rendered in a document.
  * @param element

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

@@ -2,12 +2,12 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, PasteTypes, PasteContents } from '../../analytics';
+import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, PasteTypes, PasteContents } from '@atlaskit/editor-common/analytics';
+import { addAnalytics } from '../../analytics';
 import { getPasteSource } from '../util';
 import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelOrDecisionContentIntoList, handlePasteNonNestableBlockNodesIntoList } from '../handlers';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
-import { mapSlice } from '../../../utils/slice';
-import { getLinkDomain } from '@atlaskit/editor-common/utils';
+import { getLinkDomain, mapSlice } from '@atlaskit/editor-common/utils';
 var contentToPasteContent = {
   url: PasteContents.url,
   paragraph: PasteContents.text,

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

@@ -5,27 +5,24 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import uuid from 'uuid';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { mapChildren } from '../../../utils/slice';
+import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren, measureRender } from '@atlaskit/editor-common/utils';
+import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
-import { isPastedFile as isPastedFileFromEvent } from '@atlaskit/editor-common/paste';
-import { transformSliceForMedia, transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../plugins/media';
+import { ACTION, INPUT_METHOD, PasteTypes } from '@atlaskit/editor-common/analytics';
+import { md, isPastedFile as isPastedFileFromEvent } from '@atlaskit/editor-common/paste';
+import { transformSliceForMedia, transformSliceToCorrectMediaWrapper, transformSliceToMediaSingleWithNewExperience, 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';
+import { transformSliceNestedExpandToExpand, transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, transformSliceToDecisionList } from '@atlaskit/editor-common/transforms';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
-import { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark } from '../../code-block/utils';
 import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelOrDecisionIntoListWithAnalytics, handlePasteNonNestableBlockNodesIntoListWithAnalytics } from './analytics';
-import { ACTION, analyticsPluginKey, INPUT_METHOD, PasteTypes } from '../../analytics';
+// TODO: ED-20519 It requires full analytics extraction to use the plugin injection API
+import { analyticsPluginKey } from '../../analytics';
 import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
-import { measureRender } from '@atlaskit/editor-common/utils';
 import { upgradeTextToLists, splitParagraphs } from '../commands';
-import { md } from '@atlaskit/editor-common/paste';
-import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
-import { containsAnyAnnotations, stripNonExistingAnnotations } from '../../annotation/utils';
+// TODO: ED-20519 It requires annotation extraction to use the plugin injection API
+import { stripNonExistingAnnotations } from '../../annotation/utils';
 import { clipboardTextSerializer } from './clipboard-text-serializer';
 import { htmlHasIncompleteTable, tryRebuildCompleteTableHtml, isPastedFromTinyMCEConfluence } from '../util/tinyMCE';
-import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
-import { extractSliceFromStep } from '../../../utils/step';
 import { pluginKey as stateKey, createPluginState } from './plugin-factory';
 export { pluginKey as stateKey } from './plugin-factory';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
@@ -385,6 +382,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
         slice = transformSingleLineCodeBlockToCodeMark(slice, schema);
         slice = transformSliceToCorrectMediaWrapper(slice, schema);
+        slice = transformSliceToMediaSingleWithNewExperience(slice, schema);
         slice = transformSliceToDecisionList(slice, schema);
 
         // splitting linebreaks into paragraphs must happen before upgrading text to lists

package/dist/esm/plugins/paste/util/index.js

@@ -5,7 +5,7 @@ import { ACTION_SUBJECT, addAnalytics, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION }
 import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
-import { sortByOrderWithTypeName } from '../../../create-editor/sort-by-order';
+import { sortByOrderWithTypeName } from '@atlaskit/editor-common/legacy-rank-plugins';
 import { isSupportedInParent, mapChildren } from '@atlaskit/editor-common/utils';
 export function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;

package/dist/esm/plugins/rank.js

@@ -1,27 +1,2 @@
-export default {
-  plugins: ['featureFlagsContextPlugin', 'compositionPlugin', 'inlineCursorTargetPlugin', 'typeAhead', 'typeAheadInsertItem', 'focusHandlerPlugin', 'frozenEditor', 'submitEditor', 'saveOnEnter', 'customAutoformatting', 'newlinePreserveMarksPlugin', 'imageUpload', 'imageUploadInputRule', 'clipboard', 'paste', 'pasteKeymap', 'mention', 'mentionInputRule', 'mentionKeymap', 'emoji', 'placeholderText', 'emojiInputRule', 'emojiKeymap', 'emojiAsciiInputRule', 'blockType', 'quickInsert', 'tasksAndDecisions', 'blockTypeInputRule', 'tasksAndDecisionsInputRule', 'list', 'typeAheadKeymap', 'typeAheadInputRule', 'date',
-  // Needs to be before indentation to handle tab into input field
-  'dateKeymap',
-  // This should be always after `typeAheadKeymap` & `emojiKeymap`
-  'indentationKeymap', 'textColor', 'alignmentPlugin', 'listInputRule', 'listKeymap', 'codeBlock', 'codeBlockIDEKeyBindings', 'codeBlockKeyMap', 'textFormatting', 'textFormattingCursor', 'textFormattingInputRule', 'textFormattingSmartRule', 'textFormattingClear', 'textFormattingKeymap',
-  // task/decisions keymap needs to be above table keymap so can indent actions in a table
-  'tasksAndDecisionsKeyMap',
-  // expand and table keymaps need to be above selection keymap to add their custom selection behaviour:
-  // https://product-fabric.atlassian.net/wiki/spaces/E/pages/1113098008/Selection+Guide#Special-Cases
-  'expandKeymap', 'tableSelectionKeymap', 'tableKeymap', 'captionKeymap',
-  // media keymap above selection keymap to allow navigating past the mediaSingle node
-  'mediaKeymap',
-  // selection keymap needs to be above gap cursor keymap so it can set node selections from
-  // left/right arrows
-  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'selectionToolbar', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription', 'beforePrimaryToolbar', 'inlineCode'],
-  nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'rule', 'panel', 'mention', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'unsupportedBlock', 'unsupportedInline', 'confluenceJiraIssue', 'hardBreak', 'emoji', 'placeholder', 'mediaSingle', 'mediaGroup', 'table', 'expand', 'nestedExpand', 'media', 'tableHeader', 'decisionList', 'tableRow', 'decisionItem', 'tableCell', 'taskList', 'taskItem', 'extension', 'bodiedExtension', 'inlineExtension', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard'],
-  marks: [
-  // Fragment mark is both for inline and block elements
-  'fragment',
-  // Inline marks
-  'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'typeAheadQuery',
-  // Block marks
-  'alignment', 'breakout', 'indentation', 'annotation', 'dataConsumer', 'border',
-  // Unsupported mark
-  'unsupportedMark', 'unsupportedNodeAttribute']
-};
+import { rankEditorPlugins } from '@atlaskit/editor-common/legacy-rank-plugins';
+export default rankEditorPlugins;

package/dist/esm/plugins/tasks-and-decisions/utils.js

@@ -1,16 +1,6 @@
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-
-// If slice is decisionItem, wrap it inside a decisionList. This prevents an
-// additional newline from being pasted along with the selected decision item.
-export var transformSliceToDecisionList = function transformSliceToDecisionList(slice, schema) {
-  var node = slice.content.firstChild;
-  if (slice.content.childCount === 1 && node && node.type.name === 'decisionItem') {
-    var decisionListWrapperNode = schema.nodes.decisionList.create({}, node);
-    return new Slice(Fragment.from(decisionListWrapperNode), slice.openStart, slice.openEnd);
-  }
-  return slice;
-};
+import { transformSliceToDecisionList } from '@atlaskit/editor-common/transforms';
+export { transformSliceToDecisionList };
 function isTaskListNode(node) {
   return Boolean(node && node.type && 'taskList' === node.type.name);
 }

package/dist/esm/version-wrapper.js

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

package/dist/types/create-editor/sort-by-order.d.ts

@@ -1,14 +1 @@
-export declare function sortByOrder(item: 'plugins' | 'nodes' | 'marks'): (a: {
-    name: string;
-}, b: {
-    name: string;
-}) => number;
-export declare function sortByOrderWithTypeName(item: 'plugins' | 'nodes' | 'marks'): (a: {
-    type: {
-        name: string;
-    };
-}, b: {
-    type: {
-        name: string;
-    };
-}) => number;
+export { sortByOrder, sortByOrderWithTypeName, } from '@atlaskit/editor-common/legacy-rank-plugins';

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

@@ -2,11 +2,13 @@ import type { ResolvedPos, Mark, Node, Slice, Schema } from '@atlaskit/editor-pr
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey, TextSelection, AllSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { hasAnnotationMark, containsAnyAnnotations } from '@atlaskit/editor-common/utils';
 import type { AnnotationInfo } from './types';
 import { AnnotationSelectionType } from './types';
 import type { InlineCommentPluginState } from './pm-plugins/types';
-import type { INPUT_METHOD } from '../analytics';
 import type { AnalyticsEventPayloadCallback } from '../analytics/utils';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+export { hasAnnotationMark, containsAnyAnnotations };
 /**
  * Finds the marks in the nodes to the left and right.
  * @param $pos Position to center search around
@@ -34,7 +36,5 @@ export declare const hasInvalidNodes: (state: EditorState) => boolean;
  * This is to conform to Confluence annotation specifications
  */
 export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection, schema: Schema): boolean;
-export declare function hasAnnotationMark(node: Node, state: EditorState): boolean;
 export declare function annotationExists(annotationId: string, state: EditorState): boolean;
-export declare function containsAnyAnnotations(slice: Slice, state: EditorState): boolean;
 export declare function stripNonExistingAnnotations(slice: Slice, state: EditorState): false | undefined;

package/dist/types/plugins/code-block/utils.d.ts

@@ -1,6 +1 @@
-import type { Schema } from '@atlaskit/editor-prosemirror/model';
-import { Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
-export declare function transformSliceToJoinAdjacentCodeBlocks(slice: Slice): Slice;
-export declare const transformSingleLineCodeBlockToCodeMark: (slice: Slice, schema: Schema) => Slice;
-export declare const findCodeBlock: (state: EditorState, selection?: Selection | null) => import("prosemirror-utils/dist/types").FindResult;
+export { findCodeBlock, transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, } from '@atlaskit/editor-common/transforms';

package/dist/types/plugins/paste/handlers.d.ts

@@ -2,8 +2,8 @@ import { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import type { ExtensionAutoConvertHandler } from '@atlaskit/editor-common/extensions';
-import type { Command } from '../../types';
-import type { InputMethodInsertMedia } from '../analytics';
+import type { Command } from '@atlaskit/editor-common/types';
+import type { InputMethodInsertMedia } from '@atlaskit/editor-common/analytics';
 import type { InsertMediaAsMediaSingle } from '@atlaskit/editor-plugin-media/types';
 import type { QueueCardsFromTransactionAction, CardOptions } from '@atlaskit/editor-common/card';
 import type { FindRootParentListNode } from '@atlaskit/editor-plugin-list';