@atlaskit/editor-core 153.1.4 → 156.0.0

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

@@ -2,7 +2,7 @@ import { removeParentNodeOfType, findSelectedNodeOfType, removeSelectedNode, fin
 import { NodeSelection } from 'prosemirror-state';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, addAnalytics } from '../analytics';
 import { findPanel } from './utils';
-import { getPanelTypeBackground } from '@atlaskit/editor-common';
+import { getPanelTypeBackground } from '@atlaskit/editor-common/styles';
 export const removePanel = () => (state, dispatch) => {
   const {
     schema: {
@@ -56,13 +56,19 @@ export const changePanelType = (panelType, panelOptions = {}, allowCustomPanel =
   if (allowCustomPanel) {
     let previousColor = panelNode.node.attrs.panelColor || getPanelTypeBackground(previousType);
     let previousIcon = panelNode.node.attrs.panelIcon;
+    let previousIconId = panelNode.node.attrs.panelIconId;
+    let previousIconText = panelNode.node.attrs.panelIconText;
     let newPanelOptions = {
       color: previousColor,
       emoji: previousIcon,
+      emojiId: previousIconId,
+      emojiText: previousIconText,
       ...panelOptions
     };
     newTr = tr.setNodeMarkup(panelNode.pos, nodes.panel, {
       panelIcon: newPanelOptions.emoji,
+      panelIconId: newPanelOptions.emojiId,
+      panelIconText: newPanelOptions.emojiText,
       panelColor: newPanelOptions.color,
       panelType
     });

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

@@ -139,6 +139,8 @@ const panelPlugin = (options = {}) => ({
             return insertPanelTypeWithAnalytics({
               panelType: PanelType.CUSTOM,
               panelIcon: ':rainbow:',
+              panelIconId: '1f308',
+              panelIconText: '🌈',
               panelColor: T50
             }, state, insert);
           }

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

@@ -1,25 +1,21 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { DOMSerializer } from 'prosemirror-model';
-import InfoIcon from '@atlaskit/icon/glyph/editor/info';
-import SuccessIcon from '@atlaskit/icon/glyph/editor/success';
-import NoteIcon from '@atlaskit/icon/glyph/editor/note';
-import WarningIcon from '@atlaskit/icon/glyph/editor/warning';
-import ErrorIcon from '@atlaskit/icon/glyph/editor/error';
 import TipIcon from '@atlaskit/icon/glyph/editor/hint';
 import { PanelType } from '@atlaskit/adf-schema';
-import { PanelSharedCssClassName } from '@atlaskit/editor-common';
-import { Emoji } from '@atlaskit/editor-common';
+import { PanelSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { Emoji } from '@atlaskit/editor-common/emoji';
 import { panelAttrsToDom } from '../utils';
 import { akEditorCustomIconSize } from '@atlaskit/editor-shared-styles/consts';
+import { PanelInfoIcon, PanelSuccessIcon, PanelNoteIcon, PanelWarningIcon, PanelErrorIcon } from '@atlaskit/editor-common/icons';
 export const panelIcons = {
-  info: InfoIcon,
-  success: SuccessIcon,
-  note: NoteIcon,
+  info: PanelInfoIcon,
+  success: PanelSuccessIcon,
+  note: PanelNoteIcon,
   tip: TipIcon,
-  warning: WarningIcon,
-  error: ErrorIcon,
-  custom: InfoIcon
+  warning: PanelWarningIcon,
+  error: PanelErrorIcon,
+  custom: PanelInfoIcon
 };
 export const PanelIcon = props => {
   const {
@@ -27,7 +23,9 @@ export const PanelIcon = props => {
     providerFactory,
     panelAttributes: {
       panelType,
-      panelIcon
+      panelIcon,
+      panelIconId,
+      panelIconText
     }
   } = props;
 
@@ -35,6 +33,8 @@ export const PanelIcon = props => {
     return /*#__PURE__*/React.createElement(Emoji, {
       providers: providerFactory,
       shortName: panelIcon,
+      id: panelIconId,
+      fallback: panelIconText,
       showTooltip: false,
       allowTextFallback: false,
       fitToHeight: akEditorCustomIconSize
@@ -77,7 +77,7 @@ class PanelNodeView {
 
   ignoreMutation(mutation) {
     // ignore mutation if it caused by the icon.
-    return mutation.target === this.icon;
+    return mutation.target === this.icon || mutation.target.parentNode === this.icon;
   }
 
 }

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

@@ -1,5 +1,5 @@
-import { Plugin } from 'prosemirror-state';
-import { PanelSharedCssClassName } from '@atlaskit/editor-common';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PanelSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { getPanelNodeView } from '../nodeviews/panel';
 import { pluginKey } from '../types';
 import { createSelectionClickHandler } from '../../selection/utils';
@@ -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/styles.js

@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import { panelSharedStyles, PanelSharedCssClassName } from '@atlaskit/editor-common';
+import { panelSharedStyles, PanelSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { SelectionStyle, getSelectionStyles, akEditorDeleteBackground, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorDeleteIconColor, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 export const panelStyles = css`
   .ProseMirror {

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

@@ -9,7 +9,7 @@ import commonMessages from '../../messages';
 import { removePanel, changePanelType } from './actions';
 import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { panelBackgroundPalette } from '../../ui/ColorPalette/Palettes/panelBackgroundPalette';
-import { getPanelTypeBackground } from '@atlaskit/editor-common';
+import { getPanelTypeBackground } from '@atlaskit/editor-common/styles';
 import { findPanel } from './utils';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { DEFAULT_BORDER_COLOR } from '../../ui/ColorPalette/Palettes';
@@ -17,49 +17,73 @@ import { PanelType } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID, withAnalytics } from '../analytics';
 import { messages } from './message';
 export const panelIconMap = {
-  [PanelType.INFO]: ':info:',
-  [PanelType.NOTE]: ':note:',
-  [PanelType.WARNING]: ':warning:',
-  [PanelType.ERROR]: ':cross_mark:',
-  [PanelType.SUCCESS]: ':check_mark:',
-  [PanelType.TIP]: ':tip:'
+  [PanelType.INFO]: {
+    shortName: ':info:',
+    id: 'atlassian-info'
+  },
+  [PanelType.NOTE]: {
+    shortName: ':note:',
+    id: 'atlassian-note'
+  },
+  [PanelType.WARNING]: {
+    shortName: ':warning:',
+    id: 'atlassian-warning'
+  },
+  [PanelType.ERROR]: {
+    shortName: ':cross_mark:',
+    id: 'atlassian-cross_mark'
+  },
+  [PanelType.SUCCESS]: {
+    shortName: ':check_mark:',
+    id: 'atlassian-check_mark'
+  },
+  [PanelType.TIP]: {
+    shortName: ':tip:',
+    id: 'atlassian-tip'
+  }
 };
 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) {
@@ -72,9 +96,10 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
 
       let previousColor = panelNode.node.attrs.panelColor || getPanelTypeBackground(panelNode.node.attrs.panelType);
       const emojiInfo = panelNode.node.attrs.panelType;
-      const panelInfo = panelIconMap[emojiInfo];
-      const previousEmoji = panelInfo ? {
-        emoji: panelInfo
+      const panelEmoji = panelIconMap[emojiInfo];
+      const previousEmoji = panelEmoji ? {
+        emoji: panelEmoji.shortName,
+        emojiId: panelEmoji.id
       } : {};
 
       if (previousColor === color) {
@@ -111,9 +136,11 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
 
       let previousIcon = panelNode.node.attrs.panelIcon || '';
 
-      if (previousIcon === emoji) {
+      if (previousIcon === emoji.shortName) {
         changePanelType(PanelType.CUSTOM, {
-          emoji
+          emoji: emoji.shortName,
+          emojiId: emoji.id,
+          emojiText: emoji.fallback
         }, true)(state, dispatch);
         return false;
       }
@@ -123,13 +150,15 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         actionSubject: ACTION_SUBJECT.PANEL,
         actionSubjectId: ACTION_SUBJECT_ID.PANEL,
         attributes: {
-          newIcon: emoji,
+          newIcon: emoji.shortName,
           previousIcon: previousIcon
         },
         eventType: EVENT_TYPE.TRACK
       };
       withAnalytics(payload)(changePanelType(PanelType.CUSTOM, {
-        emoji
+        emoji: emoji.shortName,
+        emojiId: emoji.id,
+        emojiText: emoji.fallback
       }, true))(state, dispatch);
       return false;
     };
@@ -155,7 +184,9 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         eventType: EVENT_TYPE.TRACK
       };
       withAnalytics(payload)(changePanelType(PanelType.CUSTOM, {
-        emoji: undefined
+        emoji: undefined,
+        emojiId: undefined,
+        emojiText: undefined
       }, isCustomPanelEnabled))(state, dispatch);
       return false;
     };
@@ -184,7 +215,7 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         selectType: 'emoji',
         options: [],
         selected: activePanelType === PanelType.CUSTOM && !!activePanelIcon,
-        onChange: emojiShortName => changeEmoji(emojiShortName)
+        onChange: emoji => changeEmoji(emoji)
       };
       const removeEmojiButton = {
         id: 'editor.panel.removeEmoji',
@@ -212,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/panel/utils.js

@@ -1,6 +1,6 @@
 import { findSelectedNodeOfType, findParentNodeOfType } from 'prosemirror-utils';
 import { PanelType } from '@atlaskit/adf-schema';
-import { PanelSharedCssClassName } from '@atlaskit/editor-common';
+import { PanelSharedCssClassName } from '@atlaskit/editor-common/styles';
 export const findPanel = (state, selection) => {
   const {
     panel
@@ -11,11 +11,13 @@ export const panelAttrsToDom = (attrs, allowCustomPanel) => {
   const {
     panelColor,
     panelType,
-    panelIcon
+    panelIcon,
+    panelIconId,
+    panelIconText
   } = attrs;
   const isCustomPanel = panelType === PanelType.CUSTOM && allowCustomPanel;
   const style = panelColor && isCustomPanel ? `background-color: ${panelColor}` : '';
-  const hasIcon = !isCustomPanel || !!panelIcon;
+  const hasIcon = !isCustomPanel || !!panelIcon || !!panelIconId;
   let panelAttrs = {
     class: PanelSharedCssClassName.prefix,
     'data-panel-type': panelType || PanelType.INFO,
@@ -24,7 +26,9 @@ export const panelAttrsToDom = (attrs, allowCustomPanel) => {
 
   if (panelColor && isCustomPanel) {
     panelAttrs = { ...panelAttrs,
-      'data-panel-color': panelColor
+      'data-panel-color': panelColor,
+      'data-panel-icon-id': panelIconId,
+      'data-panel-icon-text': panelIconText
     };
   }
 

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,

package/dist/es2019/plugins/paste/pm-plugins/clipboard-text-serializer.js

@@ -0,0 +1,37 @@
+/**
+ * Returns a plain text serialization of a given slice. This is used for populating the plain text
+ * section of the clipboard on copy.
+ * The current implementation is bare bones - only inlineCards and blockCards are tested (they
+ * previously were empty on plain text copy).
+ * Unknown nodes are passed to node.textBetween().
+ *
+ * By default (without this function passed to the editor), the editor uses
+ * `slice.content.textBetween(0, slice.content.size, "\n\n")`
+ * (see https://prosemirror.net/docs/ref/#view.EditorProps.clipboardTextSerializer)
+ */
+export function clipboardTextSerializer(slice) {
+  let text = '';
+  const blockSeparater = '\n\n';
+  slice.content.nodesBetween(0, slice.content.size, node => {
+    if (node.type.isBlock) {
+      text += blockSeparater;
+    }
+
+    if (node.type.name === 'paragraph') {
+      return true;
+    } else if (node.type.name === 'hardBreak') {
+      text += '\n';
+    } else if (node.type.name === 'text') {
+      text += node.text;
+    } else if (node.type.name === 'inlineCard') {
+      text += node.attrs.url;
+    } else if (node.type.name === 'blockCard') {
+      text += node.attrs.url;
+    } else {
+      text += node.textBetween(0, node.content.size, '\n\n');
+    }
+
+    return false;
+  });
+  return text.trim();
+}

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

@@ -1,10 +1,12 @@
 // @ts-ignore: outdated type definitions
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { Slice, Fragment } from 'prosemirror-model';
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import uuid from 'uuid';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
+sendPasteAnalyticsEvent;
 import * as clipboard from '../../../utils/clipboard';
 import { transformSliceForMedia } from '../../media/utils/media-single';
 import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExcel, htmlHasInvalidLinkTags, removeDuplicateInvalidLinks } from '../util';
@@ -19,7 +21,7 @@ import { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToC
 import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent } from './analytics';
 import { analyticsPluginKey, PasteTypes } from '../../analytics';
 import { insideTable, measurements } from '../../../utils';
-import { measureRender } from '@atlaskit/editor-common';
+import { measureRender } from '@atlaskit/editor-common/utils';
 import { transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../../media/utils/media-common';
 import { transformSliceToRemoveColumnsWidths, transformSliceRemoveCellBackgroundColor } from '../../table/commands/misc';
 import { upgradeTextToLists, splitParagraphs } from '../../list/transforms';
@@ -29,6 +31,8 @@ import { transformUnsupportedBlockCardToInline } from '../../card/utils';
 import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
 import { containsAnyAnnotations, stripNonExistingAnnotations } from '../../annotation/utils';
 import { pluginKey as betterTypePluginKey } from '../../base/pm-plugins/better-type-history';
+import { clipboardTextSerializer } from './clipboard-text-serializer';
+import { htmlHasIncompleteTable, tryRebuildCompleteTableHtml, isPastedFromTinyMCEConfluence } from '../util/tinyMCE';
 export const stateKey = new PluginKey('pastePlugin');
 export { md } from '../md';
 
@@ -47,7 +51,7 @@ function isBackgroundCellAllowed(state) {
   return tableState && tableState.pluginConfig.allowBackgroundColor;
 }
 
-export function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, sanitizePrivateContent, providerFactory) {
+export function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory) {
   const atlassianMarkDownParser = new MarkdownTransformer(schema, md);
 
   function getMarkdownSlice(text, openStart, openEnd) {
@@ -85,9 +89,19 @@ export function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, saniti
     providerFactory.subscribe('extensionProvider', setExtensionAutoConverter);
   }
 
-  return new Plugin({
+  let mostRecentPasteEvent;
+  return new SafePlugin({
     key: stateKey,
     props: {
+      // For serialising to plain text
+      clipboardTextSerializer,
+      handleDOMEvents: {
+        paste: (view, event) => {
+          mostRecentPasteEvent = event;
+          return false;
+        }
+      },
+
       handlePaste(view, rawEvent, slice) {
         var _analyticsPlugin$perf, _analyticsPlugin$perf2;
 
@@ -174,8 +188,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, saniti
         };
 
         slice = handleParagraphBlockMarks(state, slice);
+        const plainTextPasteSlice = plainTextPasteLinkification === true ? linkifyContent(state.schema)(slice) : slice;
 
-        if (handlePasteAsPlainTextWithAnalytics(view, event, slice)(state, dispatch, view)) {
+        if (handlePasteAsPlainTextWithAnalytics(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
         } // transform slices based on destination
 
@@ -343,6 +358,17 @@ export function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, saniti
         if (html.indexOf('id="docs-internal-guid-') >= 0) {
           html = html.replace(/white-space:pre/g, '');
           html = html.replace(/white-space:pre-wrap/g, '');
+        } // Partial fix for ED-7331: During a copy/paste from the legacy tinyMCE
+        // confluence editor, if we encounter an incomplete table (e.g. table elements
+        // not wrapped in <table>), we try to rebuild a complete, valid table if possible.
+
+
+        if (mostRecentPasteEvent && isPastedFromTinyMCEConfluence(mostRecentPasteEvent, html) && htmlHasIncompleteTable(html)) {
+          const completeTableHtml = tryRebuildCompleteTableHtml(html);
+
+          if (completeTableHtml) {
+            html = completeTableHtml;
+          }
         }
 
         if (!isPastedFromWord(html) && !isPastedFromExcel(html) && html.indexOf('<img ') >= 0) {
@@ -356,6 +382,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, saniti
           html = removeDuplicateInvalidLinks(html);
         }
 
+        mostRecentPasteEvent = null;
         return html;
       }