@atlaskit/editor-core 174.0.0 → 175.0.0

package/dist/cjs/plugins/block-type/commands/block-type.js

@@ -13,8 +13,6 @@ exports.setHeadingWithAnalytics = void 0;
 exports.setNormalText = setNormalText;
 exports.setNormalTextWithAnalytics = setNormalTextWithAnalytics;
 
-var _prosemirrorState = require("prosemirror-state");
-
 var _prosemirrorTransform = require("prosemirror-transform");
 
 var _prosemirrorUtils = require("prosemirror-utils");
@@ -33,6 +31,8 @@ var _adfSchema = require("@atlaskit/adf-schema");
 
 var _editorTables = require("@atlaskit/editor-tables");
 
+var _transformToCodeBlock = require("./transform-to-code-block");
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -263,7 +263,7 @@ var insertBlockTypesWithAnalytics = function insertBlockTypesWithAnalytics(name,
 };
 /**
  * Function will add wrapping node.
- * 1. If currently selected blocks can be wrapped in the warpper type it will wrap them.
+ * 1. If currently selected blocks can be wrapped in the wrapper type it will wrap them.
  * 2. If current block can not be wrapped inside wrapping block it will create a new block below selection,
  *  and set selection on it.
  */
@@ -311,19 +311,24 @@ function insertCodeBlock() {
     var _state$selection$$fro;
 
     var tr = state.tr;
-    var _state$selection2 = state.selection,
-        $to = _state$selection2.$to,
-        $from = _state$selection2.$from;
+    var from = state.selection.from;
     var codeBlock = state.schema.nodes.codeBlock;
-    var grandParentType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
-    var parentType = state.selection.$from.parent.type;
-    /** We always want to append a block type unless we're inserting into a paragraph
-     * AND it's a valid child of the grandparent node
+    var grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+    var parentNodeType = state.selection.$from.parent.type;
+    /** We always want to append a codeBlock unless we're inserting into a paragraph
+     * AND it's a valid child of the grandparent node.
+     * Insert the current selection as codeBlock content unless it contains nodes other
+     * than paragraphs and inline.
      */
 
-    if ((0, _insert.shouldSplitSelectedNodeOnNodeInsertion)(parentType, grandParentType, codeBlock.createAndFill())) {
-      tr.replaceRangeWith($from.pos, $to.pos, codeBlock.createAndFill());
-      tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(state.selection.to)));
+    var canInsertCodeBlock = (0, _insert.shouldSplitSelectedNodeOnNodeInsertion)({
+      parentNodeType: parentNodeType,
+      grandParentNodeType: grandParentNodeType,
+      content: codeBlock.createAndFill()
+    }) && contentAllowedInCodeBlock(state);
+
+    if (canInsertCodeBlock) {
+      tr = (0, _transformToCodeBlock.transformToCodeBlockAction)(state, from);
     } else {
       (0, _prosemirrorUtils.safeInsert)(codeBlock.createAndFill())(tr).scrollIntoView();
     }
@@ -335,6 +340,27 @@ function insertCodeBlock() {
     return true;
   };
 }
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+
+
+function contentAllowedInCodeBlock(state) {
+  var _state$selection2 = state.selection,
+      $from = _state$selection2.$from,
+      $to = _state$selection2.$to;
+  var isAllowedChild = true;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (!isAllowedChild) {
+      return false;
+    }
+
+    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.isText;
+  });
+  return isAllowedChild;
+}
 
 var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
   var _ref3 = state.selection,

package/dist/cjs/plugins/block-type/commands/transform-to-code-block.js

@@ -10,35 +10,62 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _slice = require("../../../utils/slice");
 
-function transformToCodeBlockAction(state, start, end, attrs) {
-  if (!state.selection.empty) {
-    // Don't do anything, if there is something selected
-    return state.tr;
-  }
+var _prosemirrorModel = require("prosemirror-model");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
+function transformToCodeBlockAction(state, start, attrs) {
   var startOfCodeBlockText = state.selection.$from;
-  var endLinePosition = startOfCodeBlockText.end();
-  var startLinePosition = startOfCodeBlockText.start();
-  var parentStartPosition = startOfCodeBlockText.before();
-  var codeBlockSlice = (0, _slice.mapSlice)(state.doc.slice(startOfCodeBlockText.pos, endLinePosition), function (node) {
+  var endPosition = state.selection.empty ? startOfCodeBlockText.end() : state.selection.$to.pos;
+  var startLinePosition = startOfCodeBlockText.start(); //when cmd+A is used to select the content. start position should be 0.
+
+  var parentStartPosition = startOfCodeBlockText.depth === 0 ? 0 : startOfCodeBlockText.before();
+  var contentSlice = state.doc.slice(startOfCodeBlockText.pos, endPosition);
+  var codeBlockSlice = (0, _slice.mapSlice)(contentSlice, function (node, parent, index) {
     if (node.type === state.schema.nodes.hardBreak) {
       return state.schema.text('\n');
     }
 
     if (node.isText) {
       return node.mark([]);
-    } else if (node.isInline) {
+    }
+
+    if (node.isInline) {
+      // Convert dates
+      if (node.attrs.timestamp) {
+        return state.schema.text((0, _utils.timestampToString)(node.attrs.timestamp, null));
+      } // Convert links
+
+
+      if (node.attrs.url) {
+        return state.schema.text(node.attrs.url);
+      }
+
       return node.attrs.text ? state.schema.text(node.attrs.text) : null;
-    } else {
-      return node.content.childCount ? node.content : null;
+    } // if the current node is the last child of the Slice exit early to prevent
+    // adding additional line breaks
+
+
+    if (contentSlice.content.childCount - 1 === index) {
+      return node.content;
+    } //useful to decide whether to append line breaks when the content has list items.
+
+
+    var isParentLastChild = parent && contentSlice.content.childCount - 1 === index; // add line breaks at the end of each paragraph to mimic layout of selected content
+    // do not add line breaks when the 'paragraph' parent is last child.
+
+    if (node.content.childCount && node.type === state.schema.nodes.paragraph && !isParentLastChild) {
+      return node.content.append(_prosemirrorModel.Fragment.from(state.schema.text('\n\n')));
     }
+
+    return node.content.childCount ? node.content : null;
   });
   var tr = state.tr; // Replace current block node
 
   var startMapped = startLinePosition === start ? parentStartPosition : start;
   var codeBlock = state.schema.nodes.codeBlock;
   var codeBlockNode = codeBlock.createChecked(attrs, codeBlockSlice.content);
-  tr.replaceWith(startMapped, Math.min(endLinePosition, tr.doc.content.size), codeBlockNode); // Reposition cursor when inserting into layouts or table headers
+  tr.replaceWith(startMapped, Math.min(endPosition, tr.doc.content.size), codeBlockNode); // Reposition cursor when inserting into layouts or table headers
 
   var mapped = tr.doc.resolve(tr.mapping.map(startMapped) + 1);
 

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

@@ -127,7 +127,16 @@ function getCodeBlockRules(schema) {
     },
     eventType: _analytics.EVENT_TYPE.TRACK
   });
+
+  var validMatchLength = function validMatchLength(match) {
+    return match.length > 0 && match[0].length === 3;
+  };
+
   var threeTildeRule = (0, _inputRules.createRule)(/(?!\s)(`{3,})$/, function (state, match, start, end) {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+
     var attributes = {};
 
     if (match[4]) {
@@ -135,7 +144,7 @@ function getCodeBlockRules(schema) {
     }
 
     if ((0, _transformToCodeBlock.isConvertableToCodeBlock)(state)) {
-      return (0, _transformToCodeBlock.transformToCodeBlockAction)(state, start, end, attributes);
+      return (0, _transformToCodeBlock.transformToCodeBlockAction)(state, start, attributes);
     }
 
     var tr = state.tr;
@@ -145,6 +154,10 @@ function getCodeBlockRules(schema) {
     return tr;
   });
   var leftNodeReplacementThreeTildeRule = (0, _inputRules.createRule)(new RegExp("((".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "`{3,})|^\\s(`{3,}))(\\S*)$")), function (state, match, start, end) {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+
     var attributes = {};
 
     if (match[4]) {
@@ -174,8 +187,7 @@ function inputRulePlugin(schema, featureFlags) {
 
   if (rules.length !== 0) {
     return (0, _inputRules.createPlugin)('block-type', rules, {
-      isBlockNodeRule: true,
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
+      isBlockNodeRule: true
     });
   }
 

package/dist/cjs/plugins/block-type/pm-plugins/keymap.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = keymapPlugin;
 
-var _prosemirrorCommands = require("prosemirror-commands");
-
-var _prosemirrorInputrules = require("prosemirror-inputrules");
-
 var _prosemirrorHistory = require("prosemirror-history");
 
 var keymaps = _interopRequireWildcard(require("../../../keymaps"));
@@ -21,24 +17,28 @@ var blockTypes = _interopRequireWildcard(require("../types"));
 
 var _keymap = require("../../../utils/keymap");
 
-var _commands2 = require("../../block-type/commands");
+var _commands2 = require("../commands");
+
+var _commands3 = require("../../../utils/commands");
 
 var _analytics = require("../../analytics");
 
+var _utils = require("../utils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var tryUndoInputRuleElseUndoHistory = (0, _prosemirrorCommands.chainCommands)(_prosemirrorInputrules.undoInputRule, _prosemirrorHistory.undo);
-
 function keymapPlugin(schema, featureFlags) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, commands.insertNewLineWithAnalytics, list);
   keymaps.bindKeymapWithCommand(keymaps.moveUp.common, commands.createNewParagraphAbove, list);
   keymaps.bindKeymapWithCommand(keymaps.moveDown.common, commands.createNewParagraphBelow, list);
   keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), _prosemirrorHistory.redo, list);
-  keymaps.bindKeymapWithCommand(keymaps.undo.common, featureFlags.useUnpredictableInputRule ? tryUndoInputRuleElseUndoHistory : _prosemirrorHistory.undo, list);
+  keymaps.bindKeymapWithCommand(keymaps.undo.common, _prosemirrorHistory.undo, list);
   keymaps.bindKeymapWithCommand(keymaps.backspace.common, _commands2.cleanUpAtTheStartOfDocument, list);
+  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, (0, _commands3.deleteEmptyParagraphAndMoveBlockUp)(_utils.isNodeAWrappingBlockNode), list);
+  keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, (0, _commands3.deleteEmptyParagraphAndMoveBlockUp)(_utils.isNodeAWrappingBlockNode), list);
 
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
     keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), (0, _commands2.insertBlockTypesWithAnalytics)(blockTypes.BLOCK_QUOTE.name, _analytics.INPUT_METHOD.KEYBOARD), list);

package/dist/cjs/plugins/block-type/utils.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isNodeAWrappingBlockNode = void 0;
+
+var _types = require("./types");
+
+var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
+  if (!node) {
+    return false;
+  }
+
+  return _types.WRAPPER_BLOCK_TYPES.some(function (blockNode) {
+    return blockNode.name === node.type.name;
+  });
+};
+
+exports.isNodeAWrappingBlockNode = isNodeAWrappingBlockNode;

package/dist/cjs/plugins/breakout/index.js

@@ -31,16 +31,22 @@ var _constants = require("./constants");
 
 var _pluginKey = require("./plugin-key");
 
-var _dom = require("../../utils/dom");
-
 var _findBreakoutNode = require("./utils/find-breakout-node");
 
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var BreakoutView = /*#__PURE__*/function () {
-  function BreakoutView(node, view, eventDispatcher) {
+  function BreakoutView(
+  /**
+   * Note: this is actually a PMMark -- however our version
+   * of the prosemirror and prosemirror types mean using PMNode
+   * is not problematic.
+   */
+  mark, view, eventDispatcher) {
     var _this = this;
 
     (0, _classCallCheck2.default)(this, BreakoutView);
@@ -52,21 +58,27 @@ var BreakoutView = /*#__PURE__*/function () {
         return;
       }
 
-      var width = (0, _utils.calcBreakoutWidth)(_this.node.attrs.mode, widthState.width);
-      var newStyle = "width: ".concat(width, "; ");
-      var lineLength = widthState.lineLength;
-      var widthPx = (0, _dom.parsePx)(width);
+      var containerStyle = "";
+      var contentStyle = "";
+      var breakoutWidthPx = (0, _utils.calcBreakoutWidthPx)(_this.mark.attrs.mode, widthState.width);
+
+      if (widthState.lineLength) {
+        if (breakoutWidthPx < widthState.lineLength) {
+          breakoutWidthPx = widthState.lineLength;
+        }
+
+        containerStyle += "\n        transform: none;\n        display: flex;\n        justify-content: center;\n        "; // There is a delay in the animation because widthState is delayed.
+        // When the editor goes full width the animation for the editor
+        // begins and finishes before widthState can update the new dimensions.
 
-      if (lineLength && widthPx) {
-        var marginLeftPx = -(widthPx - lineLength) / 2;
-        newStyle += "transform: none; margin-left: ".concat(marginLeftPx, "px;");
+        contentStyle += "\n        min-width: ".concat(breakoutWidthPx, "px;\n        transition: min-width 0.5s ").concat(_editorSharedStyles.akEditorSwoopCubicBezier, ";\n      ");
       } else {
         // fallback method
         // (lineLength is not normally undefined, but might be in e.g. SSR or initial render)
         //
         // this approach doesn't work well with position: fixed, so
         // it breaks things like sticky headers
-        newStyle += "transform: translateX(-50%); margin-left: 50%;";
+        containerStyle += "width: ".concat(breakoutWidthPx, "px; transform: translateX(-50%); margin-left: 50%;");
       } // NOTE: This is a hack to ignore mutation since mark NodeView doesn't support
       // `ignoreMutation` life-cycle event. @see ED-9947
 
@@ -81,19 +93,22 @@ var BreakoutView = /*#__PURE__*/function () {
       }
 
       if (typeof _this.dom.style.cssText !== 'undefined') {
-        _this.dom.style.cssText = newStyle;
+        _this.dom.style.cssText = containerStyle;
+        _this.contentDOM.style.cssText = contentStyle;
       } else {
-        _this.dom.setAttribute('style', newStyle);
+        _this.dom.setAttribute('style', containerStyle);
+
+        _this.contentDOM.setAttribute('style', contentStyle);
       }
     });
     var contentDOM = document.createElement('div');
     contentDOM.className = _constants.BreakoutCssClassName.BREAKOUT_MARK_DOM;
     var dom = document.createElement('div');
     dom.className = _constants.BreakoutCssClassName.BREAKOUT_MARK;
-    dom.setAttribute('data-layout', node.attrs.mode);
+    dom.setAttribute('data-layout', mark.attrs.mode);
     dom.appendChild(contentDOM);
     this.dom = dom;
-    this.node = node;
+    this.mark = mark;
     this.view = view;
     this.contentDOM = contentDOM;
     this.eventDispatcher = eventDispatcher;
@@ -149,8 +164,12 @@ function createPlugin(_ref) {
     key: _pluginKey.pluginKey,
     props: {
       nodeViews: {
-        breakout: function breakout(node, view) {
-          return new BreakoutView(node, view, eventDispatcher);
+        // Note: When we upgrade to prosemirror 1.27.2 -- we should
+        // move this to markViews.
+        // See the following link for more details:
+        // https://prosemirror.net/docs/ref/#view.EditorProps.nodeViews.
+        breakout: function breakout(mark, view) {
+          return new BreakoutView(mark, view, eventDispatcher);
         }
       }
     }

package/dist/cjs/plugins/card/nodeviews/embedCard.js

@@ -55,8 +55,6 @@ var _width = require("../../width");
 
 var _richMediaUtils = require("../../../utils/rich-media-utils");
 
-var _tableResizing = require("../../table/pm-plugins/table-resizing");
-
 var _steps = require("@atlaskit/adf-schema/steps");
 
 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; }
@@ -183,17 +181,24 @@ var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       return originalLineLength;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "saveOriginalDimensionsAttributes", function (height, width) {
-      var view = _this.props.view;
-
-      var tableResizeState = _tableResizing.pluginKey.getState(view.state); // We are not updating ADF when this function fired while table is resizing.
+      var view = _this.props.view; // TODO: ED-15663
+      // Please, do not copy or use this kind of code below
+      // @ts-ignore
+
+      var fakeTableResizePluginKey = {
+        key: 'tableFlexiColumnResizing$',
+        getState: function getState(state) {
+          return state['tableFlexiColumnResizing$'];
+        }
+      };
+      var fakeTableResizeState = fakeTableResizePluginKey.getState(view.state); // We are not updating ADF when this function fired while table is resizing.
       // Changing ADF in the middle of resize will break table resize plugin logic
       // (tables will be considered different at the end of the drag and cell size won't be stored)
       // But this is not a big problem, editor user will be seeing latest height anyway (via updated state)
       // And even if page to be saved with slightly outdated height, renderer is capable of reading latest height value
       // when embed loads, and so it won't be a problem.
 
-
-      if (tableResizeState !== null && tableResizeState !== void 0 && tableResizeState.dragging) {
+      if (fakeTableResizeState !== null && fakeTableResizeState !== void 0 && fakeTableResizeState.dragging) {
         return;
       }
 

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

@@ -55,8 +55,6 @@ var _linkingUtils = require("../../utils/linking-utils");
 
 var _styles2 = require("./styles");
 
-var _toolbar = require("../copy-button/toolbar");
-
 var _featureFlagsContext = require("../feature-flags-context");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -161,7 +159,7 @@ var floatingToolbar = function floatingToolbar(cardOptions, platform, linkPicker
     } : {}; // Applies padding override for when link picker is currently displayed
 
     var className = pluginState.showLinkingToolbar ? _styles2.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
-    return _objectSpread(_objectSpread({
+    return _objectSpread(_objectSpread(_objectSpread({
       title: intl.formatMessage(_messages2.messages.card),
       className: className,
       nodeType: nodeType
@@ -180,7 +178,9 @@ var floatingToolbar = function floatingToolbar(cardOptions, platform, linkPicker
         return element;
       },
       items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions)
-    }, pluginState.showLinkingToolbar ? _EditLinkToolbar.editLinkToolbarConfig : {});
+    }, pluginState.showLinkingToolbar ? _EditLinkToolbar.editLinkToolbarConfig : {}), {}, {
+      scrollable: pluginState.showLinkingToolbar ? false : true
+    });
   };
 };
 
@@ -256,7 +256,16 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: visitCardLink
       }, {
         type: 'separator'
-      }].concat((0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard)), (0, _toConsumableArray2.default)(getCopyButtonGroup(state, intl, node)), (0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl)), [{
+      }].concat((0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard)), [{
+        type: 'copy-button',
+        items: [{
+          state: state,
+          formatMessage: intl.formatMessage,
+          nodeType: node.type
+        }, {
+          type: 'separator'
+        }]
+      }], (0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl)), [{
         id: 'editor.link.delete',
         type: 'button',
         appearance: 'danger',
@@ -335,10 +344,4 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
   }, {
     type: 'separator'
   }] : [];
-};
-
-var getCopyButtonGroup = function getCopyButtonGroup(state, intl, node) {
-  return state && (0, _toolbar.showCopyButton)(state) ? [(0, _toolbar.getCopyButtonConfig)(state, intl.formatMessage, node.type), {
-    type: 'separator'
-  }] : [];
 };

package/dist/cjs/plugins/card/ui/LinkToolbarIconDropdown.js

@@ -111,7 +111,8 @@ var Option = function Option(_ref) {
       width: 38,
       height: 38,
       label: title
-    })),
+    })) // @ts-ignore Overriding Menu styles is not supported
+    ,
     css: getCustomStyles(selected, disabled),
     description: description,
     testId: testId,

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

@@ -113,7 +113,7 @@ function provideVisualFeedbackForCopyButton(state, dispatch) {
     dispatch(tr);
   }
 
-  return false;
+  return true;
 }
 
 function removeVisualFeedbackForCopyButton(state, dispatch) {
@@ -128,5 +128,5 @@ function removeVisualFeedbackForCopyButton(state, dispatch) {
     dispatch(tr);
   }
 
-  return false;
+  return true;
 }

package/dist/cjs/plugins/code-block/styles.js

@@ -24,7 +24,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _templateObject;
 
 var codeBlockStyles = function codeBlockStyles(props) {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", "\n  }\n\n  .ProseMirror li > .code-block {\n    margin: 0;\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), (0, _styles.codeBlockSharedStyles)(props), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', _colors.R75), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', 'rgba(255, 143, 115, 0.5)'), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', 'rgba(255, 189, 173, 0.5)'));
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", "\n  }\n\n  .ProseMirror li {\n    /* if same list item has multiple code blocks we need top margin for all but first */\n    > .code-block {\n      margin: ", " 0 0 0;\n    }\n    > .code-block:first-child,\n    > .ProseMirror-gapcursor:first-child + .code-block {\n      margin-top: 0;\n    }\n\n    > div:last-of-type.code-block {\n      margin-bottom: ", ";\n    }\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), (0, _styles.codeBlockSharedStyles)(props), _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', _colors.R75), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', 'rgba(255, 143, 115, 0.5)'), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', 'rgba(255, 189, 173, 0.5)'));
 };
 
 exports.codeBlockStyles = codeBlockStyles;

package/dist/cjs/plugins/code-block/toolbar.js

@@ -128,7 +128,8 @@ var getToolbarConfig = function getToolbarConfig() {
         return (0, _prosemirrorUtils.findDomRefAtPos)(pos, view.domAtPos.bind(view));
       },
       nodeType: nodeType,
-      items: [languageSelect, separator].concat(copyToClipboardItems, [deleteButton])
+      items: [languageSelect, separator].concat(copyToClipboardItems, [deleteButton]),
+      scrollable: true
     };
   };
 };