@atlaskit/editor-plugin-paste 0.2.15 → 0.2.17

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-paste
 
+## 0.2.17
+
+### Patch Changes
+
+- [#70164](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70164) [`a6438ad5ed9d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a6438ad5ed9d) - ED-21974 Pasting node into panel should replace the selected text
+
+## 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

@@ -140,36 +140,43 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     // and the slice is not a whole node (i.e. openStart is 1 and openEnd is 0)
     // or the slice's first node is a paragraph,
     // then we can replace the selection with our slice.
-    var pastingDecisionIntoExtendedPanel = selectionIsPanel && transformedSlice.content.firstChild.type.name === 'decisionList' && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-extended-panel');
-    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingDecisionIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
+    var pastingIntoExtendedPanel = selectionIsPanel && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-extended-panel') && panel.validContent(transformedSlice.content);
+    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
     // Whole codeblock node has reverse slice depths.
     transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === paragraph) {
       tr.replaceSelection(transformedSlice).scrollIntoView();
-    } else if (['mediaSingle'].includes(transformedSlice.content.firstChild.type.name) && selectionIsPanel) {
-      var parentNode = (0, _utils2.findParentNodeOfType)(panel)(selection);
-      if (selectionIsPanel && parentNode && (0, _utils.isNodeEmpty)(parentNode.node)) {
-        tr.insert(selection.$from.pos, transformedSlice.content).scrollIntoView();
-        // Place the cursor at the the end of the insersertion
-        var endPos = tr.selection.from + transformedSlice.size;
-        tr.setSelection(new _state.TextSelection(tr.doc.resolve(endPos)));
-      } else {
-        tr.replaceSelection(transformedSlice).scrollIntoView();
-      }
     } else {
-      if (pastingDecisionIntoExtendedPanel && selectionIsValidNode) {
-        tr.replaceSelection(transformedSlice).scrollIntoView();
+      var isWholeContentSelected = selection.$from.pos === selection.$from.start() && selection.$to.end() === selection.$to.pos;
+      if (pastingIntoExtendedPanel && selection.$from.pos !== selection.$to.pos && !isWholeContentSelected) {
+        // Do a replaceSelection if the entire panel content isn't selected
+        //tr.replaceSelection(transformedSlice).scrollIntoView();
+        tr.replaceSelection(new _model.Slice(transformedSlice.content, 0, transformedSlice.openEnd)).scrollIntoView();
+      } else if (['mediaSingle'].includes(transformedSlice.content.firstChild.type.name) && selectionIsPanel) {
+        var parentNode = (0, _utils2.findParentNodeOfType)(panel)(selection);
+        if (selectionIsPanel && parentNode && (0, _utils.isNodeEmpty)(parentNode.node)) {
+          tr.insert(selection.$from.pos, transformedSlice.content).scrollIntoView();
+          // Place the cursor at the the end of the insersertion
+          var endPos = tr.selection.from + transformedSlice.size;
+          tr.setSelection(new _state.TextSelection(tr.doc.resolve(endPos)));
+        } else {
+          tr.replaceSelection(transformedSlice).scrollIntoView();
+        }
       } else {
+        var _transformedSlice$con2;
+        if (pastingIntoExtendedPanel && isWholeContentSelected) {
+          // if the entire panel content is selected, doing a replaceSelection removes the panel as well. Hence we do delete followed by safeInsert
+          tr.delete(selection.$from.pos, selection.$to.pos);
+        }
         // 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(tr.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

@@ -115,36 +115,43 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // and the slice is not a whole node (i.e. openStart is 1 and openEnd is 0)
     // or the slice's first node is a paragraph,
     // then we can replace the selection with our slice.
-    const pastingDecisionIntoExtendedPanel = selectionIsPanel && transformedSlice.content.firstChild.type.name === 'decisionList' && getBooleanFF('platform.editor.allow-extended-panel');
-    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingDecisionIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
+    const pastingIntoExtendedPanel = selectionIsPanel && getBooleanFF('platform.editor.allow-extended-panel') && panel.validContent(transformedSlice.content);
+    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
     // Whole codeblock node has reverse slice depths.
     transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === paragraph) {
       tr.replaceSelection(transformedSlice).scrollIntoView();
-    } else if (['mediaSingle'].includes(transformedSlice.content.firstChild.type.name) && selectionIsPanel) {
-      const parentNode = findParentNodeOfType(panel)(selection);
-      if (selectionIsPanel && parentNode && isNodeEmpty(parentNode.node)) {
-        tr.insert(selection.$from.pos, transformedSlice.content).scrollIntoView();
-        // Place the cursor at the the end of the insersertion
-        const endPos = tr.selection.from + transformedSlice.size;
-        tr.setSelection(new TextSelection(tr.doc.resolve(endPos)));
-      } else {
-        tr.replaceSelection(transformedSlice).scrollIntoView();
-      }
     } else {
-      if (pastingDecisionIntoExtendedPanel && selectionIsValidNode) {
-        tr.replaceSelection(transformedSlice).scrollIntoView();
+      const isWholeContentSelected = selection.$from.pos === selection.$from.start() && selection.$to.end() === selection.$to.pos;
+      if (pastingIntoExtendedPanel && selection.$from.pos !== selection.$to.pos && !isWholeContentSelected) {
+        // Do a replaceSelection if the entire panel content isn't selected
+        //tr.replaceSelection(transformedSlice).scrollIntoView();
+        tr.replaceSelection(new Slice(transformedSlice.content, 0, transformedSlice.openEnd)).scrollIntoView();
+      } else if (['mediaSingle'].includes(transformedSlice.content.firstChild.type.name) && selectionIsPanel) {
+        const parentNode = findParentNodeOfType(panel)(selection);
+        if (selectionIsPanel && parentNode && isNodeEmpty(parentNode.node)) {
+          tr.insert(selection.$from.pos, transformedSlice.content).scrollIntoView();
+          // Place the cursor at the the end of the insersertion
+          const endPos = tr.selection.from + transformedSlice.size;
+          tr.setSelection(new TextSelection(tr.doc.resolve(endPos)));
+        } else {
+          tr.replaceSelection(transformedSlice).scrollIntoView();
+        }
       } else {
+        var _transformedSlice$con2, _transformedSlice$con3;
+        if (pastingIntoExtendedPanel && isWholeContentSelected) {
+          // if the entire panel content is selected, doing a replaceSelection removes the panel as well. Hence we do delete followed by safeInsert
+          tr.delete(selection.$from.pos, selection.$to.pos);
+        }
         // 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(tr.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

@@ -118,36 +118,43 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // and the slice is not a whole node (i.e. openStart is 1 and openEnd is 0)
     // or the slice's first node is a paragraph,
     // then we can replace the selection with our slice.
-    var pastingDecisionIntoExtendedPanel = selectionIsPanel && transformedSlice.content.firstChild.type.name === 'decisionList' && getBooleanFF('platform.editor.allow-extended-panel');
-    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingDecisionIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
+    var pastingIntoExtendedPanel = selectionIsPanel && getBooleanFF('platform.editor.allow-extended-panel') && panel.validContent(transformedSlice.content);
+    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
     // Whole codeblock node has reverse slice depths.
     transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === paragraph) {
       tr.replaceSelection(transformedSlice).scrollIntoView();
-    } else if (['mediaSingle'].includes(transformedSlice.content.firstChild.type.name) && selectionIsPanel) {
-      var parentNode = findParentNodeOfType(panel)(selection);
-      if (selectionIsPanel && parentNode && isNodeEmpty(parentNode.node)) {
-        tr.insert(selection.$from.pos, transformedSlice.content).scrollIntoView();
-        // Place the cursor at the the end of the insersertion
-        var endPos = tr.selection.from + transformedSlice.size;
-        tr.setSelection(new TextSelection(tr.doc.resolve(endPos)));
-      } else {
-        tr.replaceSelection(transformedSlice).scrollIntoView();
-      }
     } else {
-      if (pastingDecisionIntoExtendedPanel && selectionIsValidNode) {
-        tr.replaceSelection(transformedSlice).scrollIntoView();
+      var isWholeContentSelected = selection.$from.pos === selection.$from.start() && selection.$to.end() === selection.$to.pos;
+      if (pastingIntoExtendedPanel && selection.$from.pos !== selection.$to.pos && !isWholeContentSelected) {
+        // Do a replaceSelection if the entire panel content isn't selected
+        //tr.replaceSelection(transformedSlice).scrollIntoView();
+        tr.replaceSelection(new Slice(transformedSlice.content, 0, transformedSlice.openEnd)).scrollIntoView();
+      } else if (['mediaSingle'].includes(transformedSlice.content.firstChild.type.name) && selectionIsPanel) {
+        var parentNode = findParentNodeOfType(panel)(selection);
+        if (selectionIsPanel && parentNode && isNodeEmpty(parentNode.node)) {
+          tr.insert(selection.$from.pos, transformedSlice.content).scrollIntoView();
+          // Place the cursor at the the end of the insersertion
+          var endPos = tr.selection.from + transformedSlice.size;
+          tr.setSelection(new TextSelection(tr.doc.resolve(endPos)));
+        } else {
+          tr.replaceSelection(transformedSlice).scrollIntoView();
+        }
       } else {
+        var _transformedSlice$con2;
+        if (pastingIntoExtendedPanel && isWholeContentSelected) {
+          // if the entire panel content is selected, doing a replaceSelection removes the panel as well. Hence we do delete followed by safeInsert
+          tr.delete(selection.$from.pos, selection.$to.pos);
+        }
         // 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(tr.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.17",
   "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",