@atlaskit/editor-plugin-paste 0.2.1 → 0.2.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-paste
 
+## 0.2.3
+
+### Patch Changes
+
+- [#64592](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64592) [`21e21d79ce84`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/21e21d79ce84) - fix copy pasting content from expands inside a table so only selected content is pasted
+- [#65031](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65031) [`a00094111b5a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a00094111b5a) - ED-21609 Update adf-schema to 35.3.0
+- Updated dependencies
+
+## 0.2.2
+
+### Patch Changes
+
+- [#64216](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64216) [`582a3eef15ae`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/582a3eef15ae) - ED-20824 Fix copy paste issues with multi-level list inside blockquote
+- Updated dependencies
+
 ## 0.2.1
 
 ### Patch Changes

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.insertSliceForLists = insertSliceForLists;
 exports.insertSliceForListsInsideBlockquote = insertSliceForListsInsideBlockquote;
 var _utils = require("@atlaskit/editor-common/utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
@@ -66,7 +67,9 @@ function insertSliceForLists(_ref) {
 function insertSliceForListsInsideBlockquote(_ref3) {
   var tr = _ref3.tr,
     slice = _ref3.slice;
-  (0, _utils2.safeInsert)(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  //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));
   // ProseMirror doesn't give a proper way to tell us where something was inserted.
   // However, we can know "how" it inserted something.
   //
@@ -85,4 +88,5 @@ function insertSliceForListsInsideBlockquote(_ref3) {
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
+  tr.replaceSelection(slice);
 }

package/dist/cjs/handlers.js

@@ -154,7 +154,7 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
 }
 function handlePasteNonNestableBlockNodesIntoList(slice) {
   return function (state, dispatch) {
-    var _tr$doc$nodeAt, _sliceContent$firstCh, _findParentNodeOfType;
+    var _tr$doc$nodeAt, _slice$content$firstC2, _sliceContent$firstCh, _findParentNodeOfType;
     var tr = state.tr;
     var selection = tr.selection;
     var $from = selection.$from,
@@ -229,7 +229,12 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
     }
 
     // handle the insertion of the slice
-    if (sliceContainsNodeThatPastesAsPlainText || nodeAfterInsertPositionIsListItem || sliceContent.childCount > 1 && ((_sliceContent$firstCh = sliceContent.firstChild) === null || _sliceContent$firstCh === void 0 ? void 0 : _sliceContent$firstCh.type.name) !== 'paragraph') {
+    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type.name) === 'blockquote' && (0, _utils2.contains)(slice.content.firstChild, state.schema.nodes.listItem)) {
+      (0, _edgeCases.insertSliceForListsInsideBlockquote)({
+        tr: tr,
+        slice: slice
+      });
+    } else if (sliceContainsNodeThatPastesAsPlainText || nodeAfterInsertPositionIsListItem || sliceContent.childCount > 1 && ((_sliceContent$firstCh = sliceContent.firstChild) === null || _sliceContent$firstCh === void 0 ? void 0 : _sliceContent$firstCh.type.name) !== 'paragraph') {
       tr.replaceWith(from, replaceTo, sliceContent).scrollIntoView();
     } else {
       // When the selection is not at the end of a list item
@@ -600,7 +605,7 @@ function handleMediaSingle(inputMethod, insertMediaAsMediaSingle) {
 var checkExpand = function checkExpand(slice) {
   var hasExpand = false;
   slice.content.forEach(function (node) {
-    if (node.type.name === 'expand') {
+    if (node.type.name === 'expand' || node.type.name === 'nestedExpand') {
       hasExpand = true;
     }
   });
@@ -619,7 +624,7 @@ function handleExpandPasteInTable(slice) {
     var tr = state.tr;
     var hasExpand = false;
     var newSlice = (0, _utils.mapSlice)(slice, function (maybeNode) {
-      if (maybeNode.type === expand) {
+      if (maybeNode.type === expand || maybeNode.type === nestedExpand) {
         hasExpand = true;
         try {
           return nestedExpand.createChecked(maybeNode.attrs, maybeNode.content, maybeNode.marks);

package/dist/cjs/pm-plugins/main.js

@@ -331,10 +331,11 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         if (isRichText && isInsideBlockQuote(state)) {
           //If pasting inside blockquote
           //Skip the blockquote node and keep remaining nodes as they are
+          //prevent doing this if there is list inside blockquote as the list is pasted incorrectly inside blockquote due to wrong openStart and openEnd
           var blockquote = schema.nodes.blockquote;
           var children = [];
           (0, _utils.mapChildren)(slice.content, function (node) {
-            if (node.type === blockquote) {
+            if (node.type === blockquote && !(0, _utils2.contains)(node, state.schema.nodes.listItem)) {
               for (var i = 0; i < node.childCount; i++) {
                 children.push(node.child(i));
               }

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

@@ -1,7 +1,8 @@
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../util';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
 export function insertSliceForLists({
@@ -65,7 +66,11 @@ export function insertSliceForListsInsideBlockquote({
   tr,
   slice
 }) {
-  safeInsert(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  //insert blockquote explicitly and set the selection in blockquote since replaceSelection will only insert the list
+  const {
+    schema
+  } = tr.doc.type;
+  tr.replaceSelection(new Slice(Fragment.from(schema.nodes.blockquote.createAndFill()), 0, 0));
   // ProseMirror doesn't give a proper way to tell us where something was inserted.
   // However, we can know "how" it inserted something.
   //
@@ -84,4 +89,5 @@ export function insertSliceForListsInsideBlockquote({
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
+  tr.replaceSelection(slice);
 }

package/dist/es2019/handlers.js

@@ -7,7 +7,7 @@ import { canLinkBeCreatedInRange, insideTableCell, isInListItem, isLinkMark, isL
 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';
-import { canInsert, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 // TODO: ED-20519 Needs Macro extraction
 
@@ -130,7 +130,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
 }
 export function handlePasteNonNestableBlockNodesIntoList(slice) {
   return (state, dispatch) => {
-    var _tr$doc$nodeAt, _sliceContent$firstCh, _findParentNodeOfType;
+    var _tr$doc$nodeAt, _slice$content$firstC2, _sliceContent$firstCh, _findParentNodeOfType;
     const {
       tr
     } = state;
@@ -212,7 +212,12 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     }
 
     // handle the insertion of the slice
-    if (sliceContainsNodeThatPastesAsPlainText || nodeAfterInsertPositionIsListItem || sliceContent.childCount > 1 && ((_sliceContent$firstCh = sliceContent.firstChild) === null || _sliceContent$firstCh === void 0 ? void 0 : _sliceContent$firstCh.type.name) !== 'paragraph') {
+    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
+      insertSliceForListsInsideBlockquote({
+        tr,
+        slice
+      });
+    } else if (sliceContainsNodeThatPastesAsPlainText || nodeAfterInsertPositionIsListItem || sliceContent.childCount > 1 && ((_sliceContent$firstCh = sliceContent.firstChild) === null || _sliceContent$firstCh === void 0 ? void 0 : _sliceContent$firstCh.type.name) !== 'paragraph') {
       tr.replaceWith(from, replaceTo, sliceContent).scrollIntoView();
     } else {
       // When the selection is not at the end of a list item
@@ -586,7 +591,7 @@ export function handleMediaSingle(inputMethod, insertMediaAsMediaSingle) {
 const checkExpand = slice => {
   let hasExpand = false;
   slice.content.forEach(node => {
-    if (node.type.name === 'expand') {
+    if (node.type.name === 'expand' || node.type.name === 'nestedExpand') {
       hasExpand = true;
     }
   });
@@ -608,7 +613,7 @@ export function handleExpandPasteInTable(slice) {
     } = state;
     let hasExpand = false;
     const newSlice = mapSlice(slice, maybeNode => {
-      if (maybeNode.type === expand) {
+      if (maybeNode.type === expand || maybeNode.type === nestedExpand) {
         hasExpand = true;
         try {
           return nestedExpand.createChecked(maybeNode.attrs, maybeNode.content, maybeNode.marks);

package/dist/es2019/pm-plugins/main.js

@@ -9,7 +9,7 @@ import { transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExp
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren, measureRender } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { PastePluginActionTypes } from '../actions';
 import { splitParagraphs, upgradeTextToLists } from '../commands';
@@ -300,12 +300,13 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (isRichText && isInsideBlockQuote(state)) {
           //If pasting inside blockquote
           //Skip the blockquote node and keep remaining nodes as they are
+          //prevent doing this if there is list inside blockquote as the list is pasted incorrectly inside blockquote due to wrong openStart and openEnd
           const {
             blockquote
           } = schema.nodes;
           const children = [];
           mapChildren(slice.content, node => {
-            if (node.type === blockquote) {
+            if (node.type === blockquote && !contains(node, state.schema.nodes.listItem)) {
               for (let i = 0; i < node.childCount; i++) {
                 children.push(node.child(i));
               }

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

@@ -1,7 +1,8 @@
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../util';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
 export function insertSliceForLists(_ref) {
@@ -59,7 +60,9 @@ export function insertSliceForLists(_ref) {
 export function insertSliceForListsInsideBlockquote(_ref3) {
   var tr = _ref3.tr,
     slice = _ref3.slice;
-  safeInsert(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  //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));
   // ProseMirror doesn't give a proper way to tell us where something was inserted.
   // However, we can know "how" it inserted something.
   //
@@ -78,4 +81,5 @@ export function insertSliceForListsInsideBlockquote(_ref3) {
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
+  tr.replaceSelection(slice);
 }

package/dist/esm/handlers.js

@@ -15,7 +15,7 @@ import { canLinkBeCreatedInRange, insideTableCell, isInListItem, isLinkMark, isL
 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';
-import { canInsert, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 // TODO: ED-20519 Needs Macro extraction
 
@@ -133,7 +133,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
 }
 export function handlePasteNonNestableBlockNodesIntoList(slice) {
   return function (state, dispatch) {
-    var _tr$doc$nodeAt, _sliceContent$firstCh, _findParentNodeOfType;
+    var _tr$doc$nodeAt, _slice$content$firstC2, _sliceContent$firstCh, _findParentNodeOfType;
     var tr = state.tr;
     var selection = tr.selection;
     var $from = selection.$from,
@@ -208,7 +208,12 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     }
 
     // handle the insertion of the slice
-    if (sliceContainsNodeThatPastesAsPlainText || nodeAfterInsertPositionIsListItem || sliceContent.childCount > 1 && ((_sliceContent$firstCh = sliceContent.firstChild) === null || _sliceContent$firstCh === void 0 ? void 0 : _sliceContent$firstCh.type.name) !== 'paragraph') {
+    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
+      insertSliceForListsInsideBlockquote({
+        tr: tr,
+        slice: slice
+      });
+    } else if (sliceContainsNodeThatPastesAsPlainText || nodeAfterInsertPositionIsListItem || sliceContent.childCount > 1 && ((_sliceContent$firstCh = sliceContent.firstChild) === null || _sliceContent$firstCh === void 0 ? void 0 : _sliceContent$firstCh.type.name) !== 'paragraph') {
       tr.replaceWith(from, replaceTo, sliceContent).scrollIntoView();
     } else {
       // When the selection is not at the end of a list item
@@ -579,7 +584,7 @@ export function handleMediaSingle(inputMethod, insertMediaAsMediaSingle) {
 var checkExpand = function checkExpand(slice) {
   var hasExpand = false;
   slice.content.forEach(function (node) {
-    if (node.type.name === 'expand') {
+    if (node.type.name === 'expand' || node.type.name === 'nestedExpand') {
       hasExpand = true;
     }
   });
@@ -598,7 +603,7 @@ export function handleExpandPasteInTable(slice) {
     var tr = state.tr;
     var hasExpand = false;
     var newSlice = mapSlice(slice, function (maybeNode) {
-      if (maybeNode.type === expand) {
+      if (maybeNode.type === expand || maybeNode.type === nestedExpand) {
         hasExpand = true;
         try {
           return nestedExpand.createChecked(maybeNode.attrs, maybeNode.content, maybeNode.marks);

package/dist/esm/pm-plugins/main.js

@@ -11,7 +11,7 @@ import { transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExp
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren, measureRender } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { PastePluginActionTypes } from '../actions';
 import { splitParagraphs, upgradeTextToLists } from '../commands';
@@ -318,10 +318,11 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (isRichText && isInsideBlockQuote(state)) {
           //If pasting inside blockquote
           //Skip the blockquote node and keep remaining nodes as they are
+          //prevent doing this if there is list inside blockquote as the list is pasted incorrectly inside blockquote due to wrong openStart and openEnd
           var blockquote = schema.nodes.blockquote;
           var children = [];
           mapChildren(slice.content, function (node) {
-            if (node.type === blockquote) {
+            if (node.type === blockquote && !contains(node, state.schema.nodes.listItem)) {
               for (var i = 0; i < node.childCount; i++) {
                 children.push(node.child(i));
               }

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

@@ -1,11 +1,11 @@
-import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Slice as PMSlice, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function insertSliceForLists({ tr, slice, schema, }: {
     tr: Transaction;
-    slice: Slice;
+    slice: PMSlice;
     schema: Schema;
 }): void | Transaction;
 export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
     tr: Transaction;
-    slice: Slice;
+    slice: PMSlice;
 }): Transaction | undefined;

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

@@ -1,11 +1,11 @@
-import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Slice as PMSlice, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function insertSliceForLists({ tr, slice, schema, }: {
     tr: Transaction;
-    slice: Slice;
+    slice: PMSlice;
     schema: Schema;
 }): void | Transaction;
 export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
     tr: Transaction;
-    slice: Slice;
+    slice: PMSlice;
 }): Transaction | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,15 +32,15 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^76.30.0",
+    "@atlaskit/editor-common": "^76.35.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-annotation": "^0.1.0",
     "@atlaskit/editor-plugin-better-type-history": "^0.1.0",
-    "@atlaskit/editor-plugin-card": "^0.14.0",
+    "@atlaskit/editor-plugin-card": "^0.15.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
-    "@atlaskit/editor-plugin-list": "^3.0.0",
-    "@atlaskit/editor-plugin-media": "^0.9.0",
+    "@atlaskit/editor-plugin-list": "^3.1.0",
+    "@atlaskit/editor-plugin-media": "^0.10.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/editor-tables": "^2.3.0",
     "@atlaskit/media-client": "^26.1.0",
@@ -55,13 +55,15 @@
   },
   "devDependencies": {
     "@af/visual-regression": "*",
-    "@atlaskit/adf-schema": "^35.2.0",
+    "@atlaskit/adf-schema": "^35.3.0",
+    "@atlaskit/editor-plugin-block-type": "^3.0.0",
     "@atlaskit/editor-plugin-history": "^0.1.0",
-    "@atlaskit/editor-plugin-type-ahead": "^0.8.0",
+    "@atlaskit/editor-plugin-type-ahead": "^0.9.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
+    "@atlassian/feature-flags-test-utils": "^0.1.1",
     "@testing-library/react": "^12.1.5",
     "react-dom": "^16.8.0",
     "typescript": "~4.9.5",