@atlaskit/editor-core 189.5.0 → 189.5.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 189.5.1
+
+### Patch Changes
+
+- [#58597](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58597) [`205975214b9c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/205975214b9c) - ED-20961: Handle copy paste - list with blockquote
+
 ## 189.5.0
 
 ### Minor Changes

package/dist/cjs/plugins/paste/edge-cases/index.js

@@ -4,9 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertSliceForLists = insertSliceForLists;
+exports.insertSliceForListsInsideBlockquote = insertSliceForListsInsideBlockquote;
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _lists = require("./lists");
 var _utils2 = require("@atlaskit/editor-common/utils");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _util = require("../util");
 function insertSliceForLists(_ref) {
   var _slice$content$firstC;
@@ -59,4 +62,27 @@ function insertSliceForLists(_ref) {
     });
   }
   tr.replaceSelection(slice);
+}
+function insertSliceForListsInsideBlockquote(_ref3) {
+  var tr = _ref3.tr,
+    slice = _ref3.slice;
+  (0, _utils.safeInsert)(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  // ProseMirror doesn't give a proper way to tell us where something was inserted.
+  // However, we can know "how" it inserted something.
+  //
+  // So, instead of weird depth calculations, we can use the step produced by the transform.
+  // For instance:
+  //    The `replaceStep.to and replaceStep.from`, tell us the real position
+  //    where the content will be insert.
+  //    Then, we can use the `tr.mapping.map` to the updated position after the replace operation
+  var replaceStep = tr.steps[0];
+  if (!(replaceStep instanceof _transform.ReplaceStep)) {
+    return tr;
+  }
+  var nextPosition = tr.mapping.map(replaceStep.to);
+  // The findFrom will make search for both: TextSelection and NodeSelections.
+  var nextSelection = _state.Selection.findFrom(tr.doc.resolve(Math.min(nextPosition, tr.doc.content.size)), -1);
+  if (nextSelection) {
+    tr.setSelection(nextSelection);
+  }
 }

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

@@ -861,15 +861,24 @@ function handleRichText(slice, queueCardsFromChangedTr) {
         schema: schema
       });
     } else if (noNeedForSafeInsert) {
-      var _slice$content$lastCh;
-      tr.replaceSelection(slice);
-      // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
-      // need to make sure the cursor position is is right after the panel, expand, or decisionList
-      // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
-      var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
-      if ((0, _utils3.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
-        var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
-        tr.setSelection(new _selection.GapCursorSelection(nextPos, _selection.Side.RIGHT));
+      var _firstChildOfSlice$ty2, _firstChildOfSlice$co;
+      if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && (firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co === void 0 ? void 0 : _firstChildOfSlice$co.type.name) === ('bulletList' || 'orderedList')) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
+        (0, _edgeCases.insertSliceForListsInsideBlockquote)({
+          tr: tr,
+          slice: slice
+        });
+      } else {
+        var _slice$content$lastCh;
+        tr.replaceSelection(slice);
+        // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
+        // need to make sure the cursor position is is right after the panel, expand, or decisionList
+        // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
+        var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
+        if ((0, _utils3.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
+          var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
+          tr.setSelection(new _selection.GapCursorSelection(nextPos, _selection.Side.RIGHT));
+        }
       }
     } else {
       // need to scan the slice if there's a block node or list items inside it

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.5.0";
+var version = exports.version = "189.5.1";

package/dist/es2019/plugins/paste/edge-cases/index.js

@@ -1,6 +1,8 @@
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { insertSliceIntoRangeSelectionInsideList, insertSliceInsideOfPanelNodeSelected, insertSliceAtNodeEdge, insertSliceIntoEmptyNode } from './lists';
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { isSelectionInsidePanel, isEmptyNode, isCursorSelectionAtTextStartOrEnd } from '../util';
 export function insertSliceForLists({
   tr,
@@ -58,4 +60,28 @@ export function insertSliceForLists({
     });
   }
   tr.replaceSelection(slice);
+}
+export function insertSliceForListsInsideBlockquote({
+  tr,
+  slice
+}) {
+  safeInsert(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  // ProseMirror doesn't give a proper way to tell us where something was inserted.
+  // However, we can know "how" it inserted something.
+  //
+  // So, instead of weird depth calculations, we can use the step produced by the transform.
+  // For instance:
+  //    The `replaceStep.to and replaceStep.from`, tell us the real position
+  //    where the content will be insert.
+  //    Then, we can use the `tr.mapping.map` to the updated position after the replace operation
+  const replaceStep = tr.steps[0];
+  if (!(replaceStep instanceof ReplaceStep)) {
+    return tr;
+  }
+  const nextPosition = tr.mapping.map(replaceStep.to);
+  // The findFrom will make search for both: TextSelection and NodeSelections.
+  const nextSelection = Selection.findFrom(tr.doc.resolve(Math.min(nextPosition, tr.doc.content.size)), -1);
+  if (nextSelection) {
+    tr.setSelection(nextSelection);
+  }
 }

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

@@ -11,7 +11,7 @@ import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 // TODO: ED-20519 Needs Macro extraction
 
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
-import { insertSliceForLists } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
@@ -843,15 +843,24 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         schema
       });
     } else if (noNeedForSafeInsert) {
-      var _slice$content$lastCh, _slice$content$lastCh2;
-      tr.replaceSelection(slice);
-      // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
-      // need to make sure the cursor position is is right after the panel, expand, or decisionList
-      // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
-      const shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : (_slice$content$lastCh2 = _slice$content$lastCh.type) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.name) || '');
-      if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
-        const nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
-        tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+      var _firstChildOfSlice$ty2, _firstChildOfSlice$co;
+      if ((firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && (firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co === void 0 ? void 0 : _firstChildOfSlice$co.type.name) === ('bulletList' || 'orderedList')) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
+        insertSliceForListsInsideBlockquote({
+          tr,
+          slice
+        });
+      } else {
+        var _slice$content$lastCh, _slice$content$lastCh2;
+        tr.replaceSelection(slice);
+        // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
+        // need to make sure the cursor position is is right after the panel, expand, or decisionList
+        // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
+        const shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : (_slice$content$lastCh2 = _slice$content$lastCh.type) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.name) || '');
+        if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
+          const nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
+          tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+        }
       }
     } else {
       // need to scan the slice if there's a block node or list items inside it

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.5.0";
+export const version = "189.5.1";

package/dist/esm/plugins/paste/edge-cases/index.js

@@ -1,6 +1,8 @@
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { insertSliceIntoRangeSelectionInsideList, insertSliceInsideOfPanelNodeSelected, insertSliceAtNodeEdge, insertSliceIntoEmptyNode } from './lists';
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { isSelectionInsidePanel, isEmptyNode, isCursorSelectionAtTextStartOrEnd } from '../util';
 export function insertSliceForLists(_ref) {
   var _slice$content$firstC;
@@ -53,4 +55,27 @@ export function insertSliceForLists(_ref) {
     });
   }
   tr.replaceSelection(slice);
+}
+export function insertSliceForListsInsideBlockquote(_ref3) {
+  var tr = _ref3.tr,
+    slice = _ref3.slice;
+  safeInsert(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  // ProseMirror doesn't give a proper way to tell us where something was inserted.
+  // However, we can know "how" it inserted something.
+  //
+  // So, instead of weird depth calculations, we can use the step produced by the transform.
+  // For instance:
+  //    The `replaceStep.to and replaceStep.from`, tell us the real position
+  //    where the content will be insert.
+  //    Then, we can use the `tr.mapping.map` to the updated position after the replace operation
+  var replaceStep = tr.steps[0];
+  if (!(replaceStep instanceof ReplaceStep)) {
+    return tr;
+  }
+  var nextPosition = tr.mapping.map(replaceStep.to);
+  // The findFrom will make search for both: TextSelection and NodeSelections.
+  var nextSelection = Selection.findFrom(tr.doc.resolve(Math.min(nextPosition, tr.doc.content.size)), -1);
+  if (nextSelection) {
+    tr.setSelection(nextSelection);
+  }
 }

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

@@ -19,7 +19,7 @@ import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 // TODO: ED-20519 Needs Macro extraction
 
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
-import { insertSliceForLists } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
@@ -840,15 +840,24 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         schema: schema
       });
     } else if (noNeedForSafeInsert) {
-      var _slice$content$lastCh;
-      tr.replaceSelection(slice);
-      // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
-      // need to make sure the cursor position is is right after the panel, expand, or decisionList
-      // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
-      var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
-      if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
-        var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
-        tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+      var _firstChildOfSlice$ty2, _firstChildOfSlice$co;
+      if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && (firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co === void 0 ? void 0 : _firstChildOfSlice$co.type.name) === ('bulletList' || 'orderedList')) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
+        insertSliceForListsInsideBlockquote({
+          tr: tr,
+          slice: slice
+        });
+      } else {
+        var _slice$content$lastCh;
+        tr.replaceSelection(slice);
+        // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
+        // need to make sure the cursor position is is right after the panel, expand, or decisionList
+        // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
+        var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
+        if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
+          var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
+          tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+        }
       }
     } else {
       // need to scan the slice if there's a block node or list items inside it

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.5.0";
+export var version = "189.5.1";

package/dist/types/plugins/paste/edge-cases/index.d.ts

@@ -5,3 +5,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
     slice: Slice;
     schema: Schema;
 }): void | Transaction;
+export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
+    tr: Transaction;
+    slice: Slice;
+}): Transaction | undefined;

package/dist/types-ts4.5/plugins/paste/edge-cases/index.d.ts

@@ -5,3 +5,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
     slice: Slice;
     schema: Schema;
 }): void | Transaction;
+export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
+    tr: Transaction;
+    slice: Slice;
+}): Transaction | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.5.0",
+  "version": "189.5.1",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"