@atlaskit/editor-plugin-paste 0.2.15 → 0.2.16

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-paste
 
+## 0.2.16
+
+### Patch Changes
+
+- [#69736](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/69736) [`febb7827b916`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/febb7827b916) - ED-21619 Set correct cursor position on pasting a rule inside panel
+- Updated dependencies
+
 ## 0.2.15
 
 ### Patch Changes

package/dist/cjs/handlers.js

@@ -159,17 +159,17 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
       if (pastingDecisionIntoExtendedPanel && selectionIsValidNode) {
         tr.replaceSelection(transformedSlice).scrollIntoView();
       } else {
+        var _transformedSlice$con2;
         // 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 or decision
-        //it moves the cursor to beginning of the node
-        //we manually shift the cursor to end of the codeblock
-        var currentPosition = tr.selection.$from;
-        var currentNode = currentPosition.parent;
-        if (['codeBlock', 'decisionItem'].includes(currentNode.type.name)) {
-          var endPosOfNode = currentPosition.end();
-          var endResolvedPosition = tr.doc.resolve(endPosOfNode);
-          tr.setSelection(new _state.TextSelection(endResolvedPosition, endResolvedPosition));
+        if (((_transformedSlice$con2 = transformedSlice.content.lastChild) === null || _transformedSlice$con2 === void 0 || (_transformedSlice$con2 = _transformedSlice$con2.type) === null || _transformedSlice$con2 === void 0 ? void 0 : _transformedSlice$con2.name) === 'rule') {
+          tr.setSelection(_state.TextSelection.near(tr.doc.resolve(selection.$from.pos + transformedSlice.content.size)));
+        } else {
+          // safeInsert doesn't set correct cursor position
+          // it moves the cursor to beginning of the node
+          // we manually shift the cursor to end of the node
+          var nextPos = tr.doc.resolve(tr.selection.$from.end());
+          tr.setSelection(new _state.TextSelection(nextPos));
         }
       }
     }

package/dist/es2019/handlers.js

@@ -134,17 +134,17 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
       if (pastingDecisionIntoExtendedPanel && selectionIsValidNode) {
         tr.replaceSelection(transformedSlice).scrollIntoView();
       } else {
+        var _transformedSlice$con2, _transformedSlice$con3;
         // 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 or decision
-        //it moves the cursor to beginning of the node
-        //we manually shift the cursor to end of the codeblock
-        const currentPosition = tr.selection.$from;
-        const currentNode = currentPosition.parent;
-        if (['codeBlock', 'decisionItem'].includes(currentNode.type.name)) {
-          const endPosOfNode = currentPosition.end();
-          const endResolvedPosition = tr.doc.resolve(endPosOfNode);
-          tr.setSelection(new TextSelection(endResolvedPosition, endResolvedPosition));
+        if (((_transformedSlice$con2 = transformedSlice.content.lastChild) === null || _transformedSlice$con2 === void 0 ? void 0 : (_transformedSlice$con3 = _transformedSlice$con2.type) === null || _transformedSlice$con3 === void 0 ? void 0 : _transformedSlice$con3.name) === 'rule') {
+          tr.setSelection(TextSelection.near(tr.doc.resolve(selection.$from.pos + transformedSlice.content.size)));
+        } else {
+          // safeInsert doesn't set correct cursor position
+          // it moves the cursor to beginning of the node
+          // we manually shift the cursor to end of the node
+          const nextPos = tr.doc.resolve(tr.selection.$from.end());
+          tr.setSelection(new TextSelection(nextPos));
         }
       }
     }

package/dist/esm/handlers.js

@@ -137,17 +137,17 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
       if (pastingDecisionIntoExtendedPanel && selectionIsValidNode) {
         tr.replaceSelection(transformedSlice).scrollIntoView();
       } else {
+        var _transformedSlice$con2;
         // 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 or decision
-        //it moves the cursor to beginning of the node
-        //we manually shift the cursor to end of the codeblock
-        var currentPosition = tr.selection.$from;
-        var currentNode = currentPosition.parent;
-        if (['codeBlock', 'decisionItem'].includes(currentNode.type.name)) {
-          var endPosOfNode = currentPosition.end();
-          var endResolvedPosition = tr.doc.resolve(endPosOfNode);
-          tr.setSelection(new TextSelection(endResolvedPosition, endResolvedPosition));
+        if (((_transformedSlice$con2 = transformedSlice.content.lastChild) === null || _transformedSlice$con2 === void 0 || (_transformedSlice$con2 = _transformedSlice$con2.type) === null || _transformedSlice$con2 === void 0 ? void 0 : _transformedSlice$con2.name) === 'rule') {
+          tr.setSelection(TextSelection.near(tr.doc.resolve(selection.$from.pos + transformedSlice.content.size)));
+        } else {
+          // safeInsert doesn't set correct cursor position
+          // it moves the cursor to beginning of the node
+          // we manually shift the cursor to end of the node
+          var nextPos = tr.doc.resolve(tr.selection.$from.end());
+          tr.setSelection(new TextSelection(nextPos));
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -36,7 +36,7 @@
     "@atlaskit/editor-common": "^77.1.0",
     "@atlaskit/editor-markdown-transformer": "^5.3.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
-    "@atlaskit/editor-plugin-annotation": "^0.2.0",
+    "@atlaskit/editor-plugin-annotation": "^0.3.0",
     "@atlaskit/editor-plugin-better-type-history": "^0.1.0",
     "@atlaskit/editor-plugin-card": "^0.16.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",