@atlaskit/editor-core 174.0.0 → 175.0.0

package/dist/cjs/plugins/panel/toolbar.js

@@ -45,8 +45,6 @@ var _analytics = require("../analytics");
 
 var _message = require("./message");
 
-var _toolbar = require("../copy-button/toolbar");
-
 var _panelIconMap;
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -273,10 +271,17 @@ var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isC
     }
   }
 
-  if (state && (0, _toolbar.showCopyButton)(state)) {
+  if (state) {
     items.push({
-      type: 'separator'
-    }, (0, _toolbar.getCopyButtonConfig)(state, formatMessage, panelNodeType));
+      type: 'copy-button',
+      items: [{
+        type: 'separator'
+      }, {
+        state: state,
+        formatMessage: formatMessage,
+        nodeType: panelNodeType
+      }]
+    });
   }
 
   items.push({
@@ -329,7 +334,8 @@ var getToolbarConfig = function getToolbarConfig(state, intl) {
       title: 'Panel floating controls',
       getDomRef: getDomRef,
       nodeType: nodeType,
-      items: items
+      items: items,
+      scrollable: true
     };
   }
 

package/dist/cjs/plugins/panel/utils.js

@@ -33,8 +33,8 @@ var panelAttrsToDom = function panelAttrsToDom(attrs, allowCustomPanel) {
       panelIconId = attrs.panelIconId,
       panelIconText = attrs.panelIconText;
   var isCustomPanel = panelType === _adfSchema.PanelType.CUSTOM && allowCustomPanel;
-  var style = panelColor && isCustomPanel ? "background-color: ".concat(panelColor) : '';
   var hasIcon = !isCustomPanel || !!panelIcon || !!panelIconId;
+  var style = ["".concat(panelColor && isCustomPanel ? "background-color: ".concat(panelColor, ";") : ''), "".concat(hasIcon ? '' : 'padding: 12px;')].join('');
   var panelAttrs = {
     class: _panel.PanelSharedCssClassName.prefix,
     'data-panel-type': panelType || _adfSchema.PanelType.INFO,

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

@@ -21,7 +21,6 @@ exports.handlePastePanelIntoList = handlePastePanelIntoList;
 exports.handlePastePreservingMarks = handlePastePreservingMarks;
 exports.handleRichText = handleRichText;
 exports.handleSelectedTable = void 0;
-exports.insertIntoPanel = insertIntoPanel;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -100,7 +99,7 @@ function handleMention(slice, schema) {
 
 function handlePasteIntoTaskOrDecisionOrPanel(slice) {
   return function (state, dispatch) {
-    var _slice$content$firstC, _slice$content$firstC2, _transformedSlice$con;
+    var _slice$content$firstC, _transformedSlice$con;
 
     var schema = state.schema,
         selection = state.tr.selection;
@@ -116,19 +115,25 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice) {
         panel = _schema$nodes.panel,
         bulletList = _schema$nodes.bulletList,
         orderedList = _schema$nodes.orderedList,
+        listItem = _schema$nodes.listItem,
         expand = _schema$nodes.expand,
         heading = _schema$nodes.heading;
     var selectionIsValidNode = state.selection instanceof _prosemirrorState.NodeSelection && ['decisionList', 'decisionItem', 'taskList', 'taskItem'].includes(state.selection.node.type.name);
     var selectionHasValidParentNode = (0, _prosemirrorUtils.hasParentNodeOfType)([decisionItem, taskItem, panel])(state.selection);
     var selectionIsPanel = (0, _prosemirrorUtils.hasParentNodeOfType)([panel])(state.selection); // Some types of content should be handled by the default handler, not this function.
+    // Check through slice content to see if it contains an invalid node.
 
-    var sliceFirstNodeType = (_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type;
-    var sliceIsInvalid = sliceFirstNodeType === bulletList || sliceFirstNodeType === orderedList || sliceFirstNodeType === expand || sliceFirstNodeType === heading; // If the selection is a panel,
+    var sliceIsInvalid = false;
+    slice.content.nodesBetween(0, slice.content.size, function (node) {
+      if (node.type === bulletList || node.type === orderedList || node.type === expand || node.type === heading || node.type === listItem) {
+        sliceIsInvalid = true;
+      }
+    }); // If the selection is a panel,
     // and the slice's first node is a paragraph
     // and it is not from a depth that would indicate it being from inside from another node (e.g. text from a decision)
     // then we can rely on the default behaviour.
 
-    var sliceIsAPanelReceivingLowDepthText = selectionIsPanel && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === paragraph && slice.openEnd < 2;
+    var sliceIsAPanelReceivingLowDepthText = selectionIsPanel && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === paragraph && slice.openEnd < 2;
 
     if (sliceIsInvalid || sliceIsAPanelReceivingLowDepthText || !selectionIsValidNode && !selectionHasValidParentNode) {
       return false;
@@ -583,6 +588,7 @@ function handleExpandPasteInTable(slice) {
 function handleMarkdown(markdownSlice, from, to) {
   return function (state, dispatch) {
     var tr = (0, _prosemirrorHistory.closeHistory)(state.tr);
+    var pastesFrom = typeof from === 'number' ? from : tr.selection.from;
 
     if (typeof from === 'number' && typeof to === 'number') {
       tr.replaceRange(from, to, markdownSlice);
@@ -590,6 +596,7 @@ function handleMarkdown(markdownSlice, from, to) {
       tr.replaceSelection(markdownSlice);
     }
 
+    tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve(pastesFrom + markdownSlice.size), -1));
     (0, _doc.queueCardsFromChangedTr)(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
 
     if (dispatch) {
@@ -762,22 +769,6 @@ function flattenNestedListInSlice(slice) {
   return new _prosemirrorModel.Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
 
-function insertIntoPanel(tr, slice, panel) {
-  var panelParentOverCurrentSelection = (0, _prosemirrorUtils.findParentNodeOfType)(panel)(tr.selection);
-
-  if (tr.selection.$from === tr.selection.$to && panelParentOverCurrentSelection && !panelParentOverCurrentSelection.node.textContent) {
-    tr = (0, _prosemirrorUtils.safeInsert)(slice.content, tr.selection.$to.pos)(tr); // set selection to end of inserted content
-
-    var panelNode = (0, _prosemirrorUtils.findParentNodeOfType)(panel)(tr.selection);
-
-    if (panelNode) {
-      tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve(panelNode.pos + panelNode.node.nodeSize)));
-    }
-  } else {
-    tr.replaceSelection(slice);
-  }
-}
-
 function handleRichText(slice) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _panelParentOverCurre;
@@ -825,18 +816,22 @@ function handleRichText(slice) {
     } else if (noNeedForSafeInsert) {
       tr.replaceSelection(slice);
     } else {
-      // need to scan the slice if there's a block node inside it
+      // need to scan the slice if there's a block node or list items inside it
       var doesBlockNodeExist = false;
+      var sliceHasList = false;
       slice.content.nodesBetween(0, slice.content.size, function (node, start) {
+        if (node.type === state.schema.nodes.listItem) {
+          sliceHasList = true;
+        }
+
         if (start >= slice.openStart && start <= slice.content.size - slice.openEnd && node.isBlock) {
           doesBlockNodeExist = true;
           return false;
         }
       });
 
-      if ((0, _utils2.insideTableCell)(state) && !doesBlockNodeExist) {
-        // bring back the old code for inline nodes
-        insertIntoPanel(tr, slice, panel);
+      if ((0, _utils2.insideTableCell)(state) && (!doesBlockNodeExist || (0, _utils2.isInListItem)(state)) || sliceHasList) {
+        tr.replaceSelection(slice);
       } else {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle

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

@@ -174,7 +174,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainTextPasteLi
         }
       },
       handlePaste: function handlePaste(view, rawEvent, slice) {
-        var _analyticsPlugin$perf, _analyticsPlugin$perf2, _schema$nodes, _schema$nodes2, _schema$nodes3;
+        var _text, _analyticsPlugin$perf, _analyticsPlugin$perf2, _schema$nodes, _schema$nodes2, _schema$nodes3;
 
         var event = rawEvent;
 
@@ -193,6 +193,10 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainTextPasteLi
           slice = new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.from(schema.text(text)), 1, 1);
         }
 
+        if ((_text = text) !== null && _text !== void 0 && _text.includes('\r')) {
+          text = text.replace(/\r/g, '');
+        }
+
         var isPastedFile = clipboard.isPastedFile(event);
         var isPlainText = text && !html;
         var isRichText = !!html; // Bail if copied content has files

package/dist/cjs/plugins/rank.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _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', 'typeAhead', 'typeAheadKeymap', 'typeAheadInputRule', 'date', // Needs to be before indentation to handle tab into input field
+  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:

package/dist/cjs/plugins/rule/pm-plugins/input-rule.js

@@ -82,8 +82,7 @@ function inputRulePlugin(schema, featureFlags) {
 
   if (rules.length !== 0) {
     return (0, _inputRules.createPlugin)('rule', rules, {
-      isBlockNodeRule: true,
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
+      isBlockNodeRule: true
     });
   }
 

package/dist/cjs/plugins/selection/pm-plugins/selection-main.js

@@ -9,14 +9,14 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _prosemirrorState = require("prosemirror-state");
 
+var _actions = require("../actions");
+
 var _pluginFactory = require("../plugin-factory");
 
 var _types = require("../types");
 
 var _utils = require("../utils");
 
-var _actions = require("../actions");
-
 var getInitialState = function getInitialState(state) {
   return {
     decorationSet: (0, _utils.getDecorations)(state.tr),
@@ -137,13 +137,18 @@ var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent) {
           // Fixed when contenteditable = false, but then you couldn't edit their contents
           // Therefore, briefly set contenteditable=false to allow the selection through, then set it back to true
           if (event instanceof KeyboardEvent && event.shiftKey && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {
-            var state = editorView.state;
+            var state = editorView.state; // If current depth is on the top most level, skip that
+
+            if (state.selection.$head.depth <= 0) {
+              return false;
+            }
+
             var pos;
 
             if (event.key === 'ArrowDown') {
               pos = state.selection.$head.after();
             } else {
-              pos = state.selection.$head.before() - 1; // block extensions only take up one position, dont need to get before()
+              pos = Math.max(state.selection.$head.before() - 1, 0); // block extensions only take up one position, dont need to get before()
 
               if (!editorView.nodeDOM(pos)) {
                 pos = state.doc.resolve(pos).before();

package/dist/cjs/plugins/tasks-and-decisions/pm-plugins/input-rules.js

@@ -94,8 +94,7 @@ function inputRulePlugin(schema, featureFlags) {
   }
 
   return (0, _inputRules.createPlugin)('tasks-and-decisions', rules, {
-    isBlockNodeRule: true,
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
+    isBlockNodeRule: true
   });
 }
 

package/dist/cjs/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -62,7 +62,12 @@ var actionDecisionFollowsOrNothing = function actionDecisionFollowsOrNothing($po
 };
 
 var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispatch) {
-  // look for the node after this current one
+  // only run if selection is at end of text, and inside a task or decision item
+  if (!(0, _commands.isEmptySelectionAtEnd)(state) || !(0, _helpers.isInsideTaskOrDecisionItem)(state) || !dispatch) {
+    return false;
+  } // look for the node after this current one
+
+
   var $next = (0, _helpers.walkOut)(state.selection.$from); // if there's no taskItem or taskList following, then
   // we just do the normal behaviour
 
@@ -212,58 +217,48 @@ var backspace = (0, _commands.filter)(_commands.isEmptySelectionAtStart, (0, _pr
 }, (0, _commands.filter)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
   return backspaceFrom(state.selection.$from)(state, dispatch);
 })), ['taskList', 'decisionList']));
-var deleteHandler = (0, _commands.filter)([_helpers.isInsideTaskOrDecisionItem, _commands.isEmptySelectionAtEnd], (0, _prosemirrorCommands.chainCommands)(joinTaskDecisionFollowing, function (state, dispatch) {
-  // look for the node after this current one
-  var $next = (0, _helpers.walkOut)(state.selection.$from);
-  var _state$schema$nodes5 = state.schema.nodes,
+
+var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTaskDecisionFollowing(state, dispatch) {
+  var $from = state.selection.$from,
+      _state$schema$nodes5 = state.schema.nodes,
       taskList = _state$schema$nodes5.taskList,
+      doc = _state$schema$nodes5.doc,
       paragraph = _state$schema$nodes5.paragraph,
-      doc = _state$schema$nodes5.doc; // this is a top-level node it wont have $next.before()
+      tr = state.tr; // only run if cursor is at the end of the node
 
-  if (!$next.parent || $next.parent.type === doc) {
+  if (!(0, _commands.isEmptySelectionAtEnd)(state) || !dispatch) {
     return false;
-  } // previous was empty, just delete backwards
+  } // look for the node after this current one
 
 
-  var taskBefore = $next.doc.resolve($next.before());
+  var $next = (0, _helpers.walkOut)($from); // this is a top-level node it wont have $next.before()
 
-  if (taskBefore.nodeBefore && (0, _helpers.isActionOrDecisionItem)(taskBefore.nodeBefore) && taskBefore.nodeBefore.nodeSize === 2) {
+  if (!$next.parent || $next.parent.type === doc) {
     return false;
   } // if nested, just unindent
 
 
   if ($next.node($next.depth - 2).type === taskList || // this is for the case when we are on a non-nested item and next one is nested
   $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
-    var tr = (0, _helpers.liftBlock)(state.tr, $next, $next);
-
-    if (dispatch && tr) {
-      dispatch(tr);
-    }
-
+    (0, _helpers.liftBlock)(tr, $next, $next);
+    dispatch(tr);
     return true;
-  } // if located inside of a table, don't delete forward
+  } // if next node is of same type, remove the node wrapping and create paragraph
 
 
-  if ((0, _helpers.isTable)(taskBefore.nodeBefore)) {
-    return false;
-  } // bottom level, should "unwrap" taskItem contents into paragraph
-  // we achieve this by slicing the content out, and replacing
-
-
-  if (actionDecisionFollowsOrNothing(state.selection.$from)) {
-    if (dispatch) {
-      var taskContent = state.doc.slice($next.start(), $next.end()).content; // might be end of document after
-
-      var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : [];
-      dispatch(splitListItemWith(state.tr, slice, $next, false));
-    }
+  if (!(0, _helpers.isTable)($next.nodeAfter) && (0, _helpers.isActionOrDecisionItem)($from.parent) && actionDecisionFollowsOrNothing($from) && // only forward delete if the node is same type
+  $next.node().type.name === $from.node().type.name) {
+    var taskContent = state.doc.slice($next.start(), $next.end()).content; // might be end of document after
 
+    var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : [];
+    dispatch(splitListItemWith(tr, slice, $next, false));
     return true;
   }
 
   return false;
-}));
-var deleteForwards = (0, _prosemirrorCommands.autoJoin)(deleteHandler, ['taskList', 'decisionList']);
+};
+
+var deleteForwards = (0, _prosemirrorCommands.autoJoin)((0, _prosemirrorCommands.chainCommands)((0, _commands.deleteEmptyParagraphAndMoveBlockUp)(_helpers.isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
 
 var splitListItemWith = function splitListItemWith(tr, content, $from, setSelection) {
   var origDoc = tr.doc; // split just before the current item
@@ -402,6 +397,7 @@ function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   var keymaps = _objectSpread({
     Backspace: backspace,
     Delete: deleteForwards,
+    'Ctrl-d': deleteForwards,
     Enter: enter
   }, allowNestedTasks ? indentHandlers : defaultHandlers);
 

package/dist/cjs/plugins/text-formatting/pm-plugins/input-rule.js

@@ -29,8 +29,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _inputRules = require("../../../utils/input-rules");
 
-var _featureFlagsContext = require("../../feature-flags-context");
-
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 
 var _analytics = require("../../analytics");
@@ -121,22 +119,6 @@ function addMark(markType, schema, char) {
       tr.delete(mappedEnd - char.length, mappedEnd);
     }
 
-    var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
-        useUnpredictableInputRule = _getFeatureFlags.useUnpredictableInputRule;
-
-    if (useUnpredictableInputRule) {
-      // THe unpredictable input rule is keeping the last char in the document
-      // for example: `lol` the second stick need to removed
-      if (char.length === 2) {
-        tr.delete(mappedEnd - 1, mappedEnd);
-      } // And for range selection too
-
-
-      if (!tr.selection.empty) {
-        tr.deleteSelection();
-      }
-    }
-
     if (textPrefix === char) {
       tr.delete(mappedStart, mappedStart + char.length);
     }
@@ -329,9 +311,7 @@ function inputRulePlugin(schema, featureFlags) {
   }
 
   if (rules.length !== 0) {
-    return (0, _inputRules.createPlugin)('text-formatting', rules, {
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-    });
+    return (0, _inputRules.createPlugin)('text-formatting', rules);
   }
 
   return;

package/dist/cjs/plugins/text-formatting/pm-plugins/main.js

@@ -110,9 +110,9 @@ var plugin = function plugin(dispatch) {
         var state = view.state,
             dispatch = view.dispatch;
 
-        if (event.key === keymaps.moveRight.common) {
+        if (event.key === keymaps.moveRight.common && !event.metaKey) {
           return commands.moveRight()(state, dispatch);
-        } else if (event.key === keymaps.moveLeft.common) {
+        } else if (event.key === keymaps.moveLeft.common && !event.metaKey) {
           return commands.moveLeft()(state, dispatch);
         }
 

package/dist/cjs/plugins/text-formatting/pm-plugins/smart-input-rule.js

@@ -192,9 +192,7 @@ function getPunctuationRules() {
 }
 
 var _default = function _default(featureFlags) {
-  return (0, _inputRules.createPlugin)('text-formatting:smart-input', [].concat((0, _toConsumableArray2.default)(getProductRules()), (0, _toConsumableArray2.default)(getSymbolRules()), (0, _toConsumableArray2.default)(getPunctuationRules())), {
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-  });
+  return (0, _inputRules.createPlugin)('text-formatting:smart-input', [].concat((0, _toConsumableArray2.default)(getProductRules()), (0, _toConsumableArray2.default)(getSymbolRules()), (0, _toConsumableArray2.default)(getPunctuationRules())));
 };
 
 exports.default = _default;

package/dist/cjs/plugins/type-ahead/pm-plugins/input-rules.js

@@ -36,8 +36,7 @@ function inputRulePlugin(schema, typeAheads, featureFlags) {
     return acc;
   }, []);
   var plugin = (0, _inputRules.createPlugin)('type-ahead', rules, {
-    allowInsertTextOnDocument: false,
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
+    allowInsertTextOnDocument: false
   });
   return plugin;
 }

package/dist/cjs/ui/Appearance/Chromeless.js

@@ -93,7 +93,9 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         ref: function ref(_ref2) {
           return _this.containerElement = _ref2;
         }
-      }, (0, _react2.jsx)(ContentArea, null, customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
+      }, (0, _react2.jsx)(ContentArea, {
+        className: "ak-editor-content-area"
+      }, customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
         editorView: editorView,
         editorActions: editorActions,
         eventDispatcher: eventDispatcher,

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -49,7 +49,7 @@ var _pluginKey = require("../../../plugins/media/pm-plugins/plugin-key");
 
 var _Addon = require("../../Addon");
 
-var _commonStyles = require("../../../plugins/table/ui/common-styles");
+var _commonStyles = require("@atlaskit/editor-plugin-table/ui/common-styles");
 
 var _WithFlash = _interopRequireDefault(require("../../WithFlash"));
 

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

@@ -106,7 +106,7 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
       "data-testid": "ak-editor-main-toolbar"
     }, (0, _react2.jsx)("div", {
       css: (0, _MainToolbar.mainToolbarFirstChildStyle)(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
-      role: "region",
+      role: "toolbar",
       "aria-label": props.intl.formatMessage(_messages.default.toolbarLabel)
     }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), (0, _react2.jsx)("div", {
       css: (0, _MainToolbar.mainToolbarSecondChildStyle)(!!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.twoLineEditorToolbar)),

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

@@ -17,9 +17,9 @@ var _adfSchema = require("@atlaskit/adf-schema");
 
 var _ContentStyles = require("../../ContentStyles");
 
-var _commonStyles = require("../../../plugins/table/ui/common-styles");
+var _commonStyles = require("@atlaskit/editor-plugin-table/ui/common-styles");
 
-var _consts = require("../../../plugins/table/ui/consts");
+var _consts = require("@atlaskit/editor-plugin-table/ui/consts");
 
 var _styles = require("../../styles");
 

package/dist/cjs/ui/ColorPickerButton/index.js

@@ -56,6 +56,13 @@ var ColorPickerButton = function ColorPickerButton(props) {
     setIsPopupOpen(!isPopupOpen);
   };
 
+  _react.default.useEffect(function () {
+    if (props.setDisableParentScroll) {
+      props.setDisableParentScroll(isPopupOpen);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [isPopupOpen]);
+
   var ColorPaletteWithListeners = (0, _ui.withOuterListeners)(_ColorPalette.default);
 
   var onColorSelected = function onColorSelected(color, label) {
@@ -95,7 +102,13 @@ var ColorPickerButton = function ColorPickerButton(props) {
       fitHeight: 350,
       fitWidth: 350,
       offset: [0, 10],
-      alignX: props.alignX
+      alignX: props.alignX,
+      mountTo: props.setDisableParentScroll ? props.mountPoint : undefined // Confluence inline comment editor has z-index: 500
+      // if the toolbar is scrollable, this will be mounted in the root editor
+      // we need an index of > 500 to display over it
+      ,
+      zIndex: props.setDisableParentScroll ? 600 : undefined,
+      ariaLabel: "Color picker popup"
     }, (0, _react2.jsx)("div", {
       css: colorPickerWrapper
     }, (0, _react2.jsx)(ColorPaletteWithListeners, {

package/dist/cjs/ui/ContentStyles/index.js

@@ -27,7 +27,7 @@ var _styles3 = require("../../plugins/collab-edit/styles");
 
 var _styles4 = require("../../plugins/selection/gap-cursor/styles");
 
-var _commonStyles = require("../../plugins/table/ui/common-styles");
+var _commonStyles = require("@atlaskit/editor-plugin-table/ui/common-styles");
 
 var _styles5 = require("../../plugins/placeholder/styles");
 

package/dist/cjs/ui/ElementBrowser/InsertMenu.js

@@ -145,7 +145,8 @@ var ViewMore = function ViewMore(_ref3) {
       css: itemBefore
     }, item.icon()),
     "aria-describedby": item.title,
-    "data-testid": "view-more-elements-item",
+    "data-testid": "view-more-elements-item" // @ts-ignore Overriding Menu styles is not supported
+    ,
     css: (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n          padding: 0px 12px;\n        "])))
   }, item.title));
 };

package/dist/cjs/ui/PortalProvider/index.js

@@ -41,6 +41,8 @@ var _components = require("@atlaskit/theme/components");
 
 var _PortalProviderThemesProvider = require("./PortalProviderThemesProvider");
 
+var _ui = require("@atlaskit/editor-common/ui");
+
 var _class;
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -202,20 +204,34 @@ var BasePortalProvider = /*#__PURE__*/function (_React$Component) {
 var PortalProvider = (0, _reactIntlNext.injectIntl)(BasePortalProvider);
 exports.PortalProvider = PortalProvider;
 
-var PortalProviderWithThemeProviders = function PortalProviderWithThemeProviders(props) {
+var PortalProviderWithThemeProviders = function PortalProviderWithThemeProviders(_ref2) {
+  var onAnalyticsEvent = _ref2.onAnalyticsEvent,
+      useAnalyticsContext = _ref2.useAnalyticsContext,
+      render = _ref2.render;
+  return /*#__PURE__*/_react.default.createElement(_ui.IntlProviderIfMissingWrapper, null, /*#__PURE__*/_react.default.createElement(PortalProviderWithThemeAndIntlProviders, {
+    onAnalyticsEvent: onAnalyticsEvent,
+    useAnalyticsContext: useAnalyticsContext,
+    render: render
+  }));
+};
+
+exports.PortalProviderWithThemeProviders = PortalProviderWithThemeProviders;
+
+var PortalProviderWithThemeAndIntlProviders = function PortalProviderWithThemeAndIntlProviders(_ref3) {
+  var onAnalyticsEvent = _ref3.onAnalyticsEvent,
+      useAnalyticsContext = _ref3.useAnalyticsContext,
+      render = _ref3.render;
   var intl = (0, _reactIntlNext.useIntl)();
   var globalTheme = (0, _components.useGlobalTheme)();
   return /*#__PURE__*/_react.default.createElement(BasePortalProvider, {
     intl: intl,
     themeMode: globalTheme.mode,
-    onAnalyticsEvent: props.onAnalyticsEvent,
-    useAnalyticsContext: props.useAnalyticsContext,
-    render: props.render
+    onAnalyticsEvent: onAnalyticsEvent,
+    useAnalyticsContext: useAnalyticsContext,
+    render: render
   });
 };
 
-exports.PortalProviderWithThemeProviders = PortalProviderWithThemeProviders;
-
 var PortalRenderer = /*#__PURE__*/function (_React$Component2) {
   (0, _inherits2.default)(PortalRenderer, _React$Component2);
 
@@ -243,10 +259,10 @@ var PortalRenderer = /*#__PURE__*/function (_React$Component2) {
     key: "render",
     value: function render() {
       var portals = this.state.portals;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Array.from(portals.entries()).map(function (_ref2) {
-        var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-            container = _ref3[0],
-            children = _ref3[1];
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Array.from(portals.entries()).map(function (_ref4) {
+        var _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+            container = _ref5[0],
+            children = _ref5[1];
 
         return /*#__PURE__*/(0, _reactDom.createPortal)(children, container);
       }));
@@ -277,10 +293,10 @@ var AnalyticsContextWrapper = (_class = /*#__PURE__*/function (_React$Component3
   (0, _createClass2.default)(AnalyticsContextWrapper, [{
     key: "render",
     value: function render() {
-      var _ref4 = this.context.contextAdapter.analytics || {
+      var _ref6 = this.context.contextAdapter.analytics || {
         value: dummyAnalyticsContext
       },
-          value = _ref4.value;
+          value = _ref6.value;
 
       return /*#__PURE__*/_react.default.createElement(_analyticsNextStableReactContext.default.Provider, {
         value: value

package/dist/cjs/ui/Resizer/index.js

@@ -86,7 +86,6 @@ var Resizer = /*#__PURE__*/function (_React$Component) {
       var _this$props = _this.props,
           _this$props$innerPadd = _this$props.innerPadding,
           innerPadding = _this$props$innerPadd === void 0 ? 0 : _this$props$innerPadd,
-          handleResizeStart = _this$props.handleResizeStart,
           highlights = _this$props.highlights,
           displayGrid = _this$props.displayGrid,
           layout = _this$props.layout,
@@ -95,10 +94,6 @@ var Resizer = /*#__PURE__*/function (_React$Component) {
 
       event.preventDefault();
 
-      if (handleResizeStart && !handleResizeStart(event)) {
-        return false;
-      }
-
       _this.setState({
         isResizing: true
       }, function () {