@atlaskit/editor-core 153.1.5 → 157.0.0

package/dist/es2019/plugins/media/toolbar/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { NodeSelection } from 'prosemirror-state';
-import { findParentNodeOfType, removeSelectedNode, safeInsert } from 'prosemirror-utils';
+import { findParentNodeOfType, removeSelectedNode } from 'prosemirror-utils';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import DownloadIcon from '@atlaskit/icon/glyph/download';
 import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
@@ -20,8 +20,7 @@ import { messages } from '@atlaskit/media-ui';
 import { messages as cardMessages } from '../../card/messages';
 import { FilePreviewItem } from './filePreviewItem';
 import { downloadMedia, removeMediaGroupNode } from './utils';
-import { Fragment } from 'prosemirror-model';
-import { changeInlineToMediaCard, removeInlineCard } from './commands';
+import { changeInlineToMediaCard, changeMediaCardToInline, removeInlineCard } from './commands';
 import { MediaInlineNodeSelector, MediaSingleNodeSelector } from '../nodeviews/styles';
 
 const remove = (state, dispatch) => {
@@ -42,36 +41,6 @@ const handleRemoveMediaGroup = (state, dispatch) => {
   return true;
 };
 
-const changeMediaCardToInline = (state, dispatch) => {
-  const {
-    media,
-    mediaInline,
-    paragraph
-  } = state.schema.nodes;
-  const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
-
-  if (!selectedNode || !selectedNode.type === media) {
-    return false;
-  }
-
-  const mediaInlineNode = mediaInline.create({
-    id: selectedNode.attrs.id,
-    collection: selectedNode.attrs.collection
-  });
-  const space = state.schema.text(' ');
-  let content = Fragment.from([mediaInlineNode, space]);
-  const node = paragraph.createChecked({}, content);
-  const nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
-  let tr = removeMediaGroupNode(state);
-  tr = safeInsert(node, nodePos, true)(tr);
-
-  if (dispatch) {
-    dispatch(tr);
-  }
-
-  return true;
-};
-
 const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
   const {
     mediaGroup
@@ -79,7 +48,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
   const items = [{
     id: 'editor.media.view.switcher',
     type: 'dropdown',
-    title: intl.formatMessage(messages.displayThumbnail),
+    title: intl.formatMessage(messages.changeView),
     options: [{
       id: 'editor.media.view.switcher.inline',
       title: intl.formatMessage(cardMessages.inline),
@@ -145,7 +114,7 @@ const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState) => {
   const items = [{
     id: 'editor.media.view.switcher',
     type: 'dropdown',
-    title: intl.formatMessage(cardMessages.inline),
+    title: intl.formatMessage(messages.changeView),
     options: [{
       id: 'editor.media.view.switcher.inline',
       title: intl.formatMessage(cardMessages.inline),

package/dist/es2019/plugins/media/ui/Media/DropPlaceholder.js

@@ -4,6 +4,8 @@ import { borderRadius } from '@atlaskit/theme/constants';
 import { B400, B300, B200 } from '@atlaskit/theme/colors';
 import DocumentFilledIcon from '@atlaskit/icon/glyph/document-filled';
 import { hexToRgba } from '@atlaskit/adf-schema';
+import { injectIntl } from 'react-intl-next';
+import { dropPlaceholderMessages } from './drop-placeholder-messages';
 import { MEDIA_HEIGHT, FILE_WIDTH } from '../../nodeviews/mediaNodeView/media';
 const IconWrapper = styled.div`
   color: ${hexToRgba(B400, 0.4) || B400};
@@ -23,9 +25,21 @@ const DropLine = styled.div`
   width: 100%;
   height: 2px;
 `;
+
+const IconWrapperComponent = props => {
+  const {
+    intl
+  } = props;
+  const {
+    dropPlaceholderLabel
+  } = dropPlaceholderMessages;
+  return /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(DocumentFilledIcon, {
+    label: intl.formatMessage(dropPlaceholderLabel),
+    size: "medium"
+  }));
+};
+
+const IntlIconWrapper = injectIntl(IconWrapperComponent);
 export default (({
   type = 'group'
-}) => type === 'single' ? /*#__PURE__*/React.createElement(DropLine, null) : /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(DocumentFilledIcon, {
-  label: "Document",
-  size: "medium"
-})));
+}) => type === 'single' ? /*#__PURE__*/React.createElement(DropLine, null) : /*#__PURE__*/React.createElement(IntlIconWrapper, null));

package/dist/es2019/plugins/media/ui/Media/drop-placeholder-messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export const dropPlaceholderMessages = defineMessages({
+  dropPlaceholderLabel: {
+    id: 'fabric.editor.dropPlaceholderLabel',
+    defaultMessage: 'Document',
+    description: 'document label for an media icon'
+  }
+});

package/dist/es2019/plugins/media/ui/ToolbarMedia/index.js

@@ -2,6 +2,8 @@ import React from 'react';
 import AttachmentIcon from '@atlaskit/icon/glyph/editor/attachment';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
 import WithPluginState from '../../../../ui/WithPluginState';
+import { toolbarMediaMessages } from './toolbar-media-messages';
+import { injectIntl } from 'react-intl-next';
 
 const onClickMediaButton = pluginState => () => {
   pluginState.showMediaPicker();
@@ -13,7 +15,8 @@ const ToolbarMedia = ({
   eventDispatcher,
   pluginKey,
   isDisabled,
-  isReducedSpacing
+  isReducedSpacing,
+  intl
 }) => /*#__PURE__*/React.createElement(WithPluginState, {
   editorView: editorView,
   eventDispatcher: eventDispatcher,
@@ -27,17 +30,20 @@ const ToolbarMedia = ({
       return null;
     }
 
+    const {
+      toolbarMediaTitle
+    } = toolbarMediaMessages;
     return /*#__PURE__*/React.createElement(ToolbarButton, {
       buttonId: TOOLBAR_BUTTON.MEDIA,
       onClick: onClickMediaButton(mediaPlugin),
       disabled: isDisabled,
-      title: "Files & images",
+      title: intl.formatMessage(toolbarMediaTitle),
       spacing: isReducedSpacing ? 'none' : 'default',
       iconBefore: /*#__PURE__*/React.createElement(AttachmentIcon, {
-        label: "Files & images"
+        label: intl.formatMessage(toolbarMediaTitle)
       })
     });
   }
 });
 
-export default ToolbarMedia;
+export default injectIntl(ToolbarMedia);

package/dist/es2019/plugins/media/ui/ToolbarMedia/toolbar-media-messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export const toolbarMediaMessages = defineMessages({
+  toolbarMediaTitle: {
+    id: 'fabric.editor.toolbarMediaTitle',
+    defaultMessage: 'Files & images',
+    description: 'a label for an icon that describes files and images'
+  }
+});

package/dist/es2019/plugins/media/utils/media-common.js

@@ -257,14 +257,15 @@ function canContainImage(element) {
 }
 /**
  * Given a html string, we attempt to hoist any nested `<img>` tags,
- * not wrapped by a `<div>` as ProseMirror no-op's on those scenarios.
+ * not directly wrapped by a `<div>` as ProseMirror no-op's
+ * on those scenarios.
  * @param html
  */
 
 
 export const unwrapNestedMediaElements = html => {
   const parser = new DOMParser();
-  const doc = parser.parseFromString(html, 'text/html');
+  let doc = parser.parseFromString(html, 'text/html');
   const wrapper = doc.body; // Remove Google Doc's wrapper <b> el
 
   const docsWrapper = wrapper.querySelector('b[id^="docs-internal-guid-"]');
@@ -292,11 +293,11 @@ export const unwrapNestedMediaElements = html => {
     if (isElementInvisible(mediaParent) || isElementInvisible(imageTag)) {
       mediaParent.removeChild(imageTag);
       return;
-    } // If its wrapped by a div we assume its safe to bypass.
-    // ProseMirror should handle this case properly.
+    } // If its wrapped by a valid container we assume its safe to bypass.
+    // ProseMirror should handle these cases properly.
 
 
-    if (mediaParent instanceof HTMLDivElement || mediaParent instanceof HTMLSpanElement && mediaParent.closest('[class*="emoji-common"]')) {
+    if (canContainImage(mediaParent) || mediaParent instanceof HTMLSpanElement && mediaParent.closest('[class*="emoji-common"]')) {
       return;
     } // Find the top most element that the parent has a valid container for the image.
     // Stop just before found the wrapper

package/dist/es2019/plugins/mentions/messages.js

@@ -4,5 +4,15 @@ export const messages = defineMessages({
     id: 'fabric.editor.inviteItem.title',
     defaultMessage: '{userRole, select, admin {Invite} trusted {Invite} other {Add}} teammate to {productName}',
     description: 'Title of the invite teammate item in typeahead plugin'
+  },
+  mentionsAddLabel: {
+    id: 'fabric.editor.mentionsAddLabel',
+    defaultMessage: 'add-icon',
+    description: 'icon label to describe adding a new mention'
+  },
+  mentionsIconLabel: {
+    id: 'fabric.editor.mentionsIconLabel',
+    defaultMessage: 'Mention',
+    description: 'icon label to describe the mention icon'
   }
 });

package/dist/es2019/plugins/mentions/nodeviews/mention.js

@@ -2,13 +2,8 @@ import React from 'react';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import Mention from '../ui/Mention';
 import { ReactNodeView } from '../../../nodeviews';
-import InlineNodeWrapper, { createMobileInlineDomRef } from '../../../ui/InlineNodeWrapper';
 export class MentionNodeView extends ReactNodeView {
   createDomRef() {
-    if (this.reactComponentProps.options && this.reactComponentProps.options.useInlineWrapper) {
-      return createMobileInlineDomRef();
-    }
-
     return super.createDomRef();
   }
 
@@ -22,9 +17,7 @@ export class MentionNodeView extends ReactNodeView {
       text,
       accessLevel
     } = this.node.attrs;
-    return /*#__PURE__*/React.createElement(InlineNodeWrapper, {
-      useInlineWrapper: options && options.useInlineWrapper
-    }, /*#__PURE__*/React.createElement(Mention, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Mention, {
       id: id,
       text: text,
       accessLevel: accessLevel,
@@ -34,8 +27,11 @@ export class MentionNodeView extends ReactNodeView {
 
 }
 export default function mentionNodeView(portalProviderAPI, eventDispatcher, providerFactory, options) {
-  return (node, view, getPos) => new MentionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
-    providerFactory,
-    options
-  }).init();
+  return (node, view, getPos) => {
+    const hasIntlContext = true;
+    return new MentionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
+      providerFactory,
+      options
+    }, undefined, undefined, undefined, hasIntlContext).init();
+  };
 }

package/dist/es2019/plugins/mentions/pm-plugins/main.js

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { SLI_EVENT_TYPE, SMART_EVENT_TYPE, buildSliPayload } from '@atlaskit/mention/resource';
 import mentionNodeView from '../nodeviews/mention';
 import { mentionPluginKey } from './key';
@@ -41,7 +41,7 @@ export function createMentionPlugin(dispatch, providerFactory, portalProviderAPI
     }
   };
 
-  return new Plugin({
+  return new SafePlugin({
     key: mentionPluginKey,
     state: {
       init() {

package/dist/es2019/plugins/mentions/ui/InviteItem/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import AddIcon from '@atlaskit/icon/glyph/add';
 import { N300 } from '@atlaskit/theme/colors';
 import React, { useCallback, useEffect } from 'react';
-import { FormattedMessage } from 'react-intl-next';
+import { FormattedMessage, injectIntl } from 'react-intl-next';
 import { AvatarStyle, CapitalizedStyle, MentionItemStyle, NameSectionStyle, RowStyle, ROW_SIDE_PADDING, AVATAR_HEIGHT } from './styles';
 import { messages } from '../../messages';
 export const INVITE_ITEM_MIN_HEIGHT = AVATAR_HEIGHT + ROW_SIDE_PADDING * 2;
@@ -20,7 +20,8 @@ const InviteItem = ({
   onMouseEnter,
   onSelection,
   selected,
-  userRole
+  userRole,
+  intl
 }) => {
   const onSelected = useCallback(event => {
     if (leftClick(event) && onSelection) {
@@ -44,7 +45,7 @@ const InviteItem = ({
     onMouseEnter: onItemMouseEnter,
     "data-id": INVITE_ITEM_DESCRIPTION.id
   }, /*#__PURE__*/React.createElement(RowStyle, null, /*#__PURE__*/React.createElement(AvatarStyle, null, /*#__PURE__*/React.createElement(AddIcon, {
-    label: "add-icon",
+    label: intl.formatMessage(messages.mentionsAddLabel),
     primaryColor: N300
   })), /*#__PURE__*/React.createElement(NameSectionStyle, null, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.inviteItemTitle, {
     values: {
@@ -54,4 +55,4 @@ const InviteItem = ({
   })))));
 };
 
-export default InviteItem;
+export default injectIntl(InviteItem);

package/dist/es2019/plugins/mentions/ui/ToolbarMention/index.js

@@ -5,7 +5,10 @@ import MentionIcon from '@atlaskit/icon/glyph/editor/mention';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
 import { INPUT_METHOD } from '../../../analytics';
 import { createTypeAheadTools } from '../../../type-ahead/api';
-export default class ToolbarMention extends PureComponent {
+import { injectIntl } from 'react-intl-next';
+import { messages } from '../../messages';
+
+class ToolbarMention extends PureComponent {
   constructor(...args) {
     super(...args);
 
@@ -20,17 +23,20 @@ export default class ToolbarMention extends PureComponent {
   }
 
   render() {
+    const mentionStringTranslated = this.props.intl.formatMessage(messages.mentionsIconLabel);
     return /*#__PURE__*/React.createElement(ToolbarButton, {
       testId: this.props.testId,
       buttonId: TOOLBAR_BUTTON.MENTION,
       spacing: "none",
       onClick: this.handleInsertMention,
       disabled: this.props.isDisabled,
-      title: "Mention @",
+      title: mentionStringTranslated + '@',
       iconBefore: /*#__PURE__*/React.createElement(MentionIcon, {
-        label: "Mention"
+        label: mentionStringTranslated
       })
     });
   }
 
-}
+}
+
+export default injectIntl(ToolbarMention);

package/dist/es2019/plugins/mobile-dimensions/index.js

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { setWindowHeight } from './commands';
 import { createPluginState, mobileDimensionsPluginKey } from './plugin-factory'; // 44 pixels squared is the minimum size for a tap target as per Apple's UX design guidelines
 
@@ -17,9 +17,23 @@ const getInitialState = () => ({
 
 const createPlugin = dispatch => {
   let rafId;
-  return new Plugin({
+  return new SafePlugin({
     state: createPluginState(dispatch, getInitialState),
     key: mobileDimensionsPluginKey,
+    props: {
+      scrollThreshold: {
+        top: 12,
+        left: 0,
+        right: 0,
+        bottom: 12
+      },
+      scrollMargin: {
+        top: 12,
+        bottom: 12,
+        left: 0,
+        right: 0
+      }
+    },
 
     view(editorView) {
       const handleResize = () => {

package/dist/es2019/plugins/mobile-selection/content-in-selection.js

@@ -3,11 +3,11 @@ export const contentInSelection = ({
   selection,
   doc
 }) => {
-  const nodes = new Set();
-  const marks = new Set();
+  const nodes = new Array();
+  const marks = new Array();
   doc.nodesBetween(selection.from, selection.to, node => {
-    nodes.add(node.type.name);
-    node.marks.forEach(mark => marks.add(mark.type.name));
+    nodes.push(node.type.name);
+    node.marks.forEach(mark => marks.push(mark.type.name));
     return true;
   });
   return {

package/dist/es2019/plugins/mobile-selection/mobile-selection-plugin.js

@@ -1,9 +1,10 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { contentInSelection } from './content-in-selection';
 export const selectionPluginKey = new PluginKey('mobile-selection');
 export const createProseMirrorPlugin = dispatch => {
-  return new Plugin({
+  return new SafePlugin({
     view: editorView => {
       const domAtPos = editorView.domAtPos.bind(editorView);
       return {

package/dist/es2019/plugins/panel/pm-plugins/main.js

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { getPanelNodeView } from '../nodeviews/panel';
 import { pluginKey } from '../types';
@@ -7,7 +7,7 @@ export const createPlugin = (dispatch, providerFactory, pluginOptions) => {
   const {
     useLongPressSelection = false
   } = pluginOptions;
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey,
     props: {
       nodeViews: {

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

@@ -43,41 +43,47 @@ export const panelIconMap = {
   }
 };
 export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, activePanelType, activePanelColor, activePanelIcon) => {
+  // TODO: ED-14403 investigate why these titles are not getting translated for the tooltips
   const items = [{
     id: 'editor.panel.info',
     type: 'button',
     icon: InfoIcon,
     onClick: changePanelType(PanelType.INFO),
     selected: activePanelType === PanelType.INFO,
-    title: formatMessage(messages.info)
+    title: formatMessage(messages.info),
+    tabIndex: null
   }, {
     id: 'editor.panel.note',
     type: 'button',
     icon: NoteIcon,
     onClick: changePanelType(PanelType.NOTE),
     selected: activePanelType === PanelType.NOTE,
-    title: formatMessage(messages.note)
+    title: formatMessage(messages.note),
+    tabIndex: null
   }, {
     id: 'editor.panel.success',
     type: 'button',
     icon: SuccessIcon,
     onClick: changePanelType(PanelType.SUCCESS),
     selected: activePanelType === PanelType.SUCCESS,
-    title: formatMessage(messages.success)
+    title: formatMessage(messages.success),
+    tabIndex: null
   }, {
     id: 'editor.panel.warning',
     type: 'button',
     icon: WarningIcon,
     onClick: changePanelType(PanelType.WARNING),
     selected: activePanelType === PanelType.WARNING,
-    title: formatMessage(messages.warning)
+    title: formatMessage(messages.warning),
+    tabIndex: null
   }, {
     id: 'editor.panel.error',
     type: 'button',
     icon: ErrorIcon,
     onClick: changePanelType(PanelType.ERROR),
     selected: activePanelType === PanelType.ERROR,
-    title: formatMessage(messages.error)
+    title: formatMessage(messages.error),
+    tabIndex: null
   }];
 
   if (isCustomPanelEnabled) {
@@ -237,7 +243,8 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     onMouseLeave: hoverDecoration(panelNodeType, false),
     onFocus: hoverDecoration(panelNodeType, true),
     onBlur: hoverDecoration(panelNodeType, false),
-    title: formatMessage(commonMessages.remove)
+    title: formatMessage(commonMessages.remove),
+    tabIndex: null
   });
   return items;
 };

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

@@ -97,8 +97,17 @@ export function handlePasteLinkOnSelectedText(slice) {
       const paragraph = slice.content.child(0);
 
       if (paragraph.content.childCount === 1 && isText(paragraph.content.child(0), schema)) {
-        const text = paragraph.content.child(0);
-        linkMark = text.marks.find(mark => isLinkMark(mark, schema) && mark.attrs.href === text.text);
+        const text = paragraph.content.child(0); // If pasteType is plain text, then
+        //  @atlaskit/editor-markdown-transformer in getMarkdownSlice decode
+        //  url before setting text property of text node.
+        //  However href of marks will be without decoding.
+        //  So, if there is character (e.g space) in url eligible escaping then
+        //  mark.attrs.href will not be equal to text.text.
+        //  That's why decoding mark.attrs.href before comparing.
+        // However, if pasteType is richText, that means url in text.text
+        //  and href in marks, both won't be decoded.
+
+        linkMark = text.marks.find(mark => isLinkMark(mark, schema) && (mark.attrs.href === text.text || decodeURI(mark.attrs.href) === text.text));
       }
     } // if we have a link, apply it to the selected text if we have any and it's allowed
 
@@ -587,12 +596,17 @@ export function insertIntoPanel(tr, slice, panel) {
 }
 export function handleRichText(slice) {
   return (state, dispatch) => {
-    var _panelParentOverCurre;
+    var _slice$content;
 
     const {
       codeBlock,
-      panel
-    } = state.schema.nodes; // In case user is pasting inline code,
+      heading,
+      paragraph
+    } = state.schema.nodes;
+    const {
+      selection
+    } = state;
+    const firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild; // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
 
     let tr = state.tr;
@@ -606,20 +620,27 @@ export function handleRichText(slice) {
     }
 
     closeHistory(tr);
-    let panelParentOverCurrentSelection = findParentNodeOfType(panel)(tr.selection);
-    const isFirstChildListNode = isListNode(slice.content.firstChild);
-    const isLastChildListNode = isListNode(slice.content.lastChild);
-    const isSliceContentListNodes = isFirstChildListNode || isLastChildListNode;
-    const isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
+    const isFirstChildListNode = isListNode(firstChildOfSlice);
+    const isLastChildListNode = isListNode(firstChildOfSlice);
+    const isSliceContentListNodes = isFirstChildListNode || isLastChildListNode; // We want to use safeInsert to insert invalid content, as it inserts at the closest non schema violating position
+    // rather than spliting the selection parent node in half (which is what replaceSelection does)
+    // Exception is paragraph and heading nodes, these should be split, provided their parent supports the pasted content
+
+    const textNodes = [heading, paragraph];
+    const selectionParent = selection.$to.node(selection.$to.depth - 1);
+    const noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
 
-    if (isSliceContentListNodes || isTargetPanelEmpty) {
+    if (isSliceContentListNodes) {
       insertSliceForLists({
         tr,
         slice
       });
+    } else if (noNeedForSafeInsert) {
+      tr.replaceSelection(slice);
     } else {
-      // if inside an empty panel, try and insert content inside it rather than replace it
-      insertIntoPanel(tr, slice, panel);
+      // 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
+      tr = safeInsert(slice.content, tr.selection.$to.pos)(tr);
     }
 
     tr.setStoredMarks([]);

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

@@ -2,7 +2,8 @@ import { createPlugin } from './pm-plugins/main';
 
 const pastePlugin = ({
   cardOptions,
-  sanitizePrivateContent
+  sanitizePrivateContent,
+  plainTextPasteLinkification
 }) => ({
   name: 'paste',
 
@@ -13,7 +14,7 @@ const pastePlugin = ({
         schema,
         providerFactory,
         dispatchAnalyticsEvent
-      }) => createPlugin(schema, dispatchAnalyticsEvent, cardOptions, sanitizePrivateContent, providerFactory)
+      }) => createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory)
     }];
   }
 

package/dist/es2019/plugins/paste/pm-plugins/analytics.js

@@ -126,7 +126,7 @@ function getActionSubjectId(view) {
   return actionSubjectId ? actionSubjectId : ACTION_SUBJECT_ID.PASTE_PARAGRAPH;
 }
 
-function createPasteAsPlainPayload(actionSubjectId, text) {
+function createPasteAsPlainPayload(actionSubjectId, text, linksInPasteCount) {
   return {
     action: ACTION.PASTED_AS_PLAIN,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -134,7 +134,8 @@ function createPasteAsPlainPayload(actionSubjectId, text) {
     eventType: EVENT_TYPE.TRACK,
     attributes: {
       inputMethod: INPUT_METHOD.KEYBOARD,
-      pasteSize: text.length
+      pasteSize: text.length,
+      linksInPasteCount
     }
   };
 }
@@ -160,23 +161,6 @@ function createPastePayload(actionSubjectId, attributes, linkDomain) {
 export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
   const text = event.clipboardData ? event.clipboardData.getData('text/plain') || event.clipboardData.getData('text/uri-list') : '';
   const actionSubjectId = getActionSubjectId(view);
-
-  if (pasteContext.asPlain) {
-    return createPasteAsPlainPayload(actionSubjectId, text);
-  }
-
-  const source = getPasteSource(event);
-
-  if (pasteContext.type === PasteTypes.plain) {
-    return createPastePayload(actionSubjectId, {
-      pasteSize: text.length,
-      type: pasteContext.type,
-      content: PasteContents.text,
-      source,
-      hyperlinkPasteOnText: false
-    });
-  }
-
   const pasteSize = slice.size;
   const content = getContent(view.state, slice);
   const linkUrls = []; // If we have a link among the pasted content, grab the
@@ -194,13 +178,31 @@ export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
     });
   }
 
+  if (pasteContext.asPlain) {
+    return createPasteAsPlainPayload(actionSubjectId, text, linkUrls.length);
+  }
+
+  const source = getPasteSource(event);
+
+  if (pasteContext.type === PasteTypes.plain) {
+    return createPastePayload(actionSubjectId, {
+      pasteSize: text.length,
+      type: pasteContext.type,
+      content: PasteContents.text,
+      source,
+      hyperlinkPasteOnText: false,
+      linksInPasteCount: linkUrls.length
+    });
+  }
+
   const linkDomains = linkUrls.map(getLinkDomain);
   return createPastePayload(actionSubjectId, {
     type: pasteContext.type,
     pasteSize,
     content,
     source,
-    hyperlinkPasteOnText: !!pasteContext.hyperlinkPasteOnText
+    hyperlinkPasteOnText: !!pasteContext.hyperlinkPasteOnText,
+    linksInPasteCount: linkUrls.length
   }, linkDomains);
 } // TODO: ED-6612 We should not dispatch only analytics, it's preferred to wrap each command with his own analytics.
 // However, handlers like handleMacroAutoConvert dispatch multiple time,