@atlaskit/editor-core 178.0.1 → 178.1.0

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @atlaskit/editor-core
 
+## 178.1.0
+
+### Minor Changes
+
+- [`59e998e408f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/59e998e408f) - [ESS-2914] Switch to the forked prosemirror-collab library (based on version 1.3.0) to filter out analytics steps
+- [`a0a35fe7fb1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a0a35fe7fb1) - Renaming contentComponent event subject to contentComponentv2. Move errorStack attribute to nonPrivacySafeAttributes
+- [`4f6a895f1d5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4f6a895f1d5) - [ux] Editor Node Block selection stabilization
+
+### Patch Changes
+
+- [`513cb2010b7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/513cb2010b7) - Users are able to select dropdown menu item using keyboard via the Enter key
+- [`f1a780414ae`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f1a780414ae) - prevent ReactNodeViewState to trigger selection updates when selection hasn't changed
+- [`2f5a0f96c6d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2f5a0f96c6d) - Adds invokeMethod analytics context for link picker.
+- [`aaa6509f036`](https://bitbucket.org/atlassian/atlassian-frontend/commits/aaa6509f036) - ED-16198 Update & restore dedupeMarksTransformed analytics event. Also addresses
+  a bug when `discardedMarks` would only return the latest discarded mark
+- [`36d661f9252`](https://bitbucket.org/atlassian/atlassian-frontend/commits/36d661f9252) - [WS-4504] Fix Editor hijacking click events inside Annotation components
+- [`af4ab0d3e60`](https://bitbucket.org/atlassian/atlassian-frontend/commits/af4ab0d3e60) - [ux] Fix for a regression issue where a link is the last node in the ADF and a user is trying to switch from 'block' to 'embed' view or vice versa.
+- [`9a36555eac5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9a36555eac5) - [ux] ED-15773 InsertMenu in Toolbar should not display "View More" option when editorProp `showModal` is set to false. Although this is happening, currently the "View More" button is replaced with "Status" option and retaining the same look and feel.
+  This ticket is to remove the look and feel of "View More" option when `showModal` is set to false.
+- [`fd12b01c877`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fd12b01c877) - Clear text button should still work without activity provider
+- [`8da99a328df`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8da99a328df) - [ux] This changes the behaviour of changing the appearance of a Smart Link or Smart Card.
+
+  1. Previously, upon changing the appearance of a Smart Link, the cursor would move to _before_ the Smart Link. Now, the cursor will be placed after the Smart Link. In the case of Block Card and Embed, the cursor will be placed one paragraph after the Block or Embed card (due to Block and Embed being a "block" node).
+  2. When changing an inline or hyperlink into a Block or Embed card (i.e. a block node) there will no longer be a new paragraph inserted before the Block or Embed card.
+
+- [`a6f514af105`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a6f514af105) - [ux] ED-16077 fix deleteRange deleting parent node when it shouldn't. Use tr.delete instead of tr.deleteRange because deleteRange would grow the selection to include the parent.
+- [`db7602d84c9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/db7602d84c9) - [ux] ED-16527 - Fixed issue where pressing 'Esc' while a Floating Toolbar Select menu was open would focus editor instead of the Floating Toolbar
+- [`8d798b78505`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8d798b78505) - Media Group no longer tries to update all Media nodes, but only the ones that belong to it.
+- [`7cc0f5b5dad`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7cc0f5b5dad) - Remove unused @atlaskit/activity dependency
+- [`a5dcaef4136`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a5dcaef4136) - [ux] Fixed keyboard navigation issues relating to the main editor toolbar and floating toolbars.
+- [`70ec535a1c6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/70ec535a1c6) - [ux] A fix for the usage of editor props 'allowBlockCards' & 'allowEmbeds'. Previously even if the prop 'allowBlockCards' was passed to editor as false, the toolbar would still allow switching to a block card option.
+- [`5ac1c18bd04`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5ac1c18bd04) - [ux] Fix selection blocking issue where user cannot left/right arrow key past a mediaSingle
+- Updated dependencies
+
+## 178.0.2
+
+### Patch Changes
+
+- [`2ff1c66a6ab`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2ff1c66a6ab) - [ux] ED-16490 fixed bug so big margin will not occur before a Decision node in Renderer on iOS
+
 ## 178.0.1
 
 ### Patch Changes

package/dist/cjs/create-editor/create-plugins-list.js

@@ -206,6 +206,7 @@ function createPluginsList(props, prevProps, createAnalyticsEvent, insertNodeAPI
       allowDropzoneDropLine: isFullPage,
       allowMediaSingleEditable: !isMobile,
       allowRemoteDimensionsFetch: !isMobile,
+      editorSelectionAPI: editorSelectionAPI,
       // This is a wild one. I didnt quite understand what the code was doing
       // so a bit of guess for now.
       allowMarkingUploadsAsIncomplete: isMobile,
@@ -282,7 +283,8 @@ function createPluginsList(props, prevProps, createAnalyticsEvent, insertNodeAPI
           disableLayout: true
         },
         allowMediaGroup: false,
-        isCopyPasteEnabled: true
+        isCopyPasteEnabled: true,
+        editorSelectionAPI: editorSelectionAPI
       }]);
     }
   }

package/dist/cjs/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -64,8 +64,10 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
       isOpen: false
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeAlignment", function (align) {
-      _this.toggleOpen();
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeAlignment", function (align, togglePopup) {
+      if (togglePopup) {
+        _this.toggleOpen();
+      }
 
       return _this.props.changeAlignment(align);
     });
@@ -94,11 +96,10 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "hideonEsc", function () {
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "hideOnEscape", function () {
       var _this$toolbarItemRef2, _this$toolbarItemRef3;
 
-      _this.hide(); //To set the focus on the textcolor button when the menu is closed by 'Esc' only (aria guidelines)
-
+      _this.hide();
 
       (_this$toolbarItemRef2 = _this.toolbarItemRef) === null || _this$toolbarItemRef2 === void 0 ? void 0 : (_this$toolbarItemRef3 = _this$toolbarItemRef2.current) === null || _this$toolbarItemRef3 === void 0 ? void 0 : _this$toolbarItemRef3.focus();
     });
@@ -127,17 +128,29 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
         isOpen: isOpen,
-        handleClickOutside: function handleClickOutside(event) {
-          return _this2.hide({
-            isOpen: false,
-            event: event
+        onOpenChange: function onOpenChange(_ref2) {
+          var _this2$toolbarItemRef, _this2$toolbarItemRef2;
+
+          var isOpen = _ref2.isOpen;
+
+          _this2.setState({
+            isOpen: isOpen
           });
+
+          (_this2$toolbarItemRef = _this2.toolbarItemRef) === null || _this2$toolbarItemRef === void 0 ? void 0 : (_this2$toolbarItemRef2 = _this2$toolbarItemRef.current) === null || _this2$toolbarItemRef2 === void 0 ? void 0 : _this2$toolbarItemRef2.focus();
+        },
+        handleClickOutside: function handleClickOutside(event) {
+          if (event instanceof MouseEvent) {
+            _this2.hide({
+              isOpen: false,
+              event: event
+            });
+          }
         },
-        handleEscapeKeydown: this.hideonEsc,
-        onOpenChange: this.hide,
+        handleEscapeKeydown: this.hideOnEscape,
         fitWidth: 112,
         fitHeight: 80,
-        closeonTab: true,
+        closeOnTab: true,
         trigger: (0, _react2.jsx)(_ToolbarButton.default, {
           spacing: isReducedSpacing ? 'none' : 'default',
           disabled: disabled,
@@ -161,7 +174,7 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         })
       }, (0, _react2.jsx)(_Alignment.default, {
         onClick: function onClick(align) {
-          return _this2.changeAlignment(align);
+          return _this2.changeAlignment(align, false);
         },
         selectedAlignment: pluginState.align
       })), (0, _react2.jsx)("span", {

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

@@ -106,11 +106,13 @@ var annotationPlugin = function annotationPlugin(annotationProviders) {
             return null;
           }
 
-          return /*#__PURE__*/_react.default.createElement(_InlineCommentView.InlineCommentView, {
+          return /*#__PURE__*/_react.default.createElement("div", {
+            "data-editor-popup": "true"
+          }, /*#__PURE__*/_react.default.createElement(_InlineCommentView.InlineCommentView, {
             providers: annotationProviders,
             editorView: editorView,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent
-          });
+          }));
         }
       });
     }

package/dist/cjs/plugins/annotation/ui/InlineCommentView.js

@@ -77,7 +77,9 @@ function InlineCommentView(_ref) {
           selection: selection.toJSON(),
           position: position,
           docSize: editorView.state.doc.nodeSize,
-          error: error.toString(),
+          error: error.toString()
+        },
+        nonPrivacySafeAttributes: {
           errorStack: error.stack || undefined
         }
       };
@@ -98,7 +100,8 @@ function InlineCommentView(_ref) {
 
     var textSelection = state.doc.textBetween(selection.from, selection.to);
     return /*#__PURE__*/_react.default.createElement("div", {
-      "data-testid": _types.AnnotationTestIds.floatingComponent
+      "data-testid": _types.AnnotationTestIds.floatingComponent,
+      "data-editor-popup": "true"
     }, /*#__PURE__*/_react.default.createElement(CreateComponent, {
       dom: dom,
       textSelection: textSelection,
@@ -145,6 +148,7 @@ function InlineCommentView(_ref) {
   }
 
   return /*#__PURE__*/_react.default.createElement(_AnnotationViewWrapper.AnnotationViewWrapper, {
+    "data-editor-popup": "true",
     "data-testid": _types.AnnotationTestIds.floatingComponent,
     key: (0, _utils.getAnnotationViewKey)(activeAnnotations),
     onViewed: onAnnotationViewed

package/dist/cjs/plugins/base/pm-plugins/react-nodeview.js

@@ -62,12 +62,19 @@ var plugin = new _safePlugin.SafePlugin({
   key: stateKey,
   view: function view(_view) {
     var pluginState = stateKey.getState(_view.state);
+    var prevFrom = -1;
+    var prevTo = -1;
     return {
       update: function update(view) {
         var _view$state$selection = view.state.selection,
             from = _view$state$selection.from,
             to = _view$state$selection.to;
-        pluginState.notifyNewSelection(from, to);
+
+        if (from !== prevFrom || to !== prevTo) {
+          pluginState.notifyNewSelection(from, to);
+          prevFrom = from;
+          prevTo = to;
+        }
       }
     };
   }

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

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deleteBlockContent = deleteBlockContent;
+
+/**
+ * Prevent removing the block when deleting block content
+ *
+ * @param state EditorState<any>
+ * @param dispatch CommandDispatch
+ * @returns boolean
+ */
+function deleteBlockContent(isNodeAWrappingBlockNode) {
+  return function (state, dispatch) {
+    var tr = state.tr,
+        _state$selection = state.selection,
+        $from = _state$selection.$from,
+        $to = _state$selection.$to,
+        doc = state.doc;
+
+    if ($from.pos === $to.pos) {
+      return false;
+    }
+
+    var selectionCrossesWrappingBlockNode = false;
+    doc.nodesBetween($from.pos, $to.pos, function (node, pos) {
+      // Optimisation. If selection crosses wrapping block node
+      // short circuit the loop by returning false
+      if (selectionCrossesWrappingBlockNode) {
+        return false;
+      }
+
+      if (isNodeAWrappingBlockNode(node)) {
+        selectionCrossesWrappingBlockNode = true;
+        return false;
+      }
+    });
+
+    if (!selectionCrossesWrappingBlockNode) {
+      return false;
+    }
+
+    tr.delete($from.pos, $to.pos);
+
+    if (dispatch) {
+      dispatch(tr);
+    }
+
+    return true;
+  };
+}

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

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "deleteAndMoveCursor", {
     return _deleteAndMoveCursor.deleteAndMoveCursor;
   }
 });
+Object.defineProperty(exports, "deleteBlockContent", {
+  enumerable: true,
+  get: function get() {
+    return _deleteBlockContent.deleteBlockContent;
+  }
+});
 Object.defineProperty(exports, "insertBlock", {
   enumerable: true,
   get: function get() {
@@ -88,4 +94,6 @@ var _insertBlock = require("./insert-block");
 
 var _transformToCodeBlock = require("./transform-to-code-block");
 
-var _deleteAndMoveCursor = require("./delete-and-move-cursor");
+var _deleteAndMoveCursor = require("./delete-and-move-cursor");
+
+var _deleteBlockContent = require("./delete-block-content");

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

@@ -31,8 +31,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 backspace = (0, _prosemirrorCommands.chainCommands)(_commands2.cleanUpAtTheStartOfDocument, _commands2.deleteAndMoveCursor);
-var del = (0, _prosemirrorCommands.chainCommands)((0, _commands3.deleteEmptyParagraphAndMoveBlockUp)(_utils.isNodeAWrappingBlockNode), _commands2.deleteAndMoveCursor);
+var backspace = (0, _prosemirrorCommands.chainCommands)(_commands2.cleanUpAtTheStartOfDocument, (0, _commands2.deleteBlockContent)(_utils.isNodeAWrappingBlockNode), _commands2.deleteAndMoveCursor);
+var del = (0, _prosemirrorCommands.chainCommands)((0, _commands3.deleteEmptyParagraphAndMoveBlockUp)(_utils.isNodeAWrappingBlockNode), (0, _commands2.deleteBlockContent)(_utils.isNodeAWrappingBlockNode), _commands2.deleteAndMoveCursor);
 
 function keymapPlugin(schema, featureFlags) {
   var list = {};

package/dist/cjs/plugins/block-type/ui/ToolbarBlockType/index.js

@@ -107,14 +107,18 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       }];
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSelectBlockType", function (_ref) {
-      var item = _ref.item;
+      var item = _ref.item,
+          _ref$shouldCloseMenu = _ref.shouldCloseMenu,
+          shouldCloseMenu = _ref$shouldCloseMenu === void 0 ? true : _ref$shouldCloseMenu;
       var blockType = item.value;
 
       _this.props.setBlockType(blockType.name);
 
-      _this.setState({
-        active: false
-      });
+      if (shouldCloseMenu) {
+        _this.setState({
+          active: false
+        });
+      }
     });
     return _this;
   }

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

@@ -157,7 +157,7 @@ var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function createDomRef() {
       var domRef = document.createElement('div');
 
-      if (_utils.browser.chrome && this.reactComponentProps.platform !== 'mobile') {
+      if (this.reactComponentProps.platform !== 'mobile') {
         // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
         // see also: https://github.com/ProseMirror/prosemirror/issues/884
         domRef.contentEditable = 'true';

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

@@ -37,8 +37,6 @@ var _genericCard = require("./genericCard");
 
 var _ui = require("@atlaskit/editor-common/ui");
 
-var _utils = require("@atlaskit/editor-common/utils");
-
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _nodeviews = require("../../../nodeviews/");
@@ -384,7 +382,7 @@ var EmbedCard = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     value: function createDomRef() {
       var domRef = document.createElement('div');
 
-      if (_utils.browser.chrome && this.reactComponentProps.platform !== 'mobile') {
+      if (this.reactComponentProps.platform !== 'mobile') {
         // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
         // see also: https://github.com/ProseMirror/prosemirror/issues/884
         domRef.contentEditable = 'true';

package/dist/cjs/plugins/card/pm-plugins/doc.js

@@ -11,10 +11,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _prosemirrorHistory = require("prosemirror-history");
-
 var _prosemirrorState = require("prosemirror-state");
 
+var _prosemirrorHistory = require("prosemirror-history");
+
 var _adfSchema = require("@atlaskit/adf-schema");
 
 var _analytics = require("../../../plugins/analytics");
@@ -367,6 +367,8 @@ exports.changeSelectedCardToText = changeSelectedCardToText;
 
 var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
   return function (state, dispatch) {
+    var _previousNode$type;
+
     var selectedNode = state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node;
 
     if (!selectedNode) {
@@ -389,9 +391,24 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
     var attrs = isEmbed ? _objectSpread(_objectSpread({}, selectedNode.attrs), {}, {
       layout: 'center'
     }) : selectedNode.attrs;
-    var from = state.selection.from;
+    var _state$selection = state.selection,
+        from = _state$selection.from,
+        to = _state$selection.to;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
-    var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
+    var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks); // When the selected card is the last element in the doc we add a new paragraph after it for consistent replacement
+
+    if (tr.doc.nodeSize - 2 === to) {
+      tr.insertText(' ', to);
+    }
+
+    tr.setSelection(_prosemirrorState.TextSelection.create(tr.doc, to + 1));
+    var previousNodePos = from - 1 > 0 ? from - 1 : 0;
+    var previousNode = tr.doc.nodeAt(previousNodePos);
+
+    if ((previousNode === null || previousNode === void 0 ? void 0 : (_previousNode$type = previousNode.type) === null || _previousNode$type === void 0 ? void 0 : _previousNode$type.name) === 'paragraph') {
+      tr.delete(previousNodePos, from);
+    }
+
     (0, _analytics.addAnalytics)(state, tr, {
       action: _analytics.ACTION.CHANGED_TYPE,
       actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,

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

@@ -306,9 +306,10 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }
 
       var allowBlockCards = cardOptions.allowBlockCards,
-          allowEmbeds = cardOptions.allowEmbeds;
+          allowEmbeds = cardOptions.allowEmbeds; // This code will be executed only for appearances such as "inline", "block" & "embed"
+      // For url appearance, please see HyperlinkToolbarAppearanceProps
 
-      if ((allowBlockCards || allowEmbeds) && currentAppearance) {
+      if (currentAppearance) {
         toolbarItems.unshift({
           type: 'custom',
           fallback: [],
@@ -321,6 +322,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
               editorView: editorView,
               editorState: state,
               allowEmbeds: allowEmbeds,
+              allowBlockCards: allowBlockCards,
               platform: platform
             });
           }

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

@@ -84,7 +84,10 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
         linkPickerOptions: linkPickerOptions,
         providerFactory: providerFactory,
         displayUrl: url,
-        displayText: text,
+        displayText: text // Assumes that the smart card link picker can only ever be invoked by clicking "edit"
+        // via the floating toolbar
+        ,
+        invokeMethod: _analytics.INPUT_METHOD.FLOATING_TB,
         onSubmit: function onSubmit(href, title, displayText) {
           _this.hideLinkToolbar();
 

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

@@ -65,6 +65,8 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
           currentAppearance = _this$props.currentAppearance,
           editorState = _this$props.editorState,
           allowEmbeds = _this$props.allowEmbeds,
+          _this$props$allowBloc = _this$props.allowBlockCards,
+          allowBlockCards = _this$props$allowBloc === void 0 ? true : _this$props$allowBloc,
           platform = _this$props.platform;
       var preview = allowEmbeds && cardContext && url && cardContext.extractors.getPreview(url, platform);
 
@@ -78,7 +80,7 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         }
       }
 
-      var isBlockCardLinkSupportedInParent = (0, _nodes.isSupportedInParent)(editorState, _prosemirrorModel.Fragment.from(editorState.schema.nodes.blockCard.createChecked({})), currentAppearance);
+      var isBlockCardLinkSupportedInParent = allowBlockCards ? (0, _nodes.isSupportedInParent)(editorState, _prosemirrorModel.Fragment.from(editorState.schema.nodes.blockCard.createChecked({})), currentAppearance) : false;
       var isEmbedCardLinkSupportedInParent = allowEmbeds ? (0, _nodes.isSupportedInParent)(editorState, _prosemirrorModel.Fragment.from(editorState.schema.nodes.embedCard.createChecked({})), currentAppearance) : false;
       var embedOption = allowEmbeds && preview && {
         appearance: 'embed',
@@ -90,6 +92,15 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         disabled: !isEmbedCardLinkSupportedInParent,
         tooltip: isEmbedCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
       };
+      var blockCardOption = allowBlockCards && {
+        appearance: 'block',
+        title: intl.formatMessage(_messages2.messages.block),
+        onClick: (0, _doc.setSelectedCardAppearance)('block'),
+        selected: currentAppearance === 'block',
+        testId: 'block-appearance',
+        disabled: !isBlockCardLinkSupportedInParent,
+        tooltip: isBlockCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
+      };
       var options = [{
         title: intl.formatMessage(_messages2.messages.url),
         onClick: function onClick() {
@@ -103,14 +114,6 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         onClick: (0, _doc.setSelectedCardAppearance)('inline'),
         selected: currentAppearance === 'inline',
         testId: 'inline-appearance'
-      }, {
-        appearance: 'block',
-        title: intl.formatMessage(_messages2.messages.block),
-        onClick: (0, _doc.setSelectedCardAppearance)('block'),
-        selected: currentAppearance === 'block',
-        testId: 'block-appearance',
-        disabled: !isBlockCardLinkSupportedInParent,
-        tooltip: isBlockCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
       }];
 
       var dispatchCommand = function dispatchCommand(fn) {
@@ -121,6 +124,10 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         }
       };
 
+      if (blockCardOption) {
+        options.push(blockCardOption);
+      }
+
       if (embedOption) {
         options.push(embedOption);
       }

package/dist/cjs/plugins/collab-edit/actions.js

@@ -9,7 +9,7 @@ exports.handleTelePointer = exports.handlePresence = exports.handleInit = export
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _prosemirrorCollab = require("prosemirror-collab");
+var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 
 var _prosemirrorTransform = require("prosemirror-transform");
 

package/dist/cjs/plugins/collab-edit/index.js

@@ -19,7 +19,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prosemirrorCollab = require("prosemirror-collab");
+var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 
 var _plugin = require("./plugin");
 

package/dist/cjs/plugins/collab-edit/provider/channel.js

@@ -23,7 +23,7 @@ var _utilServiceSupport = require("@atlaskit/util-service-support");
 
 var _eventemitter = require("eventemitter2");
 
-var _prosemirrorCollab = require("prosemirror-collab");
+var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 
 var _logger = require("./logger");
 

package/dist/cjs/plugins/expand/pm-plugins/keymap.js

@@ -173,6 +173,11 @@ function expandKeymap() {
 
     if (editorView.endOfTextblock('down')) {
       var _$from2 = state.selection.$from;
+
+      if (_$from2.depth === 0) {
+        return false;
+      }
+
       var $after = state.doc.resolve(_$from2.after());
 
       if ($after.nodeAfter && ($after.nodeAfter.type === expand || $after.nodeAfter.type === nestedExpand)) {

package/dist/cjs/plugins/floating-toolbar/ui/Select.js

@@ -82,6 +82,7 @@ function Search(props) {
     menuPortalTarget: props.mountPoint,
     onMenuOpen: onMenuOpen,
     onMenuClose: onMenuClose,
-    "aria-label": props.ariaLabel
+    "aria-label": props.ariaLabel,
+    classNamePrefix: props.classNamePrefix
   });
 }

package/dist/cjs/plugins/floating-toolbar/ui/Toolbar.js

@@ -196,6 +196,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
 
       case 'select':
         if (item.selectType === 'list') {
+          var ariaLabel = item.title || item.placeholder;
           return (0, _react2.jsx)(_Select.default, {
             key: idx,
             dispatchCommand: dispatchCommand,
@@ -209,8 +210,10 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
             onChange: function onChange(selected) {
               return dispatchCommand(item.onChange(selected));
             },
+            ariaLabel: ariaLabel,
             filterOption: item.filterOption,
-            setDisableParentScroll: scrollable ? setDisableScroll : undefined
+            setDisableParentScroll: scrollable ? setDisableScroll : undefined,
+            classNamePrefix: 'floating-toolbar-select'
           });
         }
 
@@ -394,15 +397,21 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       }));
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleEscape", function (event) {
-      //If any dropdown is open inside the floating toolbar 'Esc' key should not
-      //focus the editorview. The event cannot be stopped as dropdown is not childnode of floating toolbar
-      if (!document.querySelector('[data-role="droplistContent"]')) {
-        var _this$props$editorVie;
-
-        (_this$props$editorVie = _this.props.editorView) === null || _this$props$editorVie === void 0 ? void 0 : _this$props$editorVie.focus();
-        event.preventDefault();
-        event.stopPropagation();
+      var _this$props$editorVie;
+
+      // If any menu is open inside the floating toolbar 'Esc' key should not
+      // focus the editorview.
+      // Event can't be stopped as they are not childnodes of floating toolbar
+      var isDropdownOpen = !!document.querySelector('[data-role="droplistContent"]');
+      var isSelectMenuOpen = !!document.querySelector('.floating-toolbar-select__menu');
+
+      if (isDropdownOpen || isSelectMenuOpen) {
+        return;
       }
+
+      (_this$props$editorVie = _this.props.editorView) === null || _this$props$editorVie === void 0 ? void 0 : _this$props$editorVie.focus();
+      event.preventDefault();
+      event.stopPropagation();
     });
     _this.scrollContainerRef = /*#__PURE__*/_react.default.createRef();
     _this.mountRef = /*#__PURE__*/_react.default.createRef();

package/dist/cjs/plugins/hyperlink/HyperlinkToolbarAppearance.js

@@ -208,6 +208,7 @@ var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
         editorView: editorView,
         editorState: editorState,
         allowEmbeds: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowEmbeds,
+        allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
         platform: platform
       });
     }

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

@@ -85,7 +85,8 @@ var hyperlinkPlugin = function hyperlinkPlugin(options) {
           action: function action(insert, state) {
             var tr = insert(undefined);
             tr.setMeta(_main.stateKey, {
-              type: _main.LinkAction.SHOW_INSERT_TOOLBAR
+              type: _main.LinkAction.SHOW_INSERT_TOOLBAR,
+              inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
             });
             return (0, _analytics.addAnalytics)(state, tr, {
               action: _analytics.ACTION.INVOKED,