@atlaskit/editor-core 153.1.5 → 157.0.0

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

@@ -148,9 +148,18 @@ function handlePasteLinkOnSelectedText(slice) {
       var paragraph = slice.content.child(0);
 
       if (paragraph.content.childCount === 1 && (0, _utils.isText)(paragraph.content.child(0), schema)) {
-        var text = paragraph.content.child(0);
+        var 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(function (mark) {
-          return (0, _utils.isLinkMark)(mark, schema) && mark.attrs.href === text.text;
+          return (0, _utils.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
@@ -677,11 +686,14 @@ function insertIntoPanel(tr, slice, panel) {
 
 function handleRichText(slice) {
   return function (state, dispatch) {
-    var _panelParentOverCurre;
+    var _slice$content;
 
     var _state$schema$nodes2 = state.schema.nodes,
         codeBlock = _state$schema$nodes2.codeBlock,
-        panel = _state$schema$nodes2.panel; // In case user is pasting inline code,
+        heading = _state$schema$nodes2.heading,
+        paragraph = _state$schema$nodes2.paragraph;
+    var selection = state.selection;
+    var 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.
 
     var tr = state.tr;
@@ -695,20 +707,27 @@ function handleRichText(slice) {
     }
 
     (0, _prosemirrorHistory.closeHistory)(tr);
-    var panelParentOverCurrentSelection = (0, _prosemirrorUtils.findParentNodeOfType)(panel)(tr.selection);
-    var isFirstChildListNode = (0, _node.isListNode)(slice.content.firstChild);
-    var isLastChildListNode = (0, _node.isListNode)(slice.content.lastChild);
-    var isSliceContentListNodes = isFirstChildListNode || isLastChildListNode;
-    var isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
+    var isFirstChildListNode = (0, _node.isListNode)(firstChildOfSlice);
+    var isLastChildListNode = (0, _node.isListNode)(firstChildOfSlice);
+    var 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
+
+    var textNodes = [heading, paragraph];
+    var selectionParent = selection.$to.node(selection.$to.depth - 1);
+    var noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
 
-    if (isSliceContentListNodes || isTargetPanelEmpty) {
+    if (isSliceContentListNodes) {
       (0, _edgeCases.insertSliceForLists)({
         tr: tr,
         slice: 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 = (0, _prosemirrorUtils.safeInsert)(slice.content, tr.selection.$to.pos)(tr);
     }
 
     tr.setStoredMarks([]);

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

@@ -9,7 +9,8 @@ var _main = require("./pm-plugins/main");
 
 var pastePlugin = function pastePlugin(_ref) {
   var cardOptions = _ref.cardOptions,
-      sanitizePrivateContent = _ref.sanitizePrivateContent;
+      sanitizePrivateContent = _ref.sanitizePrivateContent,
+      plainTextPasteLinkification = _ref.plainTextPasteLinkification;
   return {
     name: 'paste',
     pmPlugins: function pmPlugins() {
@@ -19,7 +20,7 @@ var pastePlugin = function pastePlugin(_ref) {
           var schema = _ref2.schema,
               providerFactory = _ref2.providerFactory,
               dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
-          return (0, _main.createPlugin)(schema, dispatchAnalyticsEvent, cardOptions, sanitizePrivateContent, providerFactory);
+          return (0, _main.createPlugin)(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory);
         }
       }];
     }

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

@@ -143,7 +143,7 @@ function getActionSubjectId(view) {
   return actionSubjectId ? actionSubjectId : _analytics.ACTION_SUBJECT_ID.PASTE_PARAGRAPH;
 }
 
-function createPasteAsPlainPayload(actionSubjectId, text) {
+function createPasteAsPlainPayload(actionSubjectId, text, linksInPasteCount) {
   return {
     action: _analytics.ACTION.PASTED_AS_PLAIN,
     actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -151,7 +151,8 @@ function createPasteAsPlainPayload(actionSubjectId, text) {
     eventType: _analytics.EVENT_TYPE.TRACK,
     attributes: {
       inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
-      pasteSize: text.length
+      pasteSize: text.length,
+      linksInPasteCount: linksInPasteCount
     }
   };
 }
@@ -175,23 +176,6 @@ function createPastePayload(actionSubjectId, attributes, linkDomain) {
 function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
   var text = event.clipboardData ? event.clipboardData.getData('text/plain') || event.clipboardData.getData('text/uri-list') : '';
   var actionSubjectId = getActionSubjectId(view);
-
-  if (pasteContext.asPlain) {
-    return createPasteAsPlainPayload(actionSubjectId, text);
-  }
-
-  var source = (0, _util.getPasteSource)(event);
-
-  if (pasteContext.type === _analytics.PasteTypes.plain) {
-    return createPastePayload(actionSubjectId, {
-      pasteSize: text.length,
-      type: pasteContext.type,
-      content: _analytics.PasteContents.text,
-      source: source,
-      hyperlinkPasteOnText: false
-    });
-  }
-
   var pasteSize = slice.size;
   var content = getContent(view.state, slice);
   var linkUrls = []; // If we have a link among the pasted content, grab the
@@ -211,13 +195,31 @@ function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
     });
   }
 
+  if (pasteContext.asPlain) {
+    return createPasteAsPlainPayload(actionSubjectId, text, linkUrls.length);
+  }
+
+  var source = (0, _util.getPasteSource)(event);
+
+  if (pasteContext.type === _analytics.PasteTypes.plain) {
+    return createPastePayload(actionSubjectId, {
+      pasteSize: text.length,
+      type: pasteContext.type,
+      content: _analytics.PasteContents.text,
+      source: source,
+      hyperlinkPasteOnText: false,
+      linksInPasteCount: linkUrls.length
+    });
+  }
+
   var linkDomains = linkUrls.map(_utils2.getLinkDomain);
   return createPastePayload(actionSubjectId, {
     type: pasteContext.type,
     pasteSize: pasteSize,
     content: content,
     source: 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/cjs/plugins/paste/pm-plugins/clipboard-text-serializer.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clipboardTextSerializer = clipboardTextSerializer;
+
+/**
+ * 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)
+ */
+function clipboardTextSerializer(slice) {
+  var text = '';
+  var blockSeparater = '\n\n';
+  slice.content.nodesBetween(0, slice.content.size, function (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/cjs/plugins/paste/pm-plugins/main.js

@@ -24,6 +24,8 @@ var _utils = require("@atlaskit/editor-tables/utils");
 
 var _prosemirrorModel = require("prosemirror-model");
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _uuid = _interopRequireDefault(require("uuid"));
@@ -80,11 +82,16 @@ var _utils11 = require("../../annotation/utils");
 
 var _betterTypeHistory = require("../../base/pm-plugins/better-type-history");
 
+var _clipboardTextSerializer = require("./clipboard-text-serializer");
+
+var _tinyMCE = require("../util/tinyMCE");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 // @ts-ignore: outdated type definitions
+_analytics.sendPasteAnalyticsEvent;
 var stateKey = new _prosemirrorState.PluginKey('pastePlugin');
 exports.stateKey = stateKey;
 
@@ -103,7 +110,7 @@ function isBackgroundCellAllowed(state) {
   return tableState && tableState.pluginConfig.allowBackgroundColor;
 }
 
-function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, sanitizePrivateContent, providerFactory) {
+function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory) {
   var atlassianMarkDownParser = new _editorMarkdownTransformer.MarkdownTransformer(schema, _md.md);
 
   function getMarkdownSlice(text, openStart, openEnd) {
@@ -171,9 +178,18 @@ function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, sanitizePriva
     providerFactory.subscribe('extensionProvider', setExtensionAutoConverter);
   }
 
-  return new _prosemirrorState.Plugin({
+  var mostRecentPasteEvent;
+  return new _safePlugin.SafePlugin({
     key: stateKey,
     props: {
+      // For serialising to plain text
+      clipboardTextSerializer: _clipboardTextSerializer.clipboardTextSerializer,
+      handleDOMEvents: {
+        paste: function paste(view, event) {
+          mostRecentPasteEvent = event;
+          return false;
+        }
+      },
       handlePaste: function handlePaste(view, rawEvent, slice) {
         var _analyticsPlugin$perf, _analyticsPlugin$perf2;
 
@@ -258,8 +274,9 @@ function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, sanitizePriva
         };
 
         slice = (0, _handlers.handleParagraphBlockMarks)(state, slice);
+        var plainTextPasteSlice = plainTextPasteLinkification === true ? (0, _utils2.linkifyContent)(state.schema)(slice) : slice;
 
-        if ((0, _analytics.handlePasteAsPlainTextWithAnalytics)(view, event, slice)(state, dispatch, view)) {
+        if ((0, _analytics.handlePasteAsPlainTextWithAnalytics)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
         } // transform slices based on destination
 
@@ -425,6 +442,17 @@ function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, sanitizePriva
         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 && (0, _tinyMCE.isPastedFromTinyMCEConfluence)(mostRecentPasteEvent, html) && (0, _tinyMCE.htmlHasIncompleteTable)(html)) {
+          var completeTableHtml = (0, _tinyMCE.tryRebuildCompleteTableHtml)(html);
+
+          if (completeTableHtml) {
+            html = completeTableHtml;
+          }
         }
 
         if (!(0, _util.isPastedFromWord)(html) && !(0, _util.isPastedFromExcel)(html) && html.indexOf('<img ') >= 0) {
@@ -438,6 +466,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, cardOptions, sanitizePriva
           html = (0, _util.removeDuplicateInvalidLinks)(html);
         }
 
+        mostRecentPasteEvent = null;
         return html;
       }
     }

package/dist/cjs/plugins/paste/util/tinyMCE.js

@@ -0,0 +1,218 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapWithTable = exports.tryReconstructTableRows = exports.tryRebuildCompleteTableHtml = exports.isPastedFromTinyMCEConfluence = exports.htmlHasIncompleteTable = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _chunk = _interopRequireDefault(require("lodash/chunk"));
+
+var isPastedFromTinyMCE = function isPastedFromTinyMCE(pasteEvent) {
+  var _pasteEvent$clipboard, _pasteEvent$clipboard2, _pasteEvent$clipboard3;
+
+  return (_pasteEvent$clipboard = pasteEvent === null || pasteEvent === void 0 ? void 0 : (_pasteEvent$clipboard2 = pasteEvent.clipboardData) === null || _pasteEvent$clipboard2 === void 0 ? void 0 : (_pasteEvent$clipboard3 = _pasteEvent$clipboard2.types) === null || _pasteEvent$clipboard3 === void 0 ? void 0 : _pasteEvent$clipboard3.some(function (mimeType) {
+    return mimeType === 'x-tinymce/html';
+  })) !== null && _pasteEvent$clipboard !== void 0 ? _pasteEvent$clipboard : false;
+};
+
+var isPastedFromTinyMCEConfluence = function isPastedFromTinyMCEConfluence(pasteEvent, html) {
+  return isPastedFromTinyMCE(pasteEvent) && !!html && !!html.match(/class=\"\s?(confluenceTd|confluenceTh|confluenceTable).+"/gim);
+};
+/**
+ * Wraps html markup with a `<table>` and uses `DOMParser` to generate
+ * and return both the table-wrapped and non-table-wrapped DOM document
+ * instances.
+ */
+
+
+exports.isPastedFromTinyMCEConfluence = isPastedFromTinyMCEConfluence;
+
+var wrapWithTable = function wrapWithTable(html) {
+  var parser = new DOMParser();
+  var nonTableWrappedDoc = parser.parseFromString(html, 'text/html');
+  var tableWrappedDoc = parser.parseFromString("<table>".concat(html, "</table>"), 'text/html');
+  tableWrappedDoc.body.querySelectorAll('meta').forEach(function (meta) {
+    tableWrappedDoc.head.prepend(meta);
+  });
+  return {
+    tableWrappedDoc: tableWrappedDoc,
+    nonTableWrappedDoc: nonTableWrappedDoc
+  };
+};
+
+exports.wrapWithTable = wrapWithTable;
+
+var exactlyDivisible = function exactlyDivisible(larger, smaller) {
+  return larger % smaller === 0;
+};
+
+var getTableElementsInfo = function getTableElementsInfo(doc) {
+  var cellCount = doc.querySelectorAll('td').length;
+  var thCount = doc.querySelectorAll('th').length;
+  var mergedCellCount = doc.querySelectorAll('td[colspan]:not([colspan="1"])').length;
+  var hasThAfterTd = false;
+  var thsAndCells = doc.querySelectorAll('th,td');
+
+  for (var i = 0, cellFound = false; i < thsAndCells.length; i++) {
+    if (cellFound && thsAndCells[i].nodeName === 'TH') {
+      hasThAfterTd = true;
+      break;
+    }
+
+    if (thsAndCells[i].nodeName === 'TD') {
+      cellFound = true;
+    }
+  }
+
+  var onlyTh = thCount > 0 && cellCount === 0;
+  var onlyCells = cellCount > 0 && thCount === 0;
+  var hasCompleteRow = // we take header-only and cell-only tables to be
+  // row-complete
+  onlyTh || onlyCells || // if headers and cells can "fit" against each other,
+  // then we assume a complete row exists
+  (exactlyDivisible(thCount, cellCount) || exactlyDivisible(cellCount, thCount)) && // all numbers are divisible by 1, so we carve out a specific
+  // check for when there is only 1 table cell, and more than 1
+  // table header.
+  !(thCount > 1 && cellCount === 1);
+  return {
+    cellCount: cellCount,
+    thCount: thCount,
+    mergedCellCount: mergedCellCount,
+    hasThAfterTd: hasThAfterTd,
+    hasIncompleteRow: !hasCompleteRow
+  };
+};
+
+var configureTableRows = function configureTableRows(doc, colsInRow) {
+  var _Array$from;
+
+  var tableHeadersAndCells = Array.from(doc.body.querySelectorAll('th,td'));
+  var evenlySplitChunks = (0, _chunk.default)(tableHeadersAndCells, colsInRow);
+  var tableBody = doc.body.querySelector('tbody');
+  evenlySplitChunks.forEach(function (chunk) {
+    var tr = doc.createElement('tr');
+    tableBody === null || tableBody === void 0 ? void 0 : tableBody.append(tr);
+    tr.append.apply(tr, (0, _toConsumableArray2.default)(chunk));
+  }); // We remove any leftover empty rows which may cause fabric editor
+  // to no-op when parsing the table
+
+  var emptyRows = (_Array$from = Array.from(tableBody.querySelectorAll('tr'))) === null || _Array$from === void 0 ? void 0 : _Array$from.filter(function (row) {
+    return row.innerHTML.trim().length === 0;
+  });
+  emptyRows.forEach(function (row) {
+    return row.remove();
+  });
+  return doc.body.innerHTML;
+};
+
+var fillIncompleteRowWithEmptyCells = function fillIncompleteRowWithEmptyCells(doc, thCount, cellCount) {
+  var _lastCell$parentEleme;
+
+  var extraCellsCount = 0;
+
+  while (!exactlyDivisible(cellCount + extraCellsCount, thCount)) {
+    extraCellsCount++;
+  }
+
+  var extraEmptyCells = Array.from(Array(extraCellsCount)).map(function () {
+    return doc.createElement('td');
+  });
+  var lastCell = doc.body.querySelector('td:last-of-type');
+  lastCell === null || lastCell === void 0 ? void 0 : (_lastCell$parentEleme = lastCell.parentElement) === null || _lastCell$parentEleme === void 0 ? void 0 : _lastCell$parentEleme.append.apply(_lastCell$parentEleme, (0, _toConsumableArray2.default)(extraEmptyCells));
+  return {
+    updatedCellCount: cellCount + extraCellsCount
+  };
+};
+/**
+ * Given a DOM document, it will try to rebuild table rows by using the
+ * table headers count as an initial starting point for the assumed
+ * number of columns that make up a row (`colsInRow`). It will slowly
+ * decrease that `colsInRow` count until it finds exact fit for table
+ * headers and cells with `colsInRow` else it returns the original
+ * document's markup.
+ *
+ * NOTE: It will NOT try to rebuild table rows if it encounters merged cells
+ * or compex table configurations (where table headers exist after normal
+ * table cells). It will build a single column table if NO table
+ * headers exist.
+ */
+
+
+var tryReconstructTableRows = function tryReconstructTableRows(doc) {
+  var _getTableElementsInfo = getTableElementsInfo(doc),
+      cellCount = _getTableElementsInfo.cellCount,
+      thCount = _getTableElementsInfo.thCount,
+      mergedCellCount = _getTableElementsInfo.mergedCellCount,
+      hasThAfterTd = _getTableElementsInfo.hasThAfterTd,
+      hasIncompleteRow = _getTableElementsInfo.hasIncompleteRow;
+
+  if (mergedCellCount || hasThAfterTd) {
+    // bail out to avoid handling more complex table structures
+    return doc.body.innerHTML;
+  }
+
+  if (!thCount) {
+    // if no table headers exist for reference, fallback to a single column table structure
+    return configureTableRows(doc, 1);
+  }
+
+  if (hasIncompleteRow) {
+    // if shift-click selection copies a partial table row to the clipboard,
+    // and we do have table headers for reference, then we add empty table cells
+    // to fill out the partial row
+    var _fillIncompleteRowWit = fillIncompleteRowWithEmptyCells(doc, thCount, cellCount),
+        updatedCellCount = _fillIncompleteRowWit.updatedCellCount;
+
+    cellCount = updatedCellCount;
+  }
+
+  for (var possibleColsInRow = thCount; possibleColsInRow > 0; possibleColsInRow--) {
+    if (exactlyDivisible(thCount, possibleColsInRow) && exactlyDivisible(cellCount, possibleColsInRow)) {
+      return configureTableRows(doc, possibleColsInRow);
+    }
+  }
+
+  return doc.body.innerHTML;
+};
+
+exports.tryReconstructTableRows = tryReconstructTableRows;
+
+var htmlHasIncompleteTable = function htmlHasIncompleteTable(html) {
+  return !html.includes('<table ') && (html.includes('<td ') || html.includes('<th '));
+};
+/**
+ * Strictly for ED-7331. Given incomplete table html from tinyMCE, it will try to rebuild
+ * a whole valid table. If it rebuilds the table, it may first rebuild it as a single
+ * row table, so this also then tries to reconstruct the table rows/columns if
+ * possible (best effort).
+ */
+
+
+exports.htmlHasIncompleteTable = htmlHasIncompleteTable;
+
+var tryRebuildCompleteTableHtml = function tryRebuildCompleteTableHtml(incompleteTableHtml) {
+  // first we try wrapping the table elements with <table> and let DOMParser try to rebuild
+  // a valid DOM tree. we also keep the non-wrapped table for comparison purposes.
+  var _wrapWithTable = wrapWithTable(incompleteTableHtml),
+      nonTableWrappedDoc = _wrapWithTable.nonTableWrappedDoc,
+      tableWrappedDoc = _wrapWithTable.tableWrappedDoc;
+
+  var didPreserveTableElements = Boolean(!nonTableWrappedDoc.body.querySelector('th, td') && tableWrappedDoc.body.querySelector('th, td'));
+  var isExpectedStructure = tableWrappedDoc.querySelectorAll('body > table:only-child') && !tableWrappedDoc.querySelector("body > table > tbody > tr > :not(th,td)"); // if DOMParser saves table elements that we would otherwise lose, and
+  // if the table html is what we'd expect (a single table, with no extraneous
+  // elements in table rows other than th, td), then we can now also try to
+  // rebuild table rows/columns.
+
+  if (didPreserveTableElements && isExpectedStructure) {
+    var completeTableHtml = tryReconstructTableRows(tableWrappedDoc);
+    return completeTableHtml;
+  }
+
+  return null;
+};
+
+exports.tryRebuildCompleteTableHtml = tryRebuildCompleteTableHtml;

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

@@ -7,6 +7,8 @@ exports.createPlaceholderDecoration = createPlaceholderDecoration;
 exports.createPlugin = createPlugin;
 exports.pluginKey = exports.default = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorView = require("prosemirror-view");
@@ -111,7 +113,7 @@ function createPlugin(defaultPlaceholderText, placeholderHints, bracketPlacehold
   }
 
   var getPlaceholderHintMessage = createGetPlaceholderHintMessage(placeholderHints);
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: pluginKey,
     state: {
       init: function init(_, state) {

package/dist/cjs/plugins/placeholder-text/index.js

@@ -10,6 +10,8 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -36,7 +38,7 @@ var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 
 function createPlugin(dispatch, options) {
   var allowInserting = !!options.allowInserting;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey,
     state: {
       init: function init() {

package/dist/cjs/plugins/quick-insert/index.js

@@ -21,7 +21,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = _interopRequireDefault(require("react"));
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 
@@ -142,7 +142,7 @@ var setProviderState = function setProviderState(providerState) {
 };
 
 function quickInsertPluginFactory(quickInsertItems, providerFactory, getIntl, dispatch, emptyStateHandler) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey,
     state: {
       init: function init() {

package/dist/cjs/plugins/rank.js

@@ -17,7 +17,7 @@ var _default = {
   marks: [// Fragment mark is both for inline and block elements
   'fragment', // Inline marks
   'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'typeAheadQuery', // Block marks
-  'alignment', 'breakout', 'indentation', 'annotation', //Unsupported mark
+  'alignment', 'breakout', 'indentation', 'annotation', 'dataConsumer', // Unsupported mark
   'unsupportedMark', 'unsupportedNodeAttribute']
 };
 exports.default = _default;

package/dist/cjs/plugins/scroll-into-view/index.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.scrollIntoViewPluginKey = exports.default = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
@@ -22,7 +24,7 @@ var scrollIntoViewPluginKey = new _prosemirrorState.PluginKey('scrollIntoViewPlu
 exports.scrollIntoViewPluginKey = scrollIntoViewPluginKey;
 
 var createPlugin = function createPlugin() {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: scrollIntoViewPluginKey,
     appendTransaction: function appendTransaction(transactions, oldState, newState) {
       if (!transactions.length) {

package/dist/cjs/plugins/selection/pm-plugins/gap-cursor-main.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorView = require("prosemirror-view");
@@ -27,7 +29,7 @@ var _direction = require("../gap-cursor/direction");
 
 var _gapCursorPluginKey = require("./gap-cursor-plugin-key");
 
-var plugin = new _prosemirrorState.Plugin({
+var plugin = new _safePlugin.SafePlugin({
   key: _gapCursorPluginKey.gapCursorPluginKey,
   state: {
     init: function init() {

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getInitialState = exports.createPlugin = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _utils = require("@atlaskit/editor-common/utils");
@@ -50,7 +52,7 @@ var toggleContentEditable = function toggleContentEditable(node) {
 
 var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: _types.selectionPluginKey,
     state: (0, _pluginFactory.createPluginState)(dispatch, getInitialState),
     view: function view() {