@atlaskit/editor-plugin-paste 0.2.7 → 0.2.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-paste
 
+## 0.2.8
+
+### Patch Changes
+
+- [#66495](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66495) [`8d310bc51505`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8d310bc51505) - ED-21623: Fixing paste behaviour for nested codeblock in panel
+
 ## 0.2.7
 
 ### Patch Changes

package/dist/cjs/handlers.js

@@ -86,6 +86,7 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
       selection = state.tr.selection;
     var codeMark = schema.marks.code,
       _schema$nodes = schema.nodes,
+      codeBlock = _schema$nodes.codeBlock,
       decisionItem = _schema$nodes.decisionItem,
       emoji = _schema$nodes.emoji,
       hardBreak = _schema$nodes.hardBreak,
@@ -145,6 +146,16 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     } else {
       // This maintains both the selection (destination) and the slice (paste content).
       (0, _utils2.safeInsert)(transformedSlice.content)(tr).scrollIntoView();
+      //safeInsert doesn't set correct cursor position inside codeBlock
+      //it moves the cursor to beginning of the codeblock
+      //we manually shift the cursor to end of the codeblock
+      var currentPosition = tr.selection.$from;
+      var currentNode = currentPosition.parent;
+      if (currentNode.type === codeBlock) {
+        var endPosOfCodeBlock = currentPosition.end();
+        var endResolvedPosition = tr.doc.resolve(endPosOfCodeBlock);
+        tr.setSelection(new _state.TextSelection(endResolvedPosition, endResolvedPosition));
+      }
     }
     queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
     if (dispatch) {

package/dist/es2019/handlers.js

@@ -60,6 +60,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
         code: codeMark
       },
       nodes: {
+        codeBlock,
         decisionItem,
         emoji,
         hardBreak,
@@ -121,6 +122,16 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     } else {
       // This maintains both the selection (destination) and the slice (paste content).
       safeInsert(transformedSlice.content)(tr).scrollIntoView();
+      //safeInsert doesn't set correct cursor position inside codeBlock
+      //it moves the cursor to beginning of the codeblock
+      //we manually shift the cursor to end of the codeblock
+      const currentPosition = tr.selection.$from;
+      const currentNode = currentPosition.parent;
+      if (currentNode.type === codeBlock) {
+        const endPosOfCodeBlock = currentPosition.end();
+        const endResolvedPosition = tr.doc.resolve(endPosOfCodeBlock);
+        tr.setSelection(new TextSelection(endResolvedPosition, endResolvedPosition));
+      }
     }
     queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {

package/dist/esm/handlers.js

@@ -65,6 +65,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
       selection = state.tr.selection;
     var codeMark = schema.marks.code,
       _schema$nodes = schema.nodes,
+      codeBlock = _schema$nodes.codeBlock,
       decisionItem = _schema$nodes.decisionItem,
       emoji = _schema$nodes.emoji,
       hardBreak = _schema$nodes.hardBreak,
@@ -124,6 +125,16 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     } else {
       // This maintains both the selection (destination) and the slice (paste content).
       safeInsert(transformedSlice.content)(tr).scrollIntoView();
+      //safeInsert doesn't set correct cursor position inside codeBlock
+      //it moves the cursor to beginning of the codeblock
+      //we manually shift the cursor to end of the codeblock
+      var currentPosition = tr.selection.$from;
+      var currentNode = currentPosition.parent;
+      if (currentNode.type === codeBlock) {
+        var endPosOfCodeBlock = currentPosition.end();
+        var endResolvedPosition = tr.doc.resolve(endPosOfCodeBlock);
+        tr.setSelection(new TextSelection(endResolvedPosition, endResolvedPosition));
+      }
     }
     queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",