@atlaskit/editor-plugin-paste 1.0.5 → 1.0.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.0.7
+
+### Patch Changes
+
+- [#78224](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78224) [`6b4c9dd4ad34`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6b4c9dd4ad34) - ED-22219: adf-schema updated to 35.5.2
+- [#76560](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76560) [`ecab0d093882`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ecab0d093882) - Fixed misplaced cursor positon when code block is pasted into extended nested expand
+- [#78176](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78176) [`7482f69bb25f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7482f69bb25f) - ED-21833: Stop showing paste options toolbar for smart links
+- Updated dependencies
+
+## 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

package/dist/cjs/handlers.js

@@ -818,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;
   });
@@ -926,7 +931,12 @@ function handleRichText(slice, queueCardsFromChangedTr) {
         // need to make sure the cursor position is is right after the panel, expand, or decisionList
         // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
         var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
-        if ((0, _utils.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
+        var lastChild = slice.content.lastChild;
+        var $nextPos = tr.doc.resolve(tr.mapping.map(selection.from));
+        var nextSelection = lastChild !== null && lastChild !== void 0 && lastChild.type.isTextblock ? _state.TextSelection.findFrom($nextPos, -1, true) : new _selection.GapCursorSelection($nextPos, _selection.Side.RIGHT);
+        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.place-cursor-inside-text-block') && nextSelection) {
+          tr.setSelection(nextSelection);
+        } else if ((0, _utils.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
           var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
           tr.setSelection(new _selection.GapCursorSelection(nextPos, _selection.Side.RIGHT));
         }

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

@@ -207,7 +207,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         }
         // creating a custom dispatch because we want to add a meta whenever we do a paste.
         var dispatch = function dispatch(tr) {
-          var _state$doc$resolve$no, _input;
+          var _state$doc$resolve$no;
           // https://product-fabric.atlassian.net/browse/ED-12633
           // don't add closeHistory call if we're pasting a text inside placeholder text as we want the whole action
           // to be atomic
@@ -238,28 +238,36 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }
+          var isDocChanged = tr.docChanged;
           (0, _card.addLinkMetadata)(view.state.selection, tr, {
             action: isPlainText ? _analytics.ACTION.PASTED_AS_PLAIN : _analytics.ACTION.PASTED,
             inputMethod: _analytics.INPUT_METHOD.CLIPBOARD
           });
-          var pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
-          var pasteEndPos = tr.selection.to;
-          var contentPasted = {
-            pasteStartPos: pasteStartPos,
-            pasteEndPos: pasteEndPos,
-            text: text,
-            isShiftPressed: Boolean(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
-            isPlainText: Boolean(isPlainText),
-            pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
-            pastedAt: Date.now(),
-            pasteSource: (0, _util.getPasteSource)(event)
-          };
-          tr.setMeta(_pluginFactory.pluginKey, {
-            type: _actions.PastePluginActionTypes.ON_PASTE,
-            contentPasted: contentPasted
-          });
+
+          // handleMacroAutoConvert dispatches twice
+          // we make sure to call paste options toolbar
+          // only for a valid paste action
+          if (isDocChanged) {
+            var _input;
+            var pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
+            var pasteEndPos = tr.selection.to;
+            var contentPasted = {
+              pasteStartPos: pasteStartPos,
+              pasteEndPos: pasteEndPos,
+              text: text,
+              isShiftPressed: Boolean(
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
+              isPlainText: Boolean(isPlainText),
+              pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
+              pastedAt: Date.now(),
+              pasteSource: (0, _util.getPasteSource)(event)
+            };
+            tr.setMeta(_pluginFactory.pluginKey, {
+              type: _actions.PastePluginActionTypes.ON_PASTE,
+              contentPasted: contentPasted
+            });
+          }
           view.dispatch(tr);
         };
         slice = (0, _handlers.handleParagraphBlockMarks)(state, slice);

package/dist/es2019/handlers.js

@@ -796,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;
   });
@@ -905,7 +908,12 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         // need to make sure the cursor position is is right after the panel, expand, or decisionList
         // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
         const shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : (_slice$content$lastCh2 = _slice$content$lastCh.type) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.name) || '');
-        if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
+        const lastChild = slice.content.lastChild;
+        const $nextPos = tr.doc.resolve(tr.mapping.map(selection.from));
+        const nextSelection = lastChild !== null && lastChild !== void 0 && lastChild.type.isTextblock ? TextSelection.findFrom($nextPos, -1, true) : new GapCursorSelection($nextPos, Side.RIGHT);
+        if (getBooleanFF('platform.editor.place-cursor-inside-text-block') && nextSelection) {
+          tr.setSelection(nextSelection);
+        } else if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
           const nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
           tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
         }

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

@@ -174,7 +174,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
         // creating a custom dispatch because we want to add a meta whenever we do a paste.
         const dispatch = tr => {
-          var _state$doc$resolve$no, _input;
+          var _state$doc$resolve$no;
           // https://product-fabric.atlassian.net/browse/ED-12633
           // don't add closeHistory call if we're pasting a text inside placeholder text as we want the whole action
           // to be atomic
@@ -207,28 +207,36 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }
+          const isDocChanged = tr.docChanged;
           addLinkMetadata(view.state.selection, tr, {
             action: isPlainText ? ACTION.PASTED_AS_PLAIN : ACTION.PASTED,
             inputMethod: INPUT_METHOD.CLIPBOARD
           });
-          const pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
-          const pasteEndPos = tr.selection.to;
-          const contentPasted = {
-            pasteStartPos,
-            pasteEndPos,
-            text,
-            isShiftPressed: Boolean(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
-            isPlainText: Boolean(isPlainText),
-            pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
-            pastedAt: Date.now(),
-            pasteSource: getPasteSource(event)
-          };
-          tr.setMeta(stateKey, {
-            type: PastePluginActionTypes.ON_PASTE,
-            contentPasted
-          });
+
+          // handleMacroAutoConvert dispatches twice
+          // we make sure to call paste options toolbar
+          // only for a valid paste action
+          if (isDocChanged) {
+            var _input;
+            const pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
+            const pasteEndPos = tr.selection.to;
+            const contentPasted = {
+              pasteStartPos,
+              pasteEndPos,
+              text,
+              isShiftPressed: Boolean(
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
+              isPlainText: Boolean(isPlainText),
+              pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
+              pastedAt: Date.now(),
+              pasteSource: getPasteSource(event)
+            };
+            tr.setMeta(stateKey, {
+              type: PastePluginActionTypes.ON_PASTE,
+              contentPasted
+            });
+          }
           view.dispatch(tr);
         };
         slice = handleParagraphBlockMarks(state, slice);

package/dist/esm/handlers.js

@@ -796,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;
   });
@@ -904,7 +909,12 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         // need to make sure the cursor position is is right after the panel, expand, or decisionList
         // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
         var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
-        if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
+        var lastChild = slice.content.lastChild;
+        var $nextPos = tr.doc.resolve(tr.mapping.map(selection.from));
+        var nextSelection = lastChild !== null && lastChild !== void 0 && lastChild.type.isTextblock ? TextSelection.findFrom($nextPos, -1, true) : new GapCursorSelection($nextPos, Side.RIGHT);
+        if (getBooleanFF('platform.editor.place-cursor-inside-text-block') && nextSelection) {
+          tr.setSelection(nextSelection);
+        } else if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
           var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
           tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
         }

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

@@ -194,7 +194,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
         // creating a custom dispatch because we want to add a meta whenever we do a paste.
         var dispatch = function dispatch(tr) {
-          var _state$doc$resolve$no, _input;
+          var _state$doc$resolve$no;
           // https://product-fabric.atlassian.net/browse/ED-12633
           // don't add closeHistory call if we're pasting a text inside placeholder text as we want the whole action
           // to be atomic
@@ -225,28 +225,36 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }
+          var isDocChanged = tr.docChanged;
           addLinkMetadata(view.state.selection, tr, {
             action: isPlainText ? ACTION.PASTED_AS_PLAIN : ACTION.PASTED,
             inputMethod: INPUT_METHOD.CLIPBOARD
           });
-          var pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
-          var pasteEndPos = tr.selection.to;
-          var contentPasted = {
-            pasteStartPos: pasteStartPos,
-            pasteEndPos: pasteEndPos,
-            text: text,
-            isShiftPressed: Boolean(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
-            isPlainText: Boolean(isPlainText),
-            pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
-            pastedAt: Date.now(),
-            pasteSource: getPasteSource(event)
-          };
-          tr.setMeta(stateKey, {
-            type: PastePluginActionTypes.ON_PASTE,
-            contentPasted: contentPasted
-          });
+
+          // handleMacroAutoConvert dispatches twice
+          // we make sure to call paste options toolbar
+          // only for a valid paste action
+          if (isDocChanged) {
+            var _input;
+            var pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
+            var pasteEndPos = tr.selection.to;
+            var contentPasted = {
+              pasteStartPos: pasteStartPos,
+              pasteEndPos: pasteEndPos,
+              text: text,
+              isShiftPressed: Boolean(
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
+              isPlainText: Boolean(isPlainText),
+              pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
+              pastedAt: Date.now(),
+              pasteSource: getPasteSource(event)
+            };
+            tr.setMeta(stateKey, {
+              type: PastePluginActionTypes.ON_PASTE,
+              contentPasted: contentPasted
+            });
+          }
           view.dispatch(tr);
         };
         slice = handleParagraphBlockMarks(state, slice);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "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.10.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-card": "^1.1.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.6.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-tables": "^2.5.0",
     "@atlaskit/media-client": "^26.2.0",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@af/visual-regression": "*",
-    "@atlaskit/adf-schema": "^35.5.1",
+    "@atlaskit/adf-schema": "^35.5.2",
     "@atlaskit/editor-plugin-block-type": "^3.0.0",
     "@atlaskit/editor-plugin-history": "^1.0.0",
     "@atlaskit/editor-plugin-type-ahead": "^1.0.0",
@@ -128,6 +128,9 @@
     },
     "platform.editor.handle-paste-for-action-in-panel": {
       "type": "boolean"
+    },
+    "platform.editor.place-cursor-inside-text-block": {
+      "type": "boolean"
     }
   }
 }