@atlaskit/editor-plugin-paste 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.0.6
+
+### Patch Changes
+
+- [#75436](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75436) [`bfcf32bb4fa3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bfcf32bb4fa3) - [ux] ED-21941 Disable resize/layout options for table, media and extension when added to MBE. Table rendering fixed for Confluence editor
+
+## 1.0.5
+
+### Patch Changes
+
+- [#75378](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75378) [`caf4a7eff92d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/caf4a7eff92d) - ED-22246 Fix pasting text into action/decision inside panel
+
 ## 1.0.4
 
 ### Patch Changes

package/dist/cjs/handlers.js

@@ -132,7 +132,10 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     // and the slice's first node is a paragraph
     // and it is not from a depth that would indicate it being from inside from another node (e.g. text from a decision)
     // then we can rely on the default behaviour.
-    var sliceIsAPanelReceivingLowDepthText = selectionIsPanel && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === paragraph && slice.openEnd < 2;
+    var selectionIsTaskOrDecision = (0, _utils2.hasParentNode)(function (node) {
+      return node.type === taskItem || node.type === decisionItem;
+    })(selection);
+    var sliceIsAPanelReceivingLowDepthText = selectionIsPanel && !selectionIsTaskOrDecision && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === paragraph && slice.openEnd < 2;
     if (sliceIsInvalid || sliceIsAPanelReceivingLowDepthText || !selectionIsValidNode && !selectionHasValidParentNode) {
       return false;
     }
@@ -815,13 +818,18 @@ function handleParagraphBlockMarks(state, slice) {
     return new _model.Slice(slice.content, openStart, slice.openEnd);
   }
 
-  // If the paragraph contains marks forbidden by the parent node (e.g. alignment/indentation),
-  // drop those marks from the slice
+  // If the paragraph or heading contains marks forbidden by the parent node
+  // (e.g. alignment/indentation), drop those marks from the slice
   return (0, _utils.mapSlice)(slice, function (node) {
     if (node.type === schema.nodes.paragraph) {
       return schema.nodes.paragraph.createChecked(undefined, node.content, node.marks.filter(function (mark) {
         return !forbiddenMarkTypes.includes(mark.type);
       }));
+    } else if (node.type === schema.nodes.heading) {
+      // Preserve heading attributes to keep formatting
+      return schema.nodes.heading.createChecked(node.attrs, node.content, node.marks.filter(function (mark) {
+        return !forbiddenMarkTypes.includes(mark.type);
+      }));
     }
     return node;
   });

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, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNode, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 // TODO: ED-20519 Needs Macro extraction
@@ -107,7 +107,8 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // and the slice's first node is a paragraph
     // and it is not from a depth that would indicate it being from inside from another node (e.g. text from a decision)
     // then we can rely on the default behaviour.
-    const sliceIsAPanelReceivingLowDepthText = selectionIsPanel && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === paragraph && slice.openEnd < 2;
+    const selectionIsTaskOrDecision = hasParentNode(node => node.type === taskItem || node.type === decisionItem)(selection);
+    const sliceIsAPanelReceivingLowDepthText = selectionIsPanel && !selectionIsTaskOrDecision && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === paragraph && slice.openEnd < 2;
     if (sliceIsInvalid || sliceIsAPanelReceivingLowDepthText || !selectionIsValidNode && !selectionHasValidParentNode) {
       return false;
     }
@@ -795,11 +796,14 @@ export function handleParagraphBlockMarks(state, slice) {
     return new Slice(slice.content, openStart, slice.openEnd);
   }
 
-  // If the paragraph contains marks forbidden by the parent node (e.g. alignment/indentation),
-  // drop those marks from the slice
+  // If the paragraph or heading contains marks forbidden by the parent node
+  // (e.g. alignment/indentation), drop those marks from the slice
   return mapSlice(slice, node => {
     if (node.type === schema.nodes.paragraph) {
       return schema.nodes.paragraph.createChecked(undefined, node.content, node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type)));
+    } else if (node.type === schema.nodes.heading) {
+      // Preserve heading attributes to keep formatting
+      return schema.nodes.heading.createChecked(node.attrs, node.content, node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type)));
     }
     return node;
   });

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, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNode, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 // TODO: ED-20519 Needs Macro extraction
@@ -110,7 +110,10 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // and the slice's first node is a paragraph
     // and it is not from a depth that would indicate it being from inside from another node (e.g. text from a decision)
     // then we can rely on the default behaviour.
-    var sliceIsAPanelReceivingLowDepthText = selectionIsPanel && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === paragraph && slice.openEnd < 2;
+    var selectionIsTaskOrDecision = hasParentNode(function (node) {
+      return node.type === taskItem || node.type === decisionItem;
+    })(selection);
+    var sliceIsAPanelReceivingLowDepthText = selectionIsPanel && !selectionIsTaskOrDecision && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === paragraph && slice.openEnd < 2;
     if (sliceIsInvalid || sliceIsAPanelReceivingLowDepthText || !selectionIsValidNode && !selectionHasValidParentNode) {
       return false;
     }
@@ -793,13 +796,18 @@ export function handleParagraphBlockMarks(state, slice) {
     return new Slice(slice.content, openStart, slice.openEnd);
   }
 
-  // If the paragraph contains marks forbidden by the parent node (e.g. alignment/indentation),
-  // drop those marks from the slice
+  // If the paragraph or heading contains marks forbidden by the parent node
+  // (e.g. alignment/indentation), drop those marks from the slice
   return mapSlice(slice, function (node) {
     if (node.type === schema.nodes.paragraph) {
       return schema.nodes.paragraph.createChecked(undefined, node.content, node.marks.filter(function (mark) {
         return !forbiddenMarkTypes.includes(mark.type);
       }));
+    } else if (node.type === schema.nodes.heading) {
+      // Preserve heading attributes to keep formatting
+      return schema.nodes.heading.createChecked(node.attrs, node.content, node.marks.filter(function (mark) {
+        return !forbiddenMarkTypes.includes(mark.type);
+      }));
     }
     return node;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,15 +33,15 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.4.0",
-    "@atlaskit/editor-markdown-transformer": "^5.3.0",
+    "@atlaskit/editor-common": "^78.8.0",
+    "@atlaskit/editor-markdown-transformer": "^5.4.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-annotation": "^1.0.0",
     "@atlaskit/editor-plugin-better-type-history": "^1.0.0",
     "@atlaskit/editor-plugin-card": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-list": "^3.1.0",
-    "@atlaskit/editor-plugin-media": "^1.2.0",
+    "@atlaskit/editor-plugin-media": "^1.4.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-tables": "^2.5.0",
     "@atlaskit/media-client": "^26.2.0",