@atlaskit/editor-plugin-paste 0.2.7 → 0.2.9

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-paste
 
+## 0.2.9
+
+### Patch Changes
+
+- [#66826](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66826) [`5e9f6778a15a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5e9f6778a15a) - [ux] resolved a bug where the cursor mispalced after pasting the media into the panel
+- [#67283](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67283) [`4f10a52c6e39`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4f10a52c6e39) - ED-21613 handle incorrect cursor position - when task is copied into a list
+- Updated dependencies
+
+## 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/edge-cases/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertSliceForLists = insertSliceForLists;
 exports.insertSliceForListsInsideBlockquote = insertSliceForListsInsideBlockquote;
+exports.updateSelectionAfterReplace = updateSelectionAfterReplace;
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -70,6 +71,13 @@ function insertSliceForListsInsideBlockquote(_ref3) {
   //insert blockquote explicitly and set the selection in blockquote since replaceSelection will only insert the list
   var schema = tr.doc.type.schema;
   tr.replaceSelection(new _model.Slice(_model.Fragment.from(schema.nodes.blockquote.createAndFill()), 0, 0));
+  updateSelectionAfterReplace({
+    tr: tr
+  });
+  tr.replaceSelection(slice);
+}
+function updateSelectionAfterReplace(_ref4) {
+  var tr = _ref4.tr;
   // ProseMirror doesn't give a proper way to tell us where something was inserted.
   // However, we can know "how" it inserted something.
   //
@@ -78,6 +86,7 @@ function insertSliceForListsInsideBlockquote(_ref3) {
   //    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;
@@ -88,5 +97,4 @@ function insertSliceForListsInsideBlockquote(_ref3) {
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
-  tr.replaceSelection(slice);
 }

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,
@@ -142,9 +143,29 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     // 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 {
       // 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) {
@@ -816,7 +837,7 @@ function flattenNestedListInSlice(slice) {
 }
 function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre, _slice$content$firstC3;
     var _state$schema$nodes3 = state.schema.nodes,
       codeBlock = _state$schema$nodes3.codeBlock,
       heading = _state$schema$nodes3.heading,
@@ -899,6 +920,11 @@ function handleRichText(slice, queueCardsFromChangedTr) {
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(_state.TextSelection.near(tr.selection.$from, 1));
     }
+    if ((0, _utils.isInListItem)(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || '')) {
+      (0, _edgeCases.updateSelectionAfterReplace)({
+        tr: tr
+      });
+    }
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors

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

@@ -71,6 +71,14 @@ export function insertSliceForListsInsideBlockquote({
     schema
   } = tr.doc.type;
   tr.replaceSelection(new Slice(Fragment.from(schema.nodes.blockquote.createAndFill()), 0, 0));
+  updateSelectionAfterReplace({
+    tr
+  });
+  tr.replaceSelection(slice);
+}
+export function updateSelectionAfterReplace({
+  tr
+}) {
   // ProseMirror doesn't give a proper way to tell us where something was inserted.
   // However, we can know "how" it inserted something.
   //
@@ -79,6 +87,7 @@ export function insertSliceForListsInsideBlockquote({
   //    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;
@@ -89,5 +98,4 @@ export function insertSliceForListsInsideBlockquote({
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
-  tr.replaceSelection(slice);
 }

package/dist/es2019/handlers.js

@@ -3,7 +3,7 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { insideTable } from '@atlaskit/editor-common/core-utils';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
-import { canLinkBeCreatedInRange, insideTableCell, isInListItem, isLinkMark, isListItemNode, isListNode, isParagraph, isText, linkifyContent, mapSlice } from '@atlaskit/editor-common/utils';
+import { canLinkBeCreatedInRange, insideTableCell, isInListItem, isLinkMark, isListItemNode, isListNode, isNodeEmpty, isParagraph, isText, linkifyContent, mapSlice } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -12,7 +12,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
-import { insertSliceForLists, insertSliceForListsInsideBlockquote } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
 
@@ -60,6 +60,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
         code: codeMark
       },
       nodes: {
+        codeBlock,
         decisionItem,
         emoji,
         hardBreak,
@@ -118,9 +119,29 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // 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 {
       // 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) {
@@ -795,7 +816,7 @@ export function flattenNestedListInSlice(slice) {
 }
 export function handleRichText(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre, _slice$content$firstC3, _slice$content$firstC4;
     const {
       codeBlock,
       heading,
@@ -881,6 +902,11 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(TextSelection.near(tr.selection.$from, 1));
     }
+    if (isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : (_slice$content$firstC4 = _slice$content$firstC3.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || '')) {
+      updateSelectionAfterReplace({
+        tr
+      });
+    }
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors

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

@@ -63,6 +63,13 @@ export function insertSliceForListsInsideBlockquote(_ref3) {
   //insert blockquote explicitly and set the selection in blockquote since replaceSelection will only insert the list
   var schema = tr.doc.type.schema;
   tr.replaceSelection(new Slice(Fragment.from(schema.nodes.blockquote.createAndFill()), 0, 0));
+  updateSelectionAfterReplace({
+    tr: tr
+  });
+  tr.replaceSelection(slice);
+}
+export function updateSelectionAfterReplace(_ref4) {
+  var tr = _ref4.tr;
   // ProseMirror doesn't give a proper way to tell us where something was inserted.
   // However, we can know "how" it inserted something.
   //
@@ -71,6 +78,7 @@ export function insertSliceForListsInsideBlockquote(_ref3) {
   //    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;
@@ -81,5 +89,4 @@ export function insertSliceForListsInsideBlockquote(_ref3) {
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
-  tr.replaceSelection(slice);
 }

package/dist/esm/handlers.js

@@ -11,7 +11,7 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { insideTable } from '@atlaskit/editor-common/core-utils';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
-import { canLinkBeCreatedInRange, insideTableCell, isInListItem, isLinkMark, isListItemNode, isListNode, isParagraph, isText, linkifyContent, mapSlice } from '@atlaskit/editor-common/utils';
+import { canLinkBeCreatedInRange, insideTableCell, isInListItem, isLinkMark, isListItemNode, isListNode, isNodeEmpty, isParagraph, isText, linkifyContent, mapSlice } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -20,7 +20,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
-import { insertSliceForLists, insertSliceForListsInsideBlockquote } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
 
@@ -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,
@@ -121,9 +122,29 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // 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 {
       // 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) {
@@ -795,7 +816,7 @@ export function flattenNestedListInSlice(slice) {
 }
 export function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre, _slice$content$firstC3;
     var _state$schema$nodes3 = state.schema.nodes,
       codeBlock = _state$schema$nodes3.codeBlock,
       heading = _state$schema$nodes3.heading,
@@ -878,6 +899,11 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(TextSelection.near(tr.selection.$from, 1));
     }
+    if (isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || '')) {
+      updateSelectionAfterReplace({
+        tr: tr
+      });
+    }
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors

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

@@ -8,4 +8,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
 export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
     tr: Transaction;
     slice: PMSlice;
+}): void;
+export declare function updateSelectionAfterReplace({ tr }: {
+    tr: Transaction;
 }): Transaction | undefined;

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

@@ -8,4 +8,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
 export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
     tr: Transaction;
     slice: PMSlice;
+}): void;
+export declare function updateSelectionAfterReplace({ tr }: {
+    tr: Transaction;
 }): Transaction | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "releaseModel": "continuous",
     "runReact18": false
   },
-  "repository": "https://bitbucket.org/atlassian/atlassian-frontend",
+  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "module:es2019": "dist/es2019/index.js",
@@ -33,7 +33,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^76.39.0",
+    "@atlaskit/editor-common": "^76.41.0",
     "@atlaskit/editor-markdown-transformer": "^5.3.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-annotation": "^0.1.0",