@atlaskit/editor-core 189.6.14 → 189.6.18

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-core
 
+## 189.6.18
+
+### Patch Changes
+
+- Updated dependencies
+
+## 189.6.17
+
+### Patch Changes
+
+- [#60504](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60504) [`fdd20fa0201f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fdd20fa0201f) - ED-21506: multiBodiedExtension- Fix issues with Renderer
+- [#60178](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60178) [`4a4e9492f9f5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4a4e9492f9f5) - [ux] ED-20952 Keep source formatting for pasting paragraph related texts, except when pasted in Heading, code and annotation.
+- [#60812](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60812) [`24cc390d82e9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/24cc390d82e9) - ED-21529 Adding response exception messages to MBE APIs
+
 ## 189.6.14
 
 ### Patch Changes

package/dist/cjs/plugins/extension/ui/Extension/MultiBodiedExtension/index.js

@@ -31,17 +31,16 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
         var state = editorView.state,
           dispatch = editorView.dispatch;
         if (node.content.childCount >= node.attrs.maxFrames) {
-          // TODO: add proper log on this
-          return false;
+          throw new Error("Cannot add more than ".concat(node.attrs.maxFrames, " frames"));
         }
         var p = state.schema.nodes.paragraph.createAndFill({});
         if (!p) {
-          return false;
+          throw new Error('Could not create paragraph');
         }
         var frame = state.schema.nodes.extensionFrame.createAndFill({}, [p]);
         var pos = getPos();
         if (typeof pos !== 'number' || !frame) {
-          return false;
+          throw new Error('Could not create frame or position not valid');
         }
         var insertAt = Math.min((pos || 1) + node.content.size, state.doc.content.size);
         dispatch(state.tr.insert(insertAt, frame));
@@ -54,7 +53,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
         var pos = getPos();
         // TODO: Add child index validation here, don't trust this data
         if (typeof pos !== 'number' || typeof index !== 'number') {
-          return false;
+          throw new Error('Position or index not valid');
         }
         var state = editorView.state,
           dispatch = editorView.dispatch;
@@ -69,7 +68,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
         var startFramePosition = $startNodePos.posAtIndex(index);
         var maybeFrameNode = state.doc.nodeAt(startFramePosition);
         if (!maybeFrameNode) {
-          return false;
+          throw new Error('Could not find frame node');
         }
         var endFramePosition = maybeFrameNode.content.size + startFramePosition;
         var tr = state.tr;
@@ -82,7 +81,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
           dispatch = editorView.dispatch;
         var pos = getPos();
         if (typeof pos !== 'number') {
-          return false;
+          throw new Error('Position not valid');
         }
         var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node.attrs), {}, {
           parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
@@ -106,7 +105,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
   }, [node, editorView, getPos, updateActiveChild]);
   return actions;
 };
-var navigationCSS = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  // make sure the user can't see a range selection inside the navigation\n  // This is really important to keep the navigation working properly\n  user-select: none;\n  -webkit-user-modify: read-only;\n"])));
+var navigationCSS = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  // make sure the user can't see a range selection inside the navigation\n  // This is really important to keep the navigation working properly\n  user-select: none;\n  -webkit-user-modify: read-only;\n  border: 1px solid ", ";\n  background-color: ", ";\n"])), "var(--ds-border, ".concat(_colors.N40, ")"), "var(--ds-background-inverse-subtle, ".concat(_colors.N50, ")"));
 var MultiBodiedExtension = function MultiBodiedExtension(_ref2) {
   var node = _ref2.node,
     handleContentDOMRef = _ref2.handleContentDOMRef,
@@ -120,9 +119,8 @@ var MultiBodiedExtension = function MultiBodiedExtension(_ref2) {
   // Adding to avoid aliasing `this` for the callbacks
   var updateActiveChild = _react2.default.useCallback(function (index) {
     if (typeof index !== 'number') {
-      // TODO: Make sure we log this somewhere if this happens
       setActiveChildIndex(0);
-      return false;
+      throw new Error('Index is not valid');
     }
     setActiveChildIndex(index);
     return true;
@@ -139,7 +137,7 @@ var MultiBodiedExtension = function MultiBodiedExtension(_ref2) {
   var articleRef = _react2.default.useCallback(function (node) {
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
-  var containerCSS = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    border: 1px solid ", ";\n    padding: ", ";\n    .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'] {\n      display: none;\n    }\n\n    .multiBodiedExtension-content-dom-wrapper\n      > [data-extension-frame='true']:nth-of-type(", ") {\n      display: block;\n    }\n  "])), "var(--ds-border, ".concat(_colors.N30, ")"), "var(--ds-space-050, 4px)", activeChildIndex + 1);
+  var containerCSS = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    border: 1px solid ", ";\n    min-height: 100px;\n    .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'] {\n      display: none;\n    }\n\n    .multiBodiedExtension-content-dom-wrapper\n      > [data-extension-frame='true']:nth-of-type(", ") {\n      border: 1px solid ", ";\n      display: block;\n      min-height: 100px;\n    }\n  "])), "var(--ds-border, ".concat(_colors.N30, ")"), activeChildIndex + 1, "var(--ds-border, ".concat(_colors.N50, ")"));
   return (0, _react.jsx)("section", {
     className: "multiBodiedExtension--container",
     css: containerCSS,

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

@@ -404,7 +404,7 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
       selection = state.tr.selection;
     var _schema$marks = schema.marks,
       codeMark = _schema$marks.code,
-      linkMark = _schema$marks.link,
+      annotationMark = _schema$marks.annotation,
       _schema$nodes2 = schema.nodes,
       bulletList = _schema$nodes2.bulletList,
       emoji = _schema$nodes2.emoji,
@@ -413,7 +413,6 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
       listItem = _schema$nodes2.listItem,
       mention = _schema$nodes2.mention,
       orderedList = _schema$nodes2.orderedList,
-      paragraph = _schema$nodes2.paragraph,
       text = _schema$nodes2.text;
     if (!(selection instanceof _state.TextSelection)) {
       return false;
@@ -425,29 +424,18 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
 
     // special case for codeMark: will preserve mark only if codeMark is currently active
     // won't preserve mark if cursor is on the edge on the mark (namely inactive)
-    if (codeMark.isInSet(selectionMarks) && !(0, _mark.anyMarkActive)(state, codeMark)) {
-      return false;
-    }
-    var isPlainTextSlice = slice.content.childCount === 1 && slice.content.firstChild.type === paragraph && slice.content.firstChild.content.childCount === 1 && slice.content.firstChild.firstChild.type === text;
-
-    // special case for plainTextSlice & linkMark: merge into existing link
-    if (isPlainTextSlice && linkMark.isInSet(selectionMarks) && selectionMarks.length === 1) {
-      var tr = (0, _history.closeHistory)(state.tr).replaceSelectionWith(slice.content.firstChild.firstChild, true).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
-      if (dispatch) {
-        dispatch(tr);
-      }
-      return true;
-    }
+    var hasActiveCodeMark = codeMark && codeMark.isInSet(selectionMarks) && (0, _mark.anyMarkActive)(state, codeMark);
+    var hasAnnotationMark = annotationMark && annotationMark.isInSet(selectionMarks);
+    var selectionIsHeading = (0, _utils.hasParentNodeOfType)([heading])(state.selection);
 
     // if the pasted data is one of the node types below
     // we apply current selection marks to the pasted slice
-    if ((0, _util.hasOnlyNodesOfType)(bulletList, hardBreak, heading, listItem, paragraph, text, emoji, mention, orderedList)(slice)) {
+    if ((0, _util.hasOnlyNodesOfType)(bulletList, hardBreak, heading, listItem, text, emoji, mention, orderedList)(slice) || selectionIsHeading || hasActiveCodeMark || hasAnnotationMark) {
       var transformedSlice = (0, _util.applyTextMarksToSlice)(schema, selectionMarks)(slice);
-      var _tr2 = (0, _history.closeHistory)(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, _tr2, _analytics.INPUT_METHOD.CLIPBOARD);
+      var tr = (0, _history.closeHistory)(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
+      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
-        dispatch(_tr2);
+        dispatch(tr);
       }
       return true;
     }

package/dist/cjs/ui/Appearance/FullPage/StyledComponents.js

@@ -29,11 +29,11 @@ var sidebarArea = exports.sidebarArea = (0, _react.css)(_templateObject5 || (_te
 
 // initially hide until we have a containerWidth and can properly size them,
 // otherwise they can cause the editor width to extend which is non-recoverable
-var editorContentAreaHideContainer = exports.editorContentAreaHideContainer = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      display: none;\n    }\n  }\n"])));
+var editorContentAreaHideContainer = exports.editorContentAreaHideContainer = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      display: none;\n    }\n    .multiBodiedExtension--container {\n      display: none;\n    }\n  }\n"])));
 
 /* Prevent horizontal scroll on page in full width mode */
 var editorContentAreaContainerStyle = function editorContentAreaContainerStyle(containerWidth) {
-  return (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      max-width: ", "px;\n    }\n\n    [data-layout-section] {\n      max-width: ", "px;\n    }\n  }\n"])), containerWidth - TOTAL_PADDING - _consts.tableMarginFullWidthMode * 2, containerWidth - TOTAL_PADDING + _editorSharedStyles.akLayoutGutterOffset * 2);
+  return (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      max-width: ", "px;\n    }\n    .multiBodiedExtension--container {\n      max-width: ", "px;\n    }\n\n    [data-layout-section] {\n      max-width: ", "px;\n    }\n  }\n"])), containerWidth - TOTAL_PADDING - _consts.tableMarginFullWidthMode * 2, containerWidth - TOTAL_PADDING - _consts.tableMarginFullWidthMode * 2, containerWidth - TOTAL_PADDING + _editorSharedStyles.akLayoutGutterOffset * 2);
 };
 var editorContentAreaStyle = exports.editorContentAreaStyle = function editorContentAreaStyle(_ref) {
   var layoutMaxWidth = _ref.layoutMaxWidth,

package/dist/cjs/utils/document-logger.js

@@ -37,6 +37,8 @@ var hash = {
     extension: 'ext',
     inlineExtension: 'exti',
     bodiedExtension: 'extb',
+    multiBodiedExtension: 'extmbe',
+    extensionFrame: 'extfrm',
     status: 'sts',
     placeholder: 'plh',
     inlineCard: 'cardi',

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.6.14";
+var version = exports.version = "189.6.18";

package/dist/es2019/plugins/extension/ui/Extension/MultiBodiedExtension/index.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 
 import { jsx, css } from '@emotion/react';
-import { N30 } from '@atlaskit/theme/colors';
+import { N30, N40, N50 } from '@atlaskit/theme/colors';
 import React, { useState } from 'react';
 const useMultiBodiedExtensionActions = ({
   updateActiveChild,
@@ -20,17 +20,16 @@ const useMultiBodiedExtensionActions = ({
           dispatch
         } = editorView;
         if (node.content.childCount >= node.attrs.maxFrames) {
-          // TODO: add proper log on this
-          return false;
+          throw new Error(`Cannot add more than ${node.attrs.maxFrames} frames`);
         }
         const p = state.schema.nodes.paragraph.createAndFill({});
         if (!p) {
-          return false;
+          throw new Error('Could not create paragraph');
         }
         const frame = state.schema.nodes.extensionFrame.createAndFill({}, [p]);
         const pos = getPos();
         if (typeof pos !== 'number' || !frame) {
-          return false;
+          throw new Error('Could not create frame or position not valid');
         }
         const insertAt = Math.min((pos || 1) + node.content.size, state.doc.content.size);
         dispatch(state.tr.insert(insertAt, frame));
@@ -43,7 +42,7 @@ const useMultiBodiedExtensionActions = ({
         const pos = getPos();
         // TODO: Add child index validation here, don't trust this data
         if (typeof pos !== 'number' || typeof index !== 'number') {
-          return false;
+          throw new Error('Position or index not valid');
         }
         const {
           state,
@@ -60,7 +59,7 @@ const useMultiBodiedExtensionActions = ({
         const startFramePosition = $startNodePos.posAtIndex(index);
         const maybeFrameNode = state.doc.nodeAt(startFramePosition);
         if (!maybeFrameNode) {
-          return false;
+          throw new Error('Could not find frame node');
         }
         const endFramePosition = maybeFrameNode.content.size + startFramePosition;
         const tr = state.tr;
@@ -75,7 +74,7 @@ const useMultiBodiedExtensionActions = ({
         } = editorView;
         const pos = getPos();
         if (typeof pos !== 'number') {
-          return false;
+          throw new Error('Position not valid');
         }
         const tr = state.tr.setNodeMarkup(pos, undefined, {
           ...node.attrs,
@@ -108,6 +107,8 @@ const navigationCSS = css`
   // This is really important to keep the navigation working properly
   user-select: none;
   -webkit-user-modify: read-only;
+  border: 1px solid ${`var(--ds-border, ${N40})`};
+  background-color: ${`var(--ds-background-inverse-subtle, ${N50})`};
 `;
 const MultiBodiedExtension = ({
   node,
@@ -120,9 +121,8 @@ const MultiBodiedExtension = ({
   // Adding to avoid aliasing `this` for the callbacks
   const updateActiveChild = React.useCallback(index => {
     if (typeof index !== 'number') {
-      // TODO: Make sure we log this somewhere if this happens
       setActiveChildIndex(0);
-      return false;
+      throw new Error('Index is not valid');
     }
     setActiveChildIndex(index);
     return true;
@@ -141,14 +141,16 @@ const MultiBodiedExtension = ({
   }, [handleContentDOMRef]);
   const containerCSS = css`
     border: 1px solid ${`var(--ds-border, ${N30})`};
-    padding: ${"var(--ds-space-050, 4px)"};
+    min-height: 100px;
     .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'] {
       display: none;
     }
 
     .multiBodiedExtension-content-dom-wrapper
       > [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1}) {
+      border: 1px solid ${`var(--ds-border, ${N50})`};
       display: block;
+      min-height: 100px;
     }
   `;
   return jsx("section", {

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

@@ -401,7 +401,7 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
     const {
       marks: {
         code: codeMark,
-        link: linkMark
+        annotation: annotationMark
       },
       nodes: {
         bulletList,
@@ -411,7 +411,6 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
         listItem,
         mention,
         orderedList,
-        paragraph,
         text
       }
     } = schema;
@@ -425,24 +424,13 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
 
     // special case for codeMark: will preserve mark only if codeMark is currently active
     // won't preserve mark if cursor is on the edge on the mark (namely inactive)
-    if (codeMark.isInSet(selectionMarks) && !anyMarkActive(state, codeMark)) {
-      return false;
-    }
-    const isPlainTextSlice = slice.content.childCount === 1 && slice.content.firstChild.type === paragraph && slice.content.firstChild.content.childCount === 1 && slice.content.firstChild.firstChild.type === text;
-
-    // special case for plainTextSlice & linkMark: merge into existing link
-    if (isPlainTextSlice && linkMark.isInSet(selectionMarks) && selectionMarks.length === 1) {
-      const tr = closeHistory(state.tr).replaceSelectionWith(slice.content.firstChild.firstChild, true).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
-      if (dispatch) {
-        dispatch(tr);
-      }
-      return true;
-    }
+    const hasActiveCodeMark = codeMark && codeMark.isInSet(selectionMarks) && anyMarkActive(state, codeMark);
+    const hasAnnotationMark = annotationMark && annotationMark.isInSet(selectionMarks);
+    const selectionIsHeading = hasParentNodeOfType([heading])(state.selection);
 
     // if the pasted data is one of the node types below
     // we apply current selection marks to the pasted slice
-    if (hasOnlyNodesOfType(bulletList, hardBreak, heading, listItem, paragraph, text, emoji, mention, orderedList)(slice)) {
+    if (hasOnlyNodesOfType(bulletList, hardBreak, heading, listItem, text, emoji, mention, orderedList)(slice) || selectionIsHeading || hasActiveCodeMark || hasAnnotationMark) {
       const transformedSlice = applyTextMarksToSlice(schema, selectionMarks)(slice);
       const tr = closeHistory(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
       queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);

package/dist/es2019/ui/Appearance/FullPage/StyledComponents.js

@@ -62,6 +62,9 @@ export const editorContentAreaHideContainer = css`
     .extension-container {
       display: none;
     }
+    .multiBodiedExtension--container {
+      display: none;
+    }
   }
 `;
 
@@ -73,6 +76,9 @@ const editorContentAreaContainerStyle = containerWidth => css`
     .extension-container {
       max-width: ${containerWidth - TOTAL_PADDING - tableMarginFullWidthMode * 2}px;
     }
+    .multiBodiedExtension--container {
+      max-width: ${containerWidth - TOTAL_PADDING - tableMarginFullWidthMode * 2}px;
+    }
 
     [data-layout-section] {
       max-width: ${containerWidth - TOTAL_PADDING + akLayoutGutterOffset * 2}px;

package/dist/es2019/utils/document-logger.js

@@ -31,6 +31,8 @@ const hash = {
     extension: 'ext',
     inlineExtension: 'exti',
     bodiedExtension: 'extb',
+    multiBodiedExtension: 'extmbe',
+    extensionFrame: 'extfrm',
     status: 'sts',
     placeholder: 'plh',
     inlineCard: 'cardi',

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.6.14";
+export const version = "189.6.18";

package/dist/esm/plugins/extension/ui/Extension/MultiBodiedExtension/index.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 /** @jsx jsx */
 
 import { jsx, css } from '@emotion/react';
-import { N30 } from '@atlaskit/theme/colors';
+import { N30, N40, N50 } from '@atlaskit/theme/colors';
 import React, { useState } from 'react';
 var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_ref) {
   var updateActiveChild = _ref.updateActiveChild,
@@ -23,17 +23,16 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
         var state = editorView.state,
           dispatch = editorView.dispatch;
         if (node.content.childCount >= node.attrs.maxFrames) {
-          // TODO: add proper log on this
-          return false;
+          throw new Error("Cannot add more than ".concat(node.attrs.maxFrames, " frames"));
         }
         var p = state.schema.nodes.paragraph.createAndFill({});
         if (!p) {
-          return false;
+          throw new Error('Could not create paragraph');
         }
         var frame = state.schema.nodes.extensionFrame.createAndFill({}, [p]);
         var pos = getPos();
         if (typeof pos !== 'number' || !frame) {
-          return false;
+          throw new Error('Could not create frame or position not valid');
         }
         var insertAt = Math.min((pos || 1) + node.content.size, state.doc.content.size);
         dispatch(state.tr.insert(insertAt, frame));
@@ -46,7 +45,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
         var pos = getPos();
         // TODO: Add child index validation here, don't trust this data
         if (typeof pos !== 'number' || typeof index !== 'number') {
-          return false;
+          throw new Error('Position or index not valid');
         }
         var state = editorView.state,
           dispatch = editorView.dispatch;
@@ -61,7 +60,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
         var startFramePosition = $startNodePos.posAtIndex(index);
         var maybeFrameNode = state.doc.nodeAt(startFramePosition);
         if (!maybeFrameNode) {
-          return false;
+          throw new Error('Could not find frame node');
         }
         var endFramePosition = maybeFrameNode.content.size + startFramePosition;
         var tr = state.tr;
@@ -74,7 +73,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
           dispatch = editorView.dispatch;
         var pos = getPos();
         if (typeof pos !== 'number') {
-          return false;
+          throw new Error('Position not valid');
         }
         var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node.attrs), {}, {
           parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
@@ -98,7 +97,7 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
   }, [node, editorView, getPos, updateActiveChild]);
   return actions;
 };
-var navigationCSS = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  // make sure the user can't see a range selection inside the navigation\n  // This is really important to keep the navigation working properly\n  user-select: none;\n  -webkit-user-modify: read-only;\n"])));
+var navigationCSS = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  // make sure the user can't see a range selection inside the navigation\n  // This is really important to keep the navigation working properly\n  user-select: none;\n  -webkit-user-modify: read-only;\n  border: 1px solid ", ";\n  background-color: ", ";\n"])), "var(--ds-border, ".concat(N40, ")"), "var(--ds-background-inverse-subtle, ".concat(N50, ")"));
 var MultiBodiedExtension = function MultiBodiedExtension(_ref2) {
   var node = _ref2.node,
     handleContentDOMRef = _ref2.handleContentDOMRef,
@@ -112,9 +111,8 @@ var MultiBodiedExtension = function MultiBodiedExtension(_ref2) {
   // Adding to avoid aliasing `this` for the callbacks
   var updateActiveChild = React.useCallback(function (index) {
     if (typeof index !== 'number') {
-      // TODO: Make sure we log this somewhere if this happens
       setActiveChildIndex(0);
-      return false;
+      throw new Error('Index is not valid');
     }
     setActiveChildIndex(index);
     return true;
@@ -131,7 +129,7 @@ var MultiBodiedExtension = function MultiBodiedExtension(_ref2) {
   var articleRef = React.useCallback(function (node) {
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
-  var containerCSS = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    border: 1px solid ", ";\n    padding: ", ";\n    .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'] {\n      display: none;\n    }\n\n    .multiBodiedExtension-content-dom-wrapper\n      > [data-extension-frame='true']:nth-of-type(", ") {\n      display: block;\n    }\n  "])), "var(--ds-border, ".concat(N30, ")"), "var(--ds-space-050, 4px)", activeChildIndex + 1);
+  var containerCSS = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    border: 1px solid ", ";\n    min-height: 100px;\n    .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'] {\n      display: none;\n    }\n\n    .multiBodiedExtension-content-dom-wrapper\n      > [data-extension-frame='true']:nth-of-type(", ") {\n      border: 1px solid ", ";\n      display: block;\n      min-height: 100px;\n    }\n  "])), "var(--ds-border, ".concat(N30, ")"), activeChildIndex + 1, "var(--ds-border, ".concat(N50, ")"));
   return jsx("section", {
     className: "multiBodiedExtension--container",
     css: containerCSS,

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

@@ -383,7 +383,7 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
       selection = state.tr.selection;
     var _schema$marks = schema.marks,
       codeMark = _schema$marks.code,
-      linkMark = _schema$marks.link,
+      annotationMark = _schema$marks.annotation,
       _schema$nodes2 = schema.nodes,
       bulletList = _schema$nodes2.bulletList,
       emoji = _schema$nodes2.emoji,
@@ -392,7 +392,6 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
       listItem = _schema$nodes2.listItem,
       mention = _schema$nodes2.mention,
       orderedList = _schema$nodes2.orderedList,
-      paragraph = _schema$nodes2.paragraph,
       text = _schema$nodes2.text;
     if (!(selection instanceof TextSelection)) {
       return false;
@@ -404,29 +403,18 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
 
     // special case for codeMark: will preserve mark only if codeMark is currently active
     // won't preserve mark if cursor is on the edge on the mark (namely inactive)
-    if (codeMark.isInSet(selectionMarks) && !anyMarkActive(state, codeMark)) {
-      return false;
-    }
-    var isPlainTextSlice = slice.content.childCount === 1 && slice.content.firstChild.type === paragraph && slice.content.firstChild.content.childCount === 1 && slice.content.firstChild.firstChild.type === text;
-
-    // special case for plainTextSlice & linkMark: merge into existing link
-    if (isPlainTextSlice && linkMark.isInSet(selectionMarks) && selectionMarks.length === 1) {
-      var tr = closeHistory(state.tr).replaceSelectionWith(slice.content.firstChild.firstChild, true).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
-      if (dispatch) {
-        dispatch(tr);
-      }
-      return true;
-    }
+    var hasActiveCodeMark = codeMark && codeMark.isInSet(selectionMarks) && anyMarkActive(state, codeMark);
+    var hasAnnotationMark = annotationMark && annotationMark.isInSet(selectionMarks);
+    var selectionIsHeading = hasParentNodeOfType([heading])(state.selection);
 
     // if the pasted data is one of the node types below
     // we apply current selection marks to the pasted slice
-    if (hasOnlyNodesOfType(bulletList, hardBreak, heading, listItem, paragraph, text, emoji, mention, orderedList)(slice)) {
+    if (hasOnlyNodesOfType(bulletList, hardBreak, heading, listItem, text, emoji, mention, orderedList)(slice) || selectionIsHeading || hasActiveCodeMark || hasAnnotationMark) {
       var transformedSlice = applyTextMarksToSlice(schema, selectionMarks)(slice);
-      var _tr2 = closeHistory(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, _tr2, INPUT_METHOD.CLIPBOARD);
+      var tr = closeHistory(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
+      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
-        dispatch(_tr2);
+        dispatch(tr);
       }
       return true;
     }

package/dist/esm/ui/Appearance/FullPage/StyledComponents.js

@@ -22,11 +22,11 @@ export var sidebarArea = css(_templateObject5 || (_templateObject5 = _taggedTemp
 
 // initially hide until we have a containerWidth and can properly size them,
 // otherwise they can cause the editor width to extend which is non-recoverable
-export var editorContentAreaHideContainer = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      display: none;\n    }\n  }\n"])));
+export var editorContentAreaHideContainer = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      display: none;\n    }\n    .multiBodiedExtension--container {\n      display: none;\n    }\n  }\n"])));
 
 /* Prevent horizontal scroll on page in full width mode */
 var editorContentAreaContainerStyle = function editorContentAreaContainerStyle(containerWidth) {
-  return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      max-width: ", "px;\n    }\n\n    [data-layout-section] {\n      max-width: ", "px;\n    }\n  }\n"])), containerWidth - TOTAL_PADDING - tableMarginFullWidthMode * 2, containerWidth - TOTAL_PADDING + akLayoutGutterOffset * 2);
+  return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  .fabric-editor--full-width-mode {\n    .pm-table-container,\n    .code-block,\n    .extension-container {\n      max-width: ", "px;\n    }\n    .multiBodiedExtension--container {\n      max-width: ", "px;\n    }\n\n    [data-layout-section] {\n      max-width: ", "px;\n    }\n  }\n"])), containerWidth - TOTAL_PADDING - tableMarginFullWidthMode * 2, containerWidth - TOTAL_PADDING - tableMarginFullWidthMode * 2, containerWidth - TOTAL_PADDING + akLayoutGutterOffset * 2);
 };
 export var editorContentAreaStyle = function editorContentAreaStyle(_ref) {
   var layoutMaxWidth = _ref.layoutMaxWidth,

package/dist/esm/utils/document-logger.js

@@ -31,6 +31,8 @@ var hash = {
     extension: 'ext',
     inlineExtension: 'exti',
     bodiedExtension: 'extb',
+    multiBodiedExtension: 'extmbe',
+    extensionFrame: 'extfrm',
     status: 'sts',
     placeholder: 'plh',
     inlineCard: 'cardi',

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.6.14";
+export var version = "189.6.18";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.6.14",
+  "version": "189.6.18",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -47,7 +47,7 @@
     "@atlaskit/analytics-next-stable-react-context": "1.0.1",
     "@atlaskit/avatar": "^21.4.0",
     "@atlaskit/avatar-group": "^9.4.0",
-    "@atlaskit/button": "^16.18.0",
+    "@atlaskit/button": "^17.0.0",
     "@atlaskit/checkbox": "^13.0.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^13.0.3",
@@ -123,7 +123,7 @@
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/logo": "^13.14.0",
     "@atlaskit/media-card": "^77.6.0",
-    "@atlaskit/media-client": "^26.0.0",
+    "@atlaskit/media-client": "^26.1.0",
     "@atlaskit/media-common": "^11.0.0",
     "@atlaskit/mention": "^22.1.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
@@ -140,7 +140,7 @@
     "@atlaskit/textfield": "^6.0.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/toggle": "^13.0.0",
-    "@atlaskit/tokens": "^1.29.0",
+    "@atlaskit/tokens": "^1.30.0",
     "@atlaskit/tooltip": "^18.0.0",
     "@atlaskit/ufo": "^0.2.0",
     "@atlaskit/width-detector": "^4.1.0",
@@ -195,7 +195,7 @@
     "@atlassian/editor-extension-link-create": "^1.0.0",
     "@atlassian/feature-flags-test-utils": "^0.1.1",
     "@atlassian/link-picker-plugins": "^24.0.0",
-    "@atlassian/search-provider": "2.4.10",
+    "@atlassian/search-provider": "2.4.11",
     "@atlassian/ufo": "^0.2.0",
     "@emotion/jest": "^11.8.0",
     "@storybook/addon-knobs": "^5.3.18",