@atlaskit/editor-core 178.0.2 → 178.1.0

package/dist/cjs/ui/Addon/click-area-helper.js

@@ -23,6 +23,10 @@ var insideContentArea = function insideContentArea(ref) {
 
   return false;
 };
+
+var insideProseMirrorEditableArea = function insideProseMirrorEditableArea(ref) {
+  return Boolean(ref === null || ref === void 0 ? void 0 : ref.closest('.ProseMirror'));
+};
 /**
  * @see ED-14699 - check if editor is inside a modal to continue to bring cursor to input when
  * any part of the editor container is clicked
@@ -49,11 +53,19 @@ var checkForModal = function checkForModal(target) {
 exports.checkForModal = checkForModal;
 
 var clickAreaClickHandler = function clickAreaClickHandler(view, event) {
-  var _view$hasFocus;
+  var _view$hasFocus, _event$currentTarget;
 
-  var isTargetContentArea = event.currentTarget.querySelector('.ak-editor-content-area');
   var isEditorFocused = !!(view !== null && view !== void 0 && (_view$hasFocus = view.hasFocus) !== null && _view$hasFocus !== void 0 && _view$hasFocus.call(view));
-  var target = event.target; // @see https://product-fabric.atlassian.net/browse/ED-4287
+  var target = event.target;
+  var isTargetContentArea = target.classList.contains('ak-editor-content-area');
+  var isTargetChildOfContentArea = insideContentArea(target.parentNode);
+  var isTargetInsideEditableArea = insideProseMirrorEditableArea(target); // Any click inside ProseMirror should be managed by ProseMirror
+
+  if (isTargetInsideEditableArea) {
+    return false;
+  }
+
+  var isEventComingFromContentArea = Boolean(event.currentTarget.querySelector('.ak-editor-content-area')); // @see https://product-fabric.atlassian.net/browse/ED-4287
   // click event gets triggered twice on a checkbox (on <label> first and then on <input>)
   // by the time it gets triggered on input, PM already re-renders nodeView and detaches it from DOM
   // which doesn't pass the check !contentArea.contains(event.target)
@@ -64,10 +76,20 @@ var clickAreaClickHandler = function clickAreaClickHandler(view, event) {
 
   var isTextAreaClicked = target.nodeName === 'TEXTAREA';
   var isBreadcrumbClicked = !!(0, _dom.closestElement)(target, 'nav[aria-label="Breadcrumbs"]');
-  var isTargetChildOfContentArea = insideContentArea(target.parentNode);
   var selection = window.getSelection();
-  var isEditorPopupTextSelected = (selection === null || selection === void 0 ? void 0 : selection.type) === 'Range' && (0, _dom.closestElement)(selection === null || selection === void 0 ? void 0 : selection.anchorNode, '[data-editor-popup]');
-  var isClickOutsideEditor = (!isTargetContentArea || !isTargetChildOfContentArea || !isEditorFocused) && !isInputClicked && !isTextAreaClicked && !isPopupClicked && !isBreadcrumbClicked && !isEditorPopupTextSelected && checkForModal(target); // click was within editor container and focus should be brought to input
+  var isEditorPopupTextSelected = (selection === null || selection === void 0 ? void 0 : selection.type) === 'Range' && (0, _dom.closestElement)(selection === null || selection === void 0 ? void 0 : selection.anchorNode, '[data-editor-popup]'); // This is a super workaround to find when events are coming from Confluence InlineComment modal
+  // We don't own those components, so we can't change them
+
+  var isEventComingFromInlineCommentPopup = Boolean((0, _dom.closestElement)(event.currentTarget, 'div[offset]')) || Boolean((0, _dom.closestElement)(target, 'div[offset]'));
+  var isButtonClicked = Boolean((0, _dom.closestElement)(event.currentTarget, 'button')) || Boolean((0, _dom.closestElement)(target, 'button')) || ((_event$currentTarget = event.currentTarget) === null || _event$currentTarget === void 0 ? void 0 : _event$currentTarget.nodeName) === 'BUTTON' || target.nodeName === 'BUTTON';
+  var isTargetInsideContentArea = Boolean(isTargetChildOfContentArea);
+  var isBetweenContentAreaAndEditableContent = isTargetInsideContentArea && !isTargetInsideEditableArea;
+  var edgeCaseScenario1 = (isBetweenContentAreaAndEditableContent || !isEventComingFromContentArea) && !isEditorFocused;
+  var edgeCaseScenario2 = !isTargetInsideContentArea && isEditorFocused;
+  var edgeCaseScenario3 = isTargetContentArea && !isTargetInsideContentArea && !isEditorFocused;
+  var edgeCaseScenario4 = isEventComingFromContentArea && !isTargetContentArea && !isTargetInsideContentArea && !isEditorFocused;
+  var edgeCases = edgeCaseScenario1 || edgeCaseScenario2 || edgeCaseScenario3 || edgeCaseScenario4;
+  var isClickOutsideEditor = edgeCases && !isEventComingFromInlineCommentPopup && !isButtonClicked && !isInputClicked && !isTextAreaClicked && !isPopupClicked && !isBreadcrumbClicked && !isEditorPopupTextSelected && checkForModal(target); // click was within editor container and focus should be brought to input
 
   if (isClickOutsideEditor && view) {
     outsideProsemirrorEditorClickHandler(view, event);

package/dist/cjs/ui/Alignment/AlignmentButton/index.js

@@ -57,9 +57,11 @@ var AlignmentButton = /*#__PURE__*/function (_PureComponent) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onClick", function (e) {
       var _this$props = _this.props,
           onClick = _this$props.onClick,
-          value = _this$props.value;
+          value = _this$props.value; // detect if the click event comes from keyboard where screenX and screenY are 0
+
+      var isMouseEvent = e instanceof MouseEvent;
       e.preventDefault();
-      onClick(value);
+      onClick(value, isMouseEvent);
     });
     return _this;
   }

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

@@ -50,6 +50,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 var InsertMenu = function InsertMenu(_ref) {
   var editorView = _ref.editorView,
       dropdownItems = _ref.dropdownItems,
+      showElementBrowserLink = _ref.showElementBrowserLink,
       onInsert = _ref.onInsert,
       toggleVisiblity = _ref.toggleVisiblity;
 
@@ -79,7 +80,7 @@ var InsertMenu = function InsertMenu(_ref) {
     };
   }, [onInsert]);
   var quickInsertDropdownItems = dropdownItems.map(transform);
-  var viewMoreItem = quickInsertDropdownItems.pop();
+  var viewMoreItem = showElementBrowserLink && quickInsertDropdownItems.pop();
   var onInsertItem = (0, _react.useCallback)(function (item) {
     toggleVisiblity();
 

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

@@ -45,18 +45,24 @@ var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigationProvid
   var wrapperRef = (0, _react.useRef)(null);
   var selectedItemIndex = (0, _react.useRef)(0);
   var incrementIndex = (0, _react.useCallback)(function (list) {
-    if (selectedItemIndex.current === list.length - 1) {
-      selectedItemIndex.current = 0;
-    } else {
-      selectedItemIndex.current = selectedItemIndex.current + 1;
+    var index = 0;
+
+    if (document.activeElement) {
+      index = list.indexOf(document.activeElement);
+      index = (index + 1) % list.length;
     }
+
+    selectedItemIndex.current = index;
   }, []);
   var decrementIndex = (0, _react.useCallback)(function (list) {
-    if (selectedItemIndex.current === 0) {
-      selectedItemIndex.current = list.length - 1;
-    } else {
-      selectedItemIndex.current = selectedItemIndex.current - 1;
+    var index = 0;
+
+    if (document.activeElement) {
+      index = list.indexOf(document.activeElement);
+      index = (list.length + index - 1) % list.length;
     }
+
+    selectedItemIndex.current = index;
   }, []);
 
   var handleArrowRight = function handleArrowRight() {
@@ -122,12 +128,19 @@ var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigationProvid
         return;
       }
 
+      var menuWrapper = document.querySelector('.menu-key-handler-wrapper');
+
+      if (menuWrapper) {
+        // if menu wrapper exists, then a menu is open and arrow keys will be handled by MenuArrowKeyNavigationProvider
+        return;
+      }
+
       var filteredFocusableElements = getFilteredFocusableElements(wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current);
 
       if (!filteredFocusableElements || (filteredFocusableElements === null || filteredFocusableElements === void 0 ? void 0 : filteredFocusableElements.length) === 0) {
         return;
       } //This is kind of hack to reset the current focused toolbar item
-      //to handle some usecases such as Tab in/out of main toolbar
+      //to handle some use cases such as Tab in/out of main toolbar
 
 
       if (!((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {

package/dist/cjs/utils/document.js

@@ -253,11 +253,20 @@ function processRawValue(schema, value, providerFactory, sanitizePrivateContent,
 
     if (isTransformed && dispatchAnalyticsEvent) {
       dispatchAnalyticsEvent({
-        action: _enums.ACTION.DEDUPE_MARKS_TRANSFORMED,
+        action: _enums.ACTION.DEDUPE_MARKS_TRANSFORMED_V2,
         actionSubject: _enums.ACTION_SUBJECT.EDITOR,
         eventType: _enums.EVENT_TYPE.OPERATIONAL,
         attributes: {
-          discardedMarks: discardedMarks
+          /** UGC WARNING
+           *
+           * DO NOT include the `mark` attributes inside, we map here to only
+           * extract the mark type as that is the only non-UGC safe information
+           * that we can add to event-attributes
+           *
+           */
+          discardedMarkTypes: discardedMarks.map(function (mark) {
+            return mark.type;
+          })
         }
       });
     }

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "178.0.2";
+var version = "178.1.0";
 exports.version = version;
 
 var nextMajorVersion = function nextMajorVersion() {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "178.0.2",
+	"version": "178.1.0",
 	"sideEffects": false
 }

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

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

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

@@ -21,8 +21,11 @@ export class AlignmentToolbar extends React.Component {
       isOpen: false
     });
 
-    _defineProperty(this, "changeAlignment", align => {
-      this.toggleOpen();
+    _defineProperty(this, "changeAlignment", (align, togglePopup) => {
+      if (togglePopup) {
+        this.toggleOpen();
+      }
+
       return this.props.changeAlignment(align);
     });
 
@@ -54,11 +57,10 @@ export class AlignmentToolbar extends React.Component {
       }
     });
 
-    _defineProperty(this, "hideonEsc", () => {
+    _defineProperty(this, "hideOnEscape", () => {
       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();
     });
   }
@@ -84,15 +86,28 @@ export class AlignmentToolbar extends React.Component {
       boundariesElement: popupsBoundariesElement,
       scrollableElement: popupsScrollableElement,
       isOpen: isOpen,
-      handleClickOutside: event => this.hide({
-        isOpen: false,
-        event
-      }),
-      handleEscapeKeydown: this.hideonEsc,
-      onOpenChange: this.hide,
+      onOpenChange: ({
+        isOpen
+      }) => {
+        var _this$toolbarItemRef4, _this$toolbarItemRef5;
+
+        this.setState({
+          isOpen
+        });
+        (_this$toolbarItemRef4 = this.toolbarItemRef) === null || _this$toolbarItemRef4 === void 0 ? void 0 : (_this$toolbarItemRef5 = _this$toolbarItemRef4.current) === null || _this$toolbarItemRef5 === void 0 ? void 0 : _this$toolbarItemRef5.focus();
+      },
+      handleClickOutside: event => {
+        if (event instanceof MouseEvent) {
+          this.hide({
+            isOpen: false,
+            event
+          });
+        }
+      },
+      handleEscapeKeydown: this.hideOnEscape,
       fitWidth: 112,
       fitHeight: 80,
-      closeonTab: true,
+      closeOnTab: true,
       trigger: jsx(ToolbarButton, {
         spacing: isReducedSpacing ? 'none' : 'default',
         disabled: disabled,
@@ -115,7 +130,7 @@ export class AlignmentToolbar extends React.Component {
         ref: this.toolbarItemRef
       })
     }, jsx(Alignment, {
-      onClick: align => this.changeAlignment(align),
+      onClick: align => this.changeAlignment(align, false),
       selectedAlignment: pluginState.align
     })), jsx("span", {
       css: separator

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

@@ -86,11 +86,13 @@ const annotationPlugin = annotationProviders => {
             return null;
           }
 
-          return /*#__PURE__*/React.createElement(InlineCommentView, {
+          return /*#__PURE__*/React.createElement("div", {
+            "data-editor-popup": "true"
+          }, /*#__PURE__*/React.createElement(InlineCommentView, {
             providers: annotationProviders,
             editorView: editorView,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent
-          });
+          }));
         }
       });
     }

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

@@ -67,7 +67,9 @@ export function InlineCommentView({
           selection: selection.toJSON(),
           position,
           docSize: editorView.state.doc.nodeSize,
-          error: error.toString(),
+          error: error.toString()
+        },
+        nonPrivacySafeAttributes: {
           errorStack: error.stack || undefined
         }
       };
@@ -88,7 +90,8 @@ export function InlineCommentView({
 
     const textSelection = state.doc.textBetween(selection.from, selection.to);
     return /*#__PURE__*/React.createElement("div", {
-      "data-testid": AnnotationTestIds.floatingComponent
+      "data-testid": AnnotationTestIds.floatingComponent,
+      "data-editor-popup": "true"
     }, /*#__PURE__*/React.createElement(CreateComponent, {
       dom: dom,
       textSelection: textSelection,
@@ -133,6 +136,7 @@ export function InlineCommentView({
   }
 
   return /*#__PURE__*/React.createElement(AnnotationViewWrapper, {
+    "data-editor-popup": "true",
     "data-testid": AnnotationTestIds.floatingComponent,
     key: getAnnotationViewKey(activeAnnotations),
     onViewed: onAnnotationViewed

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

@@ -36,13 +36,20 @@ export const plugin = new SafePlugin({
   key: stateKey,
   view: view => {
     const pluginState = stateKey.getState(view.state);
+    let prevFrom = -1;
+    let prevTo = -1;
     return {
       update: view => {
         const {
           from,
           to
         } = view.state.selection;
-        pluginState.notifyNewSelection(from, to);
+
+        if (from !== prevFrom || to !== prevTo) {
+          pluginState.notifyNewSelection(from, to);
+          prevFrom = from;
+          prevTo = to;
+        }
       }
     };
   }

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

@@ -0,0 +1,49 @@
+/**
+ * Prevent removing the block when deleting block content
+ *
+ * @param state EditorState<any>
+ * @param dispatch CommandDispatch
+ * @returns boolean
+ */
+export function deleteBlockContent(isNodeAWrappingBlockNode) {
+  return (state, dispatch) => {
+    const {
+      tr,
+      selection: {
+        $from,
+        $to
+      },
+      doc
+    } = state;
+
+    if ($from.pos === $to.pos) {
+      return false;
+    }
+
+    let selectionCrossesWrappingBlockNode = false;
+    doc.nodesBetween($from.pos, $to.pos, (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/es2019/plugins/block-type/commands/index.js

@@ -1,4 +1,5 @@
 export { cleanUpAtTheStartOfDocument, insertBlockType, insertBlockTypesWithAnalytics, setBlockType, setBlockTypeWithAnalytics, setHeading, setHeadingWithAnalytics, setNormalText, setNormalTextWithAnalytics } from './block-type';
 export { insertBlock } from './insert-block';
 export { isConvertableToCodeBlock, transformToCodeBlockAction } from './transform-to-code-block';
-export { deleteAndMoveCursor } from './delete-and-move-cursor';
+export { deleteAndMoveCursor } from './delete-and-move-cursor';
+export { deleteBlockContent } from './delete-block-content';

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

@@ -4,12 +4,12 @@ import * as keymaps from '../../../keymaps';
 import * as commands from '../../../commands';
 import * as blockTypes from '../types';
 import { keymap } from '../../../utils/keymap';
-import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, insertBlockTypesWithAnalytics } from '../commands';
+import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockTypesWithAnalytics } from '../commands';
 import { deleteEmptyParagraphAndMoveBlockUp } from '../../../utils/commands';
 import { INPUT_METHOD } from '../../analytics';
 import { isNodeAWrappingBlockNode } from '../utils';
-const backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteAndMoveCursor);
-const del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteAndMoveCursor);
+const backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
+const del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 export default function keymapPlugin(schema, featureFlags) {
   const list = {};
   keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, commands.insertNewLineWithAnalytics, list);

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

@@ -69,13 +69,17 @@ class ToolbarBlockType extends React.PureComponent {
     });
 
     _defineProperty(this, "handleSelectBlockType", ({
-      item
+      item,
+      shouldCloseMenu = true
     }) => {
       const blockType = item.value;
       this.props.setBlockType(blockType.name);
-      this.setState({
-        active: false
-      });
+
+      if (shouldCloseMenu) {
+        this.setState({
+          active: false
+        });
+      }
     });
   }
 

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

@@ -100,7 +100,7 @@ export class BlockCard extends ReactNodeView {
   createDomRef() {
     const domRef = document.createElement('div');
 
-    if (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/es2019/plugins/card/nodeviews/embedCard.js

@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import { Card } from './genericCard';
 import { UnsupportedBlock, MediaSingle as RichMediaWrapper, findOverflowScrollParent } from '@atlaskit/editor-common/ui';
-import { browser } from '@atlaskit/editor-common/utils';
 import { DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { SelectionBasedNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';
@@ -320,7 +319,7 @@ export class EmbedCard extends SelectionBasedNodeView {
   createDomRef() {
     const domRef = document.createElement('div');
 
-    if (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/es2019/plugins/card/pm-plugins/doc.js

@@ -1,5 +1,5 @@
+import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { closeHistory } from 'prosemirror-history';
-import { NodeSelection } from 'prosemirror-state';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../../../plugins/analytics';
 import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
@@ -301,6 +301,8 @@ export const changeSelectedCardToText = text => (state, dispatch) => {
   return true;
 };
 export const setSelectedCardAppearance = appearance => (state, dispatch) => {
+  var _previousNode$type;
+
   const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
 
   if (!selectedNode) {
@@ -324,10 +326,24 @@ export const setSelectedCardAppearance = appearance => (state, dispatch) => {
     layout: 'center'
   } : selectedNode.attrs;
   const {
-    from
+    from,
+    to
   } = state.selection;
   const nodeType = getLinkNodeType(appearance, state.schema.nodes);
-  const tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
+  const 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(TextSelection.create(tr.doc, to + 1));
+  const previousNodePos = from - 1 > 0 ? from - 1 : 0;
+  const 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);
+  }
+
   addAnalytics(state, tr, {
     action: ACTION.CHANGED_TYPE,
     actionSubject: ACTION_SUBJECT.SMART_LINK,

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

@@ -255,9 +255,10 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, platfor
     const {
       allowBlockCards,
       allowEmbeds
-    } = cardOptions;
+    } = cardOptions; // 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: [],
@@ -269,6 +270,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, platfor
           editorView: editorView,
           editorState: state,
           allowEmbeds: allowEmbeds,
+          allowBlockCards: allowBlockCards,
           platform: platform
         })
       }, {

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import HyperlinkToolbar from '../../hyperlink/ui/HyperlinkAddToolbar';
 import { showLinkToolbar, hideLinkToolbar } from '../pm-plugins/actions';
-import { addAnalytics } from '../../analytics';
+import { addAnalytics, INPUT_METHOD } from '../../analytics';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '../../../ui/LinkSearch/ToolbarComponents';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
@@ -39,7 +39,10 @@ export class EditLinkToolbar extends 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: INPUT_METHOD.FLOATING_TB,
       onSubmit: (href, title, displayText) => {
         this.hideLinkToolbar();
 

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

@@ -19,6 +19,7 @@ export class LinkToolbarAppearance extends React.Component {
         currentAppearance,
         editorState,
         allowEmbeds,
+        allowBlockCards = true,
         platform
       } = this.props;
       const preview = allowEmbeds && cardContext && url && cardContext.extractors.getPreview(url, platform);
@@ -33,7 +34,7 @@ export class LinkToolbarAppearance extends React.Component {
         }
       }
 
-      const isBlockCardLinkSupportedInParent = isSupportedInParent(editorState, Fragment.from(editorState.schema.nodes.blockCard.createChecked({})), currentAppearance);
+      const isBlockCardLinkSupportedInParent = allowBlockCards ? isSupportedInParent(editorState, Fragment.from(editorState.schema.nodes.blockCard.createChecked({})), currentAppearance) : false;
       const isEmbedCardLinkSupportedInParent = allowEmbeds ? isSupportedInParent(editorState, Fragment.from(editorState.schema.nodes.embedCard.createChecked({})), currentAppearance) : false;
       const embedOption = allowEmbeds && preview && {
         appearance: 'embed',
@@ -45,6 +46,15 @@ export class LinkToolbarAppearance extends React.Component {
         disabled: !isEmbedCardLinkSupportedInParent,
         tooltip: isEmbedCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
       };
+      const blockCardOption = allowBlockCards && {
+        appearance: 'block',
+        title: intl.formatMessage(messages.block),
+        onClick: setSelectedCardAppearance('block'),
+        selected: currentAppearance === 'block',
+        testId: 'block-appearance',
+        disabled: !isBlockCardLinkSupportedInParent,
+        tooltip: isBlockCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
+      };
       const options = [{
         title: intl.formatMessage(messages.url),
         onClick: () => changeSelectedCardToLink(url, url, true)(editorState, view === null || view === void 0 ? void 0 : view.dispatch),
@@ -56,14 +66,6 @@ export class LinkToolbarAppearance extends React.Component {
         onClick: setSelectedCardAppearance('inline'),
         selected: currentAppearance === 'inline',
         testId: 'inline-appearance'
-      }, {
-        appearance: 'block',
-        title: intl.formatMessage(messages.block),
-        onClick: setSelectedCardAppearance('block'),
-        selected: currentAppearance === 'block',
-        testId: 'block-appearance',
-        disabled: !isBlockCardLinkSupportedInParent,
-        tooltip: isBlockCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
       }];
 
       const dispatchCommand = fn => {
@@ -74,6 +76,10 @@ export class LinkToolbarAppearance extends React.Component {
         }
       };
 
+      if (blockCardOption) {
+        options.push(blockCardOption);
+      }
+
       if (embedOption) {
         options.push(embedOption);
       }

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

@@ -1,4 +1,4 @@
-import { receiveTransaction } from 'prosemirror-collab';
+import { receiveTransaction } from '@atlaskit/prosemirror-collab';
 import { Step } from 'prosemirror-transform';
 import { AllSelection, NodeSelection } from 'prosemirror-state';
 import { replaceDocument } from './utils';

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

@@ -1,4 +1,4 @@
-import { collab } from 'prosemirror-collab';
+import { collab } from '@atlaskit/prosemirror-collab';
 import { createPlugin, pluginKey } from './plugin';
 import { sendTransaction } from './events/send-transaction';
 import { addSynchronyErrorAnalytics } from './analytics';

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { utils } from '@atlaskit/util-service-support';
 import { EventEmitter2 } from 'eventemitter2';
-import { getVersion, sendableSteps } from 'prosemirror-collab';
+import { getVersion, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { logger } from './logger';
 export class Channel {
   constructor(config, pubSubClient) {