@atlaskit/editor-core 174.0.0 → 175.0.1

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

@@ -18,7 +18,7 @@ import { TextSelection, NodeSelection } from 'prosemirror-state';
 import { findParentNodeOfType, hasParentNodeOfType, safeInsert } from 'prosemirror-utils';
 import uuid from 'uuid/v4';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
-import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell } from '../../utils';
+import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell, isInListItem } from '../../utils';
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
 import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
@@ -51,7 +51,7 @@ export function handleMention(slice, schema) {
 }
 export 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;
@@ -67,19 +67,25 @@ export 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 NodeSelection && ['decisionList', 'decisionItem', 'taskList', 'taskItem'].includes(state.selection.node.type.name);
     var selectionHasValidParentNode = hasParentNodeOfType([decisionItem, taskItem, panel])(state.selection);
     var selectionIsPanel = 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;
@@ -525,6 +531,7 @@ export function handleExpandPasteInTable(slice) {
 export function handleMarkdown(markdownSlice, from, to) {
   return function (state, dispatch) {
     var tr = closeHistory(state.tr);
+    var pastesFrom = typeof from === 'number' ? from : tr.selection.from;
 
     if (typeof from === 'number' && typeof to === 'number') {
       tr.replaceRange(from, to, markdownSlice);
@@ -532,6 +539,7 @@ export function handleMarkdown(markdownSlice, from, to) {
       tr.replaceSelection(markdownSlice);
     }
 
+    tr.setSelection(TextSelection.near(tr.doc.resolve(pastesFrom + markdownSlice.size), -1));
     queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
 
     if (dispatch) {
@@ -702,21 +710,6 @@ export function flattenNestedListInSlice(slice) {
   var contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-export function insertIntoPanel(tr, slice, panel) {
-  var panelParentOverCurrentSelection = findParentNodeOfType(panel)(tr.selection);
-
-  if (tr.selection.$from === tr.selection.$to && panelParentOverCurrentSelection && !panelParentOverCurrentSelection.node.textContent) {
-    tr = safeInsert(slice.content, tr.selection.$to.pos)(tr); // set selection to end of inserted content
-
-    var panelNode = findParentNodeOfType(panel)(tr.selection);
-
-    if (panelNode) {
-      tr.setSelection(TextSelection.near(tr.doc.resolve(panelNode.pos + panelNode.node.nodeSize)));
-    }
-  } else {
-    tr.replaceSelection(slice);
-  }
-}
 export function handleRichText(slice) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _panelParentOverCurre;
@@ -764,18 +757,22 @@ export 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 (insideTableCell(state) && !doesBlockNodeExist) {
-        // bring back the old code for inline nodes
-        insertIntoPanel(tr, slice, panel);
+      if (insideTableCell(state) && (!doesBlockNodeExist || 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/esm/plugins/paste/pm-plugins/main.js

@@ -117,7 +117,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainText
         }
       },
       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;
 
@@ -136,6 +136,10 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainText
           slice = new Slice(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/esm/plugins/rank.js

@@ -1,5 +1,5 @@
 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', '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/esm/plugins/rule/pm-plugins/input-rule.js

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

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

@@ -1,9 +1,9 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection, TextSelection } from 'prosemirror-state';
+import { SelectionActionTypes } from '../actions';
 import { createPluginState, getPluginState } from '../plugin-factory';
 import { selectionPluginKey } from '../types';
-import { getDecorations, shouldRecalcDecorations, getNodeSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload } from '../utils';
-import { SelectionActionTypes } from '../actions';
+import { getAllSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, getDecorations, getNodeSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, shouldRecalcDecorations } from '../utils';
 export var getInitialState = function getInitialState(state) {
   return {
     decorationSet: getDecorations(state.tr),
@@ -122,13 +122,18 @@ export 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/esm/plugins/tasks-and-decisions/pm-plugins/input-rules.js

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

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

@@ -10,11 +10,11 @@ import { Fragment, Slice } from 'prosemirror-model';
 import { TextSelection } from 'prosemirror-state';
 import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { uuid } from '@atlaskit/adf-schema';
-import { filter, isEmptySelectionAtEnd, isEmptySelectionAtStart } from '../../../utils/commands';
+import { filter, isEmptySelectionAtStart, deleteEmptyParagraphAndMoveBlockUp, isEmptySelectionAtEnd } from '../../../utils/commands';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
-import { getBlockRange, getCurrentIndentLevel, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideTask, isInsideTaskOrDecisionItem, liftBlock, subtreeHeight, walkOut, isTable, getTaskItemIndex, isInsideDecision } from './helpers';
+import { getBlockRange, getCurrentIndentLevel, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideTask, isInsideTaskOrDecisionItem, liftBlock, subtreeHeight, walkOut, getTaskItemIndex, isInsideDecision, isTable } from './helpers';
 
 var indentationAnalytics = function indentationAnalytics(curIndentLevel, direction, inputMethod) {
   return {
@@ -42,7 +42,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 (!isEmptySelectionAtEnd(state) || !isInsideTaskOrDecisionItem(state) || !dispatch) {
+    return false;
+  } // look for the node after this current one
+
+
   var $next = walkOut(state.selection.$from); // if there's no taskItem or taskList following, then
   // we just do the normal behaviour
 
@@ -187,58 +192,48 @@ var backspace = filter(isEmptySelectionAtStart, autoJoin(chainCommands(function
 }, filter(isInsideTaskOrDecisionItem, function (state, dispatch) {
   return backspaceFrom(state.selection.$from)(state, dispatch);
 })), ['taskList', 'decisionList']));
-var deleteHandler = filter([isInsideTaskOrDecisionItem, isEmptySelectionAtEnd], chainCommands(joinTaskDecisionFollowing, function (state, dispatch) {
-  // look for the node after this current one
-  var $next = 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 (!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 = walkOut($from); // this is a top-level node it wont have $next.before()
 
-  if (taskBefore.nodeBefore && 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 = liftBlock(state.tr, $next, $next);
-
-    if (dispatch && tr) {
-      dispatch(tr);
-    }
-
+    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 (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 (!isTable($next.nodeAfter) && 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 = autoJoin(deleteHandler, ['taskList', 'decisionList']);
+};
+
+var deleteForwards = autoJoin(chainCommands(deleteEmptyParagraphAndMoveBlockUp(isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
 
 var splitListItemWith = function splitListItemWith(tr, content, $from, setSelection) {
   var origDoc = tr.doc; // split just before the current item
@@ -375,6 +370,7 @@ export function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   var keymaps = _objectSpread({
     Backspace: backspace,
     Delete: deleteForwards,
+    'Ctrl-d': deleteForwards,
     Enter: enter
   }, allowNestedTasks ? indentHandlers : defaultHandlers);
 

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

@@ -15,7 +15,6 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import { createPlugin, createRule, ruleWithAnalytics } from '../../../utils/input-rules';
-import { getFeatureFlags } from '../../feature-flags-context';
 import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
 import { transformSmartCharsMentionsAndEmojis } from '../commands/transform-to-code';
@@ -96,22 +95,6 @@ function addMark(markType, schema, char) {
       tr.delete(mappedEnd - char.length, mappedEnd);
     }
 
-    var _getFeatureFlags = 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);
     }
@@ -300,9 +283,7 @@ export function inputRulePlugin(schema, featureFlags) {
   }
 
   if (rules.length !== 0) {
-    return createPlugin('text-formatting', rules, {
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-    });
+    return createPlugin('text-formatting', rules);
   }
 
   return;

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

@@ -87,9 +87,9 @@ export 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/esm/plugins/text-formatting/pm-plugins/smart-input-rule.js

@@ -178,7 +178,5 @@ function getPunctuationRules() {
 }
 
 export default (function (featureFlags) {
-  return createPlugin('text-formatting:smart-input', [].concat(_toConsumableArray(getProductRules()), _toConsumableArray(getSymbolRules()), _toConsumableArray(getPunctuationRules())), {
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-  });
+  return createPlugin('text-formatting:smart-input', [].concat(_toConsumableArray(getProductRules()), _toConsumableArray(getSymbolRules()), _toConsumableArray(getPunctuationRules())));
 });

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

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

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

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

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

@@ -27,7 +27,7 @@ import WithPluginState from '../../WithPluginState';
 import { pluginKey as maxContentSizePluginKey } from '../../../plugins/max-content-size';
 import { stateKey as mediaPluginKey } from '../../../plugins/media/pm-plugins/plugin-key';
 import { ClickAreaBlock } from '../../Addon';
-import { tableCommentEditorStyles } from '../../../plugins/table/ui/common-styles';
+import { tableCommentEditorStyles } from '@atlaskit/editor-plugin-table/ui/common-styles';
 import WithFlash from '../../WithFlash';
 import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';

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

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

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

@@ -6,8 +6,8 @@ import { css } from '@emotion/react';
 import { akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorSwoopCubicBezier, akLayoutGutterOffset, ATLASSIAN_NAVIGATION_HEIGHT, akEditorContextPanelWidth } from '@atlaskit/editor-shared-styles';
 import { taskListSelector, decisionListSelector } from '@atlaskit/adf-schema';
 import { createEditorContentStyle } from '../../ContentStyles';
-import { tableFullPageEditorStyles } from '../../../plugins/table/ui/common-styles';
-import { tableMarginFullWidthMode } from '../../../plugins/table/ui/consts';
+import { tableFullPageEditorStyles } from '@atlaskit/editor-plugin-table/ui/common-styles';
+import { tableMarginFullWidthMode } from '@atlaskit/editor-plugin-table/ui/consts';
 import { scrollbarStyles } from '../../styles';
 var SWOOP_ANIMATION = "0.5s ".concat(akEditorSwoopCubicBezier);
 var TOTAL_PADDING = akEditorGutterPadding * 2;

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

@@ -35,6 +35,12 @@ var ColorPickerButton = function ColorPickerButton(props) {
     setIsPopupOpen(!isPopupOpen);
   };
 
+  React.useEffect(function () {
+    if (props.setDisableParentScroll) {
+      props.setDisableParentScroll(isPopupOpen);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [isPopupOpen]);
   var ColorPaletteWithListeners = withOuterListeners(ColorPalette);
 
   var onColorSelected = function onColorSelected(color, label) {
@@ -74,7 +80,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"
     }, jsx("div", {
       css: colorPickerWrapper
     }, jsx(ColorPaletteWithListeners, {

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

@@ -11,7 +11,7 @@ import { token } from '@atlaskit/tokens';
 import { unsupportedStyles } from '../../plugins/unsupported-content/styles';
 import { telepointerStyle } from '../../plugins/collab-edit/styles';
 import { gapCursorStyles } from '../../plugins/selection/gap-cursor/styles';
-import { tableStyles } from '../../plugins/table/ui/common-styles';
+import { tableStyles } from '@atlaskit/editor-plugin-table/ui/common-styles';
 import { placeholderStyles } from '../../plugins/placeholder/styles';
 import { blocktypeStyles } from '../../plugins/block-type/styles';
 import { codeBlockStyles } from '../../plugins/code-block/styles';

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

@@ -121,7 +121,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: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          padding: 0px 12px;\n        "])))
   }, item.title));
 };

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

@@ -22,6 +22,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../plu
 import { useIntl, RawIntlProvider, injectIntl } from 'react-intl-next';
 import { useGlobalTheme } from '@atlaskit/theme/components';
 import { PortalProviderThemeProviders } from './PortalProviderThemesProvider';
+import { IntlProviderIfMissingWrapper } from '@atlaskit/editor-common/ui';
 export var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
   _inherits(PortalProviderAPI, _EventDispatcher);
 
@@ -178,17 +179,32 @@ var BasePortalProvider = /*#__PURE__*/function (_React$Component) {
 _defineProperty(BasePortalProvider, "displayName", 'PortalProvider');
 
 export var PortalProvider = injectIntl(BasePortalProvider);
-export var PortalProviderWithThemeProviders = function PortalProviderWithThemeProviders(props) {
+export var PortalProviderWithThemeProviders = function PortalProviderWithThemeProviders(_ref2) {
+  var onAnalyticsEvent = _ref2.onAnalyticsEvent,
+      useAnalyticsContext = _ref2.useAnalyticsContext,
+      render = _ref2.render;
+  return /*#__PURE__*/React.createElement(IntlProviderIfMissingWrapper, null, /*#__PURE__*/React.createElement(PortalProviderWithThemeAndIntlProviders, {
+    onAnalyticsEvent: onAnalyticsEvent,
+    useAnalyticsContext: useAnalyticsContext,
+    render: render
+  }));
+};
+
+var PortalProviderWithThemeAndIntlProviders = function PortalProviderWithThemeAndIntlProviders(_ref3) {
+  var onAnalyticsEvent = _ref3.onAnalyticsEvent,
+      useAnalyticsContext = _ref3.useAnalyticsContext,
+      render = _ref3.render;
   var intl = useIntl();
   var globalTheme = useGlobalTheme();
   return /*#__PURE__*/React.createElement(BasePortalProvider, {
     intl: intl,
     themeMode: globalTheme.mode,
-    onAnalyticsEvent: props.onAnalyticsEvent,
-    useAnalyticsContext: props.useAnalyticsContext,
-    render: props.render
+    onAnalyticsEvent: onAnalyticsEvent,
+    useAnalyticsContext: useAnalyticsContext,
+    render: render
   });
 };
+
 export var PortalRenderer = /*#__PURE__*/function (_React$Component2) {
   _inherits(PortalRenderer, _React$Component2);
 
@@ -219,10 +235,10 @@ export var PortalRenderer = /*#__PURE__*/function (_React$Component2) {
     key: "render",
     value: function render() {
       var portals = this.state.portals;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, Array.from(portals.entries()).map(function (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-            container = _ref3[0],
-            children = _ref3[1];
+      return /*#__PURE__*/React.createElement(React.Fragment, null, Array.from(portals.entries()).map(function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+            container = _ref5[0],
+            children = _ref5[1];
 
         return /*#__PURE__*/createPortal(children, container);
       }));
@@ -253,10 +269,10 @@ var AnalyticsContextWrapper = (_class = /*#__PURE__*/function (_React$Component3
   _createClass(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.createElement(AnalyticsReactContext.Provider, {
         value: value

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

@@ -67,7 +67,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,
@@ -76,10 +75,6 @@ var Resizer = /*#__PURE__*/function (_React$Component) {
 
       event.preventDefault();
 
-      if (handleResizeStart && !handleResizeStart(event)) {
-        return false;
-      }
-
       _this.setState({
         isResizing: true
       }, function () {