@atlaskit/editor-plugin-paste 1.0.13 → 1.0.15

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.0.15
+
+### Patch Changes
+
+- [#89978](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89978) [`6e7143622425`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6e7143622425) - fix paste markdown table into a table issue
+
+## 1.0.14
+
+### Patch Changes
+
+- [#87898](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87898) [`6d4009f72e36`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6d4009f72e36) - [ux] [ED-22591] Fix pasting logic for lines with number and dot (but is not a list item) to retain formatting and correct list conversion.
+- Updated dependencies
+
 ## 1.0.13
 
 ### Patch Changes

package/dist/cjs/commands.js

@@ -4,13 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.upgradeTextToLists = exports.stopTrackingPastedMacroPositions = exports.startTrackingPastedMacroPositions = exports.splitParagraphs = exports.splitIntoParagraphs = void 0;
+exports.upgradeTextToLists = exports.stopTrackingPastedMacroPositions = exports.startTrackingPastedMacroPositions = exports.splitParagraphs = exports.splitIntoParagraphs = exports._extractListFromParagraphV2 = exports._contentSplitByHardBreaks = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("./actions");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 /**
@@ -66,6 +67,135 @@ var getListType = function getListType(node, schema) {
     return match ? [listType.node, match[0].length] : lastMatch;
   }, null);
 };
+
+// Splits array of nodes by hardBreak. E.g.:
+// [text "1. ", em "hello", date, hardbreak, text "2. ",
+//  subsup "world", hardbreak, text "smile"]
+// => [
+//      [ text "1. ", em "hello", date ],
+//      [hardbreak, text "2. ", subsup "world"],
+//      [hardbreak, text "smile"]
+//    ]
+var _contentSplitByHardBreaks = exports._contentSplitByHardBreaks = function _contentSplitByHardBreaks(content, schema) {
+  var wrapperContent = [];
+  var nextContent = [];
+  content.forEach(function (node) {
+    if (node.type === schema.nodes.hardBreak) {
+      if (nextContent.length !== 0) {
+        wrapperContent.push(nextContent);
+      }
+      nextContent = [node];
+    } else {
+      nextContent.push(node);
+    }
+  });
+  wrapperContent.push(nextContent);
+  return wrapperContent;
+};
+var _extractListFromParagraphV2 = exports._extractListFromParagraphV2 = function _extractListFromParagraphV2(node, parent, schema) {
+  var content = (0, _utils.mapChildren)(node.content, function (node) {
+    return node;
+  });
+  var linesSplitByHardbreaks = _contentSplitByHardBreaks(content, schema);
+  var splitListsAndParagraphs = [];
+  var paragraphParts = [];
+  for (var index = 0; index < linesSplitByHardbreaks.length; index = index + 1) {
+    var _firstNonHardBreakNod;
+    var line = linesSplitByHardbreaks[index];
+    var listMatch = void 0;
+    if (index === 0) {
+      var _line$;
+      if (((_line$ = line[0]) === null || _line$ === void 0 ? void 0 : _line$.type) === schema.nodes.hardbreak) {
+        paragraphParts.push(line);
+        continue;
+      } else {
+        // the first line the potential list item is at postion 0
+        listMatch = getListType(line[0], schema);
+      }
+    } else {
+      // lines after the first the potential list item is at postion 1
+      if (line.length === 1) {
+        // if the line only has a line break return as is
+        paragraphParts.push(line);
+        continue;
+      }
+      listMatch = getListType(line[1], schema);
+    }
+    if (!listMatch) {
+      // if there is not list match return as is
+      paragraphParts.push(line);
+      continue;
+    }
+    var _listMatch = listMatch,
+      _listMatch2 = (0, _slicedToArray2.default)(_listMatch, 2),
+      nodeType = _listMatch2[0],
+      length = _listMatch2[1];
+    var firstNonHardBreakNode = line.find(function (node) {
+      return node.type !== schema.nodes.hardBreak;
+    });
+    var chunksWithoutLeadingHardBreaks = line.slice(line.findIndex(function (node) {
+      return node.type !== schema.nodes.hardBreak;
+    }));
+
+    // retain text after bullet or number-dot e.g. 1. Hello
+    var startingText = firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 || (_firstNonHardBreakNod = firstNonHardBreakNode.text) === null || _firstNonHardBreakNod === void 0 ? void 0 : _firstNonHardBreakNod.substr(length);
+    var restOfChunk = startingText ? // apply transformation to first entry
+    [schema.text(startingText, firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 ? void 0 : firstNonHardBreakNode.marks)].concat((0, _toConsumableArray2.default)(chunksWithoutLeadingHardBreaks.slice(1))) : chunksWithoutLeadingHardBreaks.slice(1);
+
+    // convert to list
+    var listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, restOfChunk));
+    if (!listItemNode) {
+      paragraphParts.push(line);
+      continue;
+    }
+    var attrs = nodeType === schema.nodes.orderedList ? {
+      order: parseInt(firstNonHardBreakNode.text.split('.')[0])
+    } : undefined;
+    var newList = nodeType.createChecked(attrs, [listItemNode]);
+    if (paragraphParts.length !== 0) {
+      splitListsAndParagraphs.push(schema.nodes.paragraph.createAndFill(undefined, paragraphParts.flat()));
+      paragraphParts = [];
+    }
+    splitListsAndParagraphs.push(newList);
+  }
+  if (paragraphParts.length !== 0) {
+    splitListsAndParagraphs.push(schema.nodes.paragraph.createAndFill(undefined, paragraphParts.flat()));
+  }
+  var result = splitListsAndParagraphs.flat();
+  // try to join
+  var mockState = _state.EditorState.create({
+    schema: schema
+  });
+  var joinedListsTr;
+  var mockDispatch = function mockDispatch(tr) {
+    joinedListsTr = tr;
+  };
+
+  // Return false to prevent replaceWith from wrapping the text node in a paragraph
+  // paragraph since that will be done later. If it's done here, it will fail
+  // the paragraph.validContent check.
+  // Dont return false if there are lists, as they arent validContent for paragraphs
+  // and will result in hanging textNodes
+  (0, _commands.autoJoin)(function (state, dispatch) {
+    if (!dispatch) {
+      return false;
+    }
+    var containsList = result.some(function (node) {
+      return node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList;
+    });
+    if (result.some(function (node) {
+      return node.isText;
+    }) && !containsList) {
+      return false;
+    }
+    dispatch(state.tr.replaceWith(0, 2, result));
+    return true;
+  }, function (before, after) {
+    return (0, _utils.isListNode)(before) && (0, _utils.isListNode)(after);
+  })(mockState, mockDispatch);
+  var fragment = joinedListsTr ? joinedListsTr.doc.content : _model.Fragment.from(result);
+  return fragment;
+};
 var extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
   var _schema$nodes2 = schema.nodes,
     hardBreak = _schema$nodes2.hardBreak,
@@ -88,9 +218,9 @@ var extractListFromParagraph = function extractListFromParagraph(node, parent, s
     if (!listMatch || !child.text) {
       return child;
     }
-    var _listMatch = (0, _slicedToArray2.default)(listMatch, 2),
-      nodeType = _listMatch[0],
-      length = _listMatch[1];
+    var _listMatch3 = (0, _slicedToArray2.default)(listMatch, 2),
+      nodeType = _listMatch3[0],
+      length = _listMatch3[1];
 
     // convert to list item
     var newText = child.text.substr(length);
@@ -170,7 +300,11 @@ var extractListFromParagraph = function extractListFromParagraph(node, parent, s
 var upgradeTextToLists = exports.upgradeTextToLists = function upgradeTextToLists(slice, schema) {
   return (0, _utils.mapSlice)(slice, function (node, parent) {
     if (node.type === schema.nodes.paragraph) {
-      return extractListFromParagraph(node, parent, schema);
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.extractlistfromparagraphv2')) {
+        return _extractListFromParagraphV2(node, parent, schema);
+      } else {
+        return extractListFromParagraph(node, parent, schema);
+      }
     }
     return node;
   });

package/dist/cjs/pm-plugins/main.js

@@ -335,9 +335,16 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         if ((0, _analytics2.handleSelectedTableWithAnalytics)(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
           return true;
         }
+        var isNestedMarkdownTable = false;
+        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.paste-markdown-table-in-a-table')) {
+          // if paste a markdown table inside a table cell, we should treat it as a table slice
+          var isParentNodeTdOrTh = selectionParentType === schema.nodes.tableCell || selectionParentType === schema.nodes.tableHeader;
+          isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && (0, _analytics2.getContentNodeTypes)(markdownSlice.content).includes(schema.nodes.table.name));
+          slice = isNestedMarkdownTable ? markdownSlice : slice;
+        }
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
-        if (isPlainText && markdownSlice) {
+        if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if ((0, _analytics2.handlePastePreservingMarksWithAnalytics)(view, event, markdownSlice, _analytics.PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
@@ -362,7 +369,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         }
 
         // finally, handle rich-text copy-paste
-        if (isRichText) {
+        if (isRichText || isNestedMarkdownTable) {
           var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = (0, _utils.linkifyContent)(state.schema)(slice);

package/dist/es2019/commands.js

@@ -2,6 +2,7 @@ import { isListNode, mapChildren, mapSlice } from '@atlaskit/editor-common/utils
 import { autoJoin } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes as ActionTypes } from './actions';
 import { createCommand } from './pm-plugins/plugin-factory';
 
@@ -55,6 +56,121 @@ const getListType = (node, schema) => {
     return match ? [listType.node, match[0].length] : lastMatch;
   }, null);
 };
+
+// Splits array of nodes by hardBreak. E.g.:
+// [text "1. ", em "hello", date, hardbreak, text "2. ",
+//  subsup "world", hardbreak, text "smile"]
+// => [
+//      [ text "1. ", em "hello", date ],
+//      [hardbreak, text "2. ", subsup "world"],
+//      [hardbreak, text "smile"]
+//    ]
+export const _contentSplitByHardBreaks = (content, schema) => {
+  const wrapperContent = [];
+  let nextContent = [];
+  content.forEach(node => {
+    if (node.type === schema.nodes.hardBreak) {
+      if (nextContent.length !== 0) {
+        wrapperContent.push(nextContent);
+      }
+      nextContent = [node];
+    } else {
+      nextContent.push(node);
+    }
+  });
+  wrapperContent.push(nextContent);
+  return wrapperContent;
+};
+export const _extractListFromParagraphV2 = (node, parent, schema) => {
+  const content = mapChildren(node.content, node => node);
+  const linesSplitByHardbreaks = _contentSplitByHardBreaks(content, schema);
+  const splitListsAndParagraphs = [];
+  let paragraphParts = [];
+  for (var index = 0; index < linesSplitByHardbreaks.length; index = index + 1) {
+    var _firstNonHardBreakNod;
+    const line = linesSplitByHardbreaks[index];
+    let listMatch;
+    if (index === 0) {
+      var _line$;
+      if (((_line$ = line[0]) === null || _line$ === void 0 ? void 0 : _line$.type) === schema.nodes.hardbreak) {
+        paragraphParts.push(line);
+        continue;
+      } else {
+        // the first line the potential list item is at postion 0
+        listMatch = getListType(line[0], schema);
+      }
+    } else {
+      // lines after the first the potential list item is at postion 1
+      if (line.length === 1) {
+        // if the line only has a line break return as is
+        paragraphParts.push(line);
+        continue;
+      }
+      listMatch = getListType(line[1], schema);
+    }
+    if (!listMatch) {
+      // if there is not list match return as is
+      paragraphParts.push(line);
+      continue;
+    }
+    const [nodeType, length] = listMatch;
+    const firstNonHardBreakNode = line.find(node => node.type !== schema.nodes.hardBreak);
+    const chunksWithoutLeadingHardBreaks = line.slice(line.findIndex(node => node.type !== schema.nodes.hardBreak));
+
+    // retain text after bullet or number-dot e.g. 1. Hello
+    const startingText = firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 ? void 0 : (_firstNonHardBreakNod = firstNonHardBreakNode.text) === null || _firstNonHardBreakNod === void 0 ? void 0 : _firstNonHardBreakNod.substr(length);
+    const restOfChunk = startingText ?
+    // apply transformation to first entry
+    [schema.text(startingText, firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 ? void 0 : firstNonHardBreakNode.marks), ...chunksWithoutLeadingHardBreaks.slice(1)] : chunksWithoutLeadingHardBreaks.slice(1);
+
+    // convert to list
+    const listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, restOfChunk));
+    if (!listItemNode) {
+      paragraphParts.push(line);
+      continue;
+    }
+    const attrs = nodeType === schema.nodes.orderedList ? {
+      order: parseInt(firstNonHardBreakNode.text.split('.')[0])
+    } : undefined;
+    const newList = nodeType.createChecked(attrs, [listItemNode]);
+    if (paragraphParts.length !== 0) {
+      splitListsAndParagraphs.push(schema.nodes.paragraph.createAndFill(undefined, paragraphParts.flat()));
+      paragraphParts = [];
+    }
+    splitListsAndParagraphs.push(newList);
+  }
+  if (paragraphParts.length !== 0) {
+    splitListsAndParagraphs.push(schema.nodes.paragraph.createAndFill(undefined, paragraphParts.flat()));
+  }
+  const result = splitListsAndParagraphs.flat();
+  // try to join
+  const mockState = EditorState.create({
+    schema
+  });
+  let joinedListsTr;
+  const mockDispatch = tr => {
+    joinedListsTr = tr;
+  };
+
+  // Return false to prevent replaceWith from wrapping the text node in a paragraph
+  // paragraph since that will be done later. If it's done here, it will fail
+  // the paragraph.validContent check.
+  // Dont return false if there are lists, as they arent validContent for paragraphs
+  // and will result in hanging textNodes
+  autoJoin((state, dispatch) => {
+    if (!dispatch) {
+      return false;
+    }
+    const containsList = result.some(node => node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList);
+    if (result.some(node => node.isText) && !containsList) {
+      return false;
+    }
+    dispatch(state.tr.replaceWith(0, 2, result));
+    return true;
+  }, (before, after) => isListNode(before) && isListNode(after))(mockState, mockDispatch);
+  const fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(result);
+  return fragment;
+};
 const extractListFromParagraph = (node, parent, schema) => {
   const {
     hardBreak,
@@ -152,7 +268,11 @@ const extractListFromParagraph = (node, parent, schema) => {
 export const upgradeTextToLists = (slice, schema) => {
   return mapSlice(slice, (node, parent) => {
     if (node.type === schema.nodes.paragraph) {
-      return extractListFromParagraph(node, parent, schema);
+      if (getBooleanFF('platform.editor.extractlistfromparagraphv2')) {
+        return _extractListFromParagraphV2(node, parent, schema);
+      } else {
+        return extractListFromParagraph(node, parent, schema);
+      }
     }
     return node;
   });

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

@@ -304,9 +304,16 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (handleSelectedTableWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
           return true;
         }
+        let isNestedMarkdownTable = false;
+        if (getBooleanFF('platform.editor.paste-markdown-table-in-a-table')) {
+          // if paste a markdown table inside a table cell, we should treat it as a table slice
+          const isParentNodeTdOrTh = selectionParentType === schema.nodes.tableCell || selectionParentType === schema.nodes.tableHeader;
+          isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && getContentNodeTypes(markdownSlice.content).includes(schema.nodes.table.name));
+          slice = isNestedMarkdownTable ? markdownSlice : slice;
+        }
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
-        if (isPlainText && markdownSlice) {
+        if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
@@ -333,7 +340,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
 
         // finally, handle rich-text copy-paste
-        if (isRichText) {
+        if (isRichText || isNestedMarkdownTable) {
           var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);

package/dist/esm/commands.js

@@ -4,6 +4,7 @@ import { isListNode, mapChildren, mapSlice } from '@atlaskit/editor-common/utils
 import { autoJoin } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes as ActionTypes } from './actions';
 import { createCommand } from './pm-plugins/plugin-factory';
 
@@ -60,6 +61,135 @@ var getListType = function getListType(node, schema) {
     return match ? [listType.node, match[0].length] : lastMatch;
   }, null);
 };
+
+// Splits array of nodes by hardBreak. E.g.:
+// [text "1. ", em "hello", date, hardbreak, text "2. ",
+//  subsup "world", hardbreak, text "smile"]
+// => [
+//      [ text "1. ", em "hello", date ],
+//      [hardbreak, text "2. ", subsup "world"],
+//      [hardbreak, text "smile"]
+//    ]
+export var _contentSplitByHardBreaks = function _contentSplitByHardBreaks(content, schema) {
+  var wrapperContent = [];
+  var nextContent = [];
+  content.forEach(function (node) {
+    if (node.type === schema.nodes.hardBreak) {
+      if (nextContent.length !== 0) {
+        wrapperContent.push(nextContent);
+      }
+      nextContent = [node];
+    } else {
+      nextContent.push(node);
+    }
+  });
+  wrapperContent.push(nextContent);
+  return wrapperContent;
+};
+export var _extractListFromParagraphV2 = function _extractListFromParagraphV2(node, parent, schema) {
+  var content = mapChildren(node.content, function (node) {
+    return node;
+  });
+  var linesSplitByHardbreaks = _contentSplitByHardBreaks(content, schema);
+  var splitListsAndParagraphs = [];
+  var paragraphParts = [];
+  for (var index = 0; index < linesSplitByHardbreaks.length; index = index + 1) {
+    var _firstNonHardBreakNod;
+    var line = linesSplitByHardbreaks[index];
+    var listMatch = void 0;
+    if (index === 0) {
+      var _line$;
+      if (((_line$ = line[0]) === null || _line$ === void 0 ? void 0 : _line$.type) === schema.nodes.hardbreak) {
+        paragraphParts.push(line);
+        continue;
+      } else {
+        // the first line the potential list item is at postion 0
+        listMatch = getListType(line[0], schema);
+      }
+    } else {
+      // lines after the first the potential list item is at postion 1
+      if (line.length === 1) {
+        // if the line only has a line break return as is
+        paragraphParts.push(line);
+        continue;
+      }
+      listMatch = getListType(line[1], schema);
+    }
+    if (!listMatch) {
+      // if there is not list match return as is
+      paragraphParts.push(line);
+      continue;
+    }
+    var _listMatch = listMatch,
+      _listMatch2 = _slicedToArray(_listMatch, 2),
+      nodeType = _listMatch2[0],
+      length = _listMatch2[1];
+    var firstNonHardBreakNode = line.find(function (node) {
+      return node.type !== schema.nodes.hardBreak;
+    });
+    var chunksWithoutLeadingHardBreaks = line.slice(line.findIndex(function (node) {
+      return node.type !== schema.nodes.hardBreak;
+    }));
+
+    // retain text after bullet or number-dot e.g. 1. Hello
+    var startingText = firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 || (_firstNonHardBreakNod = firstNonHardBreakNode.text) === null || _firstNonHardBreakNod === void 0 ? void 0 : _firstNonHardBreakNod.substr(length);
+    var restOfChunk = startingText ? // apply transformation to first entry
+    [schema.text(startingText, firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 ? void 0 : firstNonHardBreakNode.marks)].concat(_toConsumableArray(chunksWithoutLeadingHardBreaks.slice(1))) : chunksWithoutLeadingHardBreaks.slice(1);
+
+    // convert to list
+    var listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, restOfChunk));
+    if (!listItemNode) {
+      paragraphParts.push(line);
+      continue;
+    }
+    var attrs = nodeType === schema.nodes.orderedList ? {
+      order: parseInt(firstNonHardBreakNode.text.split('.')[0])
+    } : undefined;
+    var newList = nodeType.createChecked(attrs, [listItemNode]);
+    if (paragraphParts.length !== 0) {
+      splitListsAndParagraphs.push(schema.nodes.paragraph.createAndFill(undefined, paragraphParts.flat()));
+      paragraphParts = [];
+    }
+    splitListsAndParagraphs.push(newList);
+  }
+  if (paragraphParts.length !== 0) {
+    splitListsAndParagraphs.push(schema.nodes.paragraph.createAndFill(undefined, paragraphParts.flat()));
+  }
+  var result = splitListsAndParagraphs.flat();
+  // try to join
+  var mockState = EditorState.create({
+    schema: schema
+  });
+  var joinedListsTr;
+  var mockDispatch = function mockDispatch(tr) {
+    joinedListsTr = tr;
+  };
+
+  // Return false to prevent replaceWith from wrapping the text node in a paragraph
+  // paragraph since that will be done later. If it's done here, it will fail
+  // the paragraph.validContent check.
+  // Dont return false if there are lists, as they arent validContent for paragraphs
+  // and will result in hanging textNodes
+  autoJoin(function (state, dispatch) {
+    if (!dispatch) {
+      return false;
+    }
+    var containsList = result.some(function (node) {
+      return node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList;
+    });
+    if (result.some(function (node) {
+      return node.isText;
+    }) && !containsList) {
+      return false;
+    }
+    dispatch(state.tr.replaceWith(0, 2, result));
+    return true;
+  }, function (before, after) {
+    return isListNode(before) && isListNode(after);
+  })(mockState, mockDispatch);
+  var fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(result);
+  return fragment;
+};
 var extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
   var _schema$nodes2 = schema.nodes,
     hardBreak = _schema$nodes2.hardBreak,
@@ -82,9 +212,9 @@ var extractListFromParagraph = function extractListFromParagraph(node, parent, s
     if (!listMatch || !child.text) {
       return child;
     }
-    var _listMatch = _slicedToArray(listMatch, 2),
-      nodeType = _listMatch[0],
-      length = _listMatch[1];
+    var _listMatch3 = _slicedToArray(listMatch, 2),
+      nodeType = _listMatch3[0],
+      length = _listMatch3[1];
 
     // convert to list item
     var newText = child.text.substr(length);
@@ -164,7 +294,11 @@ var extractListFromParagraph = function extractListFromParagraph(node, parent, s
 export var upgradeTextToLists = function upgradeTextToLists(slice, schema) {
   return mapSlice(slice, function (node, parent) {
     if (node.type === schema.nodes.paragraph) {
-      return extractListFromParagraph(node, parent, schema);
+      if (getBooleanFF('platform.editor.extractlistfromparagraphv2')) {
+        return _extractListFromParagraphV2(node, parent, schema);
+      } else {
+        return extractListFromParagraph(node, parent, schema);
+      }
     }
     return node;
   });

package/dist/esm/pm-plugins/main.js

@@ -322,9 +322,16 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (handleSelectedTableWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
           return true;
         }
+        var isNestedMarkdownTable = false;
+        if (getBooleanFF('platform.editor.paste-markdown-table-in-a-table')) {
+          // if paste a markdown table inside a table cell, we should treat it as a table slice
+          var isParentNodeTdOrTh = selectionParentType === schema.nodes.tableCell || selectionParentType === schema.nodes.tableHeader;
+          isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && getContentNodeTypes(markdownSlice.content).includes(schema.nodes.table.name));
+          slice = isNestedMarkdownTable ? markdownSlice : slice;
+        }
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
-        if (isPlainText && markdownSlice) {
+        if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
@@ -349,7 +356,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
 
         // finally, handle rich-text copy-paste
-        if (isRichText) {
+        if (isRichText || isNestedMarkdownTable) {
           var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);

package/dist/types/commands.d.ts

@@ -1,5 +1,5 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import type { Mark, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Mark, Node, Schema } from '@atlaskit/editor-prosemirror/model';
 /**
  * Use this to register macro link positions during a paste operation, that you
  * want to track in a document over time, through any document changes.
@@ -16,6 +16,8 @@ export declare const startTrackingPastedMacroPositions: (pastedMacroPositions: {
     [key: string]: number;
 }) => import("@atlaskit/editor-common/types").Command;
 export declare const stopTrackingPastedMacroPositions: (pastedMacroPositionKeys: string[]) => import("@atlaskit/editor-common/types").Command;
+export declare const _contentSplitByHardBreaks: (content: Array<Node>, schema: Schema) => Array<Node>[];
+export declare const _extractListFromParagraphV2: (node: Node, parent: Node | null, schema: Schema) => Fragment;
 export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;
 export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
 /**

package/dist/types-ts4.5/commands.d.ts

@@ -1,5 +1,5 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import type { Mark, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Mark, Node, Schema } from '@atlaskit/editor-prosemirror/model';
 /**
  * Use this to register macro link positions during a paste operation, that you
  * want to track in a document over time, through any document changes.
@@ -16,6 +16,8 @@ export declare const startTrackingPastedMacroPositions: (pastedMacroPositions: {
     [key: string]: number;
 }) => import("@atlaskit/editor-common/types").Command;
 export declare const stopTrackingPastedMacroPositions: (pastedMacroPositionKeys: string[]) => import("@atlaskit/editor-common/types").Command;
+export declare const _contentSplitByHardBreaks: (content: Array<Node>, schema: Schema) => Array<Node>[];
+export declare const _extractListFromParagraphV2: (node: Node, parent: Node | null, schema: Schema) => Fragment;
 export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;
 export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,18 +33,18 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.22.0",
+    "@atlaskit/editor-common": "^78.26.0",
     "@atlaskit/editor-markdown-transformer": "^5.4.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-annotation": "^1.5.0",
     "@atlaskit/editor-plugin-better-type-history": "^1.0.0",
-    "@atlaskit/editor-plugin-card": "^1.4.0",
+    "@atlaskit/editor-plugin-card": "^1.6.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-list": "^3.1.0",
-    "@atlaskit/editor-plugin-media": "^1.13.0",
+    "@atlaskit/editor-plugin-media": "^1.14.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-tables": "^2.6.0",
-    "@atlaskit/media-client": "^26.2.0",
+    "@atlaskit/media-client": "^26.3.0",
     "@atlaskit/media-common": "^11.1.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@babel/runtime": "^7.0.0",
@@ -135,6 +135,12 @@
     },
     "platform.editor.table.copy-paste-in-bodied-extension": {
       "type": "boolean"
+    },
+    "platform.editor.paste-markdown-table-in-a-table": {
+      "type": "boolean"
+    },
+    "platform.editor.extractlistfromparagraphv2": {
+      "type": "boolean"
     }
   }
 }