@atlaskit/editor-core 166.0.2 → 166.0.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 166.0.3
+
+### Patch Changes
+
+- [`56238fdc70e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/56238fdc70e) - ED-14998 Fix paste issue in a table inside a bodied extension. Copying and pasting inline nodes inside the table should not create a new table during paste
+
 ## 166.0.2
 
 ### Patch Changes

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

@@ -700,7 +700,7 @@ function insertIntoPanel(tr, slice, panel) {
 
 function handleRichText(slice) {
   return function (state, dispatch) {
-    var _slice$content, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _panelParentOverCurre;
 
     var _state$schema$nodes2 = state.schema.nodes,
         codeBlock = _state$schema$nodes2.codeBlock,
@@ -708,7 +708,8 @@ function handleRichText(slice) {
         paragraph = _state$schema$nodes2.paragraph,
         panel = _state$schema$nodes2.panel;
     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,
+    var firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;
+    var lastChildOfSlice = (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.lastChild; // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
 
     var tr = state.tr;
@@ -723,7 +724,7 @@ function handleRichText(slice) {
 
     (0, _prosemirrorHistory.closeHistory)(tr);
     var isFirstChildListNode = (0, _node.isListNode)(firstChildOfSlice);
-    var isLastChildListNode = (0, _node.isListNode)(firstChildOfSlice);
+    var isLastChildListNode = (0, _node.isListNode)(lastChildOfSlice);
     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
@@ -742,9 +743,23 @@ function handleRichText(slice) {
     } else if (noNeedForSafeInsert) {
       tr.replaceSelection(slice);
     } else {
-      // 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);
+      // need to scan the slice if there's a block node inside it
+      var doesBlockNodeExist = false;
+      slice.content.nodesBetween(0, slice.content.size, function (node, start) {
+        if (start >= slice.openStart && start <= slice.content.size - slice.openEnd && node.isBlock) {
+          doesBlockNodeExist = true;
+          return false;
+        }
+      });
+
+      if ((0, _utils.insideTableCell)(state) && !doesBlockNodeExist) {
+        // bring back the old code for inline nodes
+        insertIntoPanel(tr, slice, panel);
+      } else {
+        // 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/version-wrapper.js

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

package/dist/cjs/version.json

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

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

@@ -2,7 +2,7 @@ import { closeHistory } from 'prosemirror-history';
 import { Fragment, Node as PMNode, Slice } from 'prosemirror-model';
 import { TextSelection, NodeSelection } from 'prosemirror-state';
 import { findParentNodeOfType, hasParentNodeOfType, safeInsert } from 'prosemirror-utils';
-import { compose, insideTable, isParagraph, isText, isLinkMark, processRawValue } from '../../utils';
+import { compose, insideTable, isParagraph, isText, isLinkMark, processRawValue, insideTableCell } from '../../utils';
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
 import { insertCard, queueCardsFromChangedTr } from '../card/pm-plugins/doc';
@@ -610,7 +610,7 @@ export function insertIntoPanel(tr, slice, panel) {
 }
 export function handleRichText(slice) {
   return (state, dispatch) => {
-    var _slice$content, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _panelParentOverCurre;
 
     const {
       codeBlock,
@@ -621,7 +621,8 @@ export function handleRichText(slice) {
     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,
+    const firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;
+    const lastChildOfSlice = (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.lastChild; // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
 
     let tr = state.tr;
@@ -636,7 +637,7 @@ export function handleRichText(slice) {
 
     closeHistory(tr);
     const isFirstChildListNode = isListNode(firstChildOfSlice);
-    const isLastChildListNode = isListNode(firstChildOfSlice);
+    const isLastChildListNode = isListNode(lastChildOfSlice);
     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
@@ -655,9 +656,23 @@ export function handleRichText(slice) {
     } else if (noNeedForSafeInsert) {
       tr.replaceSelection(slice);
     } else {
-      // 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);
+      // need to scan the slice if there's a block node inside it
+      let doesBlockNodeExist = false;
+      slice.content.nodesBetween(0, slice.content.size, (node, start) => {
+        if (start >= slice.openStart && start <= slice.content.size - slice.openEnd && node.isBlock) {
+          doesBlockNodeExist = true;
+          return false;
+        }
+      });
+
+      if (insideTableCell(state) && !doesBlockNodeExist) {
+        // bring back the old code for inline nodes
+        insertIntoPanel(tr, slice, panel);
+      } else {
+        // 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/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "166.0.2";
+export const version = "166.0.3";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

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

@@ -16,7 +16,7 @@ import { closeHistory } from 'prosemirror-history';
 import { Fragment, Node as PMNode, Slice } from 'prosemirror-model';
 import { TextSelection, NodeSelection } from 'prosemirror-state';
 import { findParentNodeOfType, hasParentNodeOfType, safeInsert } from 'prosemirror-utils';
-import { compose, insideTable, isParagraph, isText, isLinkMark, processRawValue } from '../../utils';
+import { compose, insideTable, isParagraph, isText, isLinkMark, processRawValue, insideTableCell } from '../../utils';
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
 import { insertCard, queueCardsFromChangedTr } from '../card/pm-plugins/doc';
@@ -644,7 +644,7 @@ export function insertIntoPanel(tr, slice, panel) {
 }
 export function handleRichText(slice) {
   return function (state, dispatch) {
-    var _slice$content, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _panelParentOverCurre;
 
     var _state$schema$nodes2 = state.schema.nodes,
         codeBlock = _state$schema$nodes2.codeBlock,
@@ -652,7 +652,8 @@ export function handleRichText(slice) {
         paragraph = _state$schema$nodes2.paragraph,
         panel = _state$schema$nodes2.panel;
     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,
+    var firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;
+    var lastChildOfSlice = (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.lastChild; // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
 
     var tr = state.tr;
@@ -667,7 +668,7 @@ export function handleRichText(slice) {
 
     closeHistory(tr);
     var isFirstChildListNode = isListNode(firstChildOfSlice);
-    var isLastChildListNode = isListNode(firstChildOfSlice);
+    var isLastChildListNode = isListNode(lastChildOfSlice);
     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
@@ -686,9 +687,23 @@ export function handleRichText(slice) {
     } else if (noNeedForSafeInsert) {
       tr.replaceSelection(slice);
     } else {
-      // 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);
+      // need to scan the slice if there's a block node inside it
+      var doesBlockNodeExist = false;
+      slice.content.nodesBetween(0, slice.content.size, function (node, start) {
+        if (start >= slice.openStart && start <= slice.content.size - slice.openEnd && node.isBlock) {
+          doesBlockNodeExist = true;
+          return false;
+        }
+      });
+
+      if (insideTableCell(state) && !doesBlockNodeExist) {
+        // bring back the old code for inline nodes
+        insertIntoPanel(tr, slice, panel);
+      } else {
+        // 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/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "166.0.2";
+export var version = "166.0.3";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "166.0.2",
+  "version": "166.0.3",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -69,7 +69,7 @@
     "@atlaskit/radio": "^5.3.0",
     "@atlaskit/section-message": "^6.1.0",
     "@atlaskit/select": "^15.2.0",
-    "@atlaskit/smart-user-picker": "^5.0.2",
+    "@atlaskit/smart-user-picker": "^5.1.0",
     "@atlaskit/spinner": "^15.1.0",
     "@atlaskit/status": "^1.1.0",
     "@atlaskit/tabs": "^13.2.0",
@@ -159,7 +159,7 @@
     "@atlaskit/section-message": "^6.1.0",
     "@atlaskit/share": "*",
     "@atlaskit/smart-card": "^19.1.0",
-    "@atlaskit/smart-user-picker": "^5.0.2",
+    "@atlaskit/smart-user-picker": "^5.1.0",
     "@atlaskit/synchrony-test-helpers": "^2.3.0",
     "@atlaskit/textarea": "^4.3.0",
     "@atlaskit/toggle": "^12.4.0",