@atlaskit/editor-plugin-paste 1.0.7 → 1.0.8

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.0.8
+
+### Patch Changes
+
+- [#78591](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78591) [`578ff696d240`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/578ff696d240) - ED-22330 Adapted paste logic for empty panels in MBE.
+- Updated dependencies
+
 ## 1.0.7
 
 ### Patch Changes

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

@@ -38,7 +38,8 @@ function insertSliceForLists(_ref) {
   if (panelNode && (0, _util.isEmptyNode)(panelNode) && $from.node() === $to.node()) {
     return (0, _lists.insertSliceInsideOfPanelNodeSelected)(panelNode)({
       tr: tr,
-      slice: slice
+      slice: slice,
+      schema: schema
     });
   }
   if (!$cursor || selectionIsInsideList) {

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

@@ -11,6 +11,8 @@ 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");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function insertSliceIntoEmptyNode(_ref) {
   var tr = _ref.tr,
     slice = _ref.slice;
@@ -69,7 +71,8 @@ function insertSliceIntoRangeSelectionInsideList(_ref4) {
 function insertSliceInsideOfPanelNodeSelected(panelNode) {
   return function (_ref5) {
     var tr = _ref5.tr,
-      slice = _ref5.slice;
+      slice = _ref5.slice,
+      schema = _ref5.schema;
     var selection = tr.selection,
       _tr$selection2 = tr.selection,
       $to = _tr$selection2.$to,
@@ -80,6 +83,16 @@ function insertSliceInsideOfPanelNodeSelected(panelNode) {
     if (panelNode && !panelNode.type.validContent(_model.Fragment.from(slice.content))) {
       var _parentNode$firstChil;
       var insertPosition = $to.pos + 1;
+
+      /* Adapting above logic to handle MBE, as it currently assumes that slice can be safely inserted after the panel node, which is not the case for MBE
+         If insertPosition is in MBE and current slice contains invalid content for MBE, we need to insert the slice after the MBE node
+      */
+      if (schema && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.multi-bodied-extension_0rygg')) {
+        var mbeParentOfPanel = (0, _utils2.findParentNodeOfType)(schema.nodes.multiBodiedExtension)(selection);
+        if (mbeParentOfPanel && !mbeParentOfPanel.node.type.validContent(_model.Fragment.from(slice.content))) {
+          insertPosition = mbeParentOfPanel.start + mbeParentOfPanel.node.nodeSize - 1;
+        }
+      }
       tr.replaceRange(insertPosition, insertPosition, slice);
       // need to delete the empty paragraph at the top of the panel
       var parentNode = tr.doc.resolve($from.before()).node();

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

@@ -34,7 +34,8 @@ export function insertSliceForLists({
   if (panelNode && isEmptyNode(panelNode) && $from.node() === $to.node()) {
     return insertSliceInsideOfPanelNodeSelected(panelNode)({
       tr,
-      slice
+      slice,
+      schema
     });
   }
   if (!$cursor || selectionIsInsideList) {

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

@@ -2,6 +2,8 @@ import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Transform } from '@atlaskit/editor-prosemirror/transform';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export function insertSliceIntoEmptyNode({
   tr,
   slice
@@ -69,7 +71,8 @@ export function insertSliceIntoRangeSelectionInsideList({
 export function insertSliceInsideOfPanelNodeSelected(panelNode) {
   return ({
     tr,
-    slice
+    slice,
+    schema
   }) => {
     const {
       selection,
@@ -85,7 +88,17 @@ export function insertSliceInsideOfPanelNodeSelected(panelNode) {
     // if content of slice isn't valid for a panel node, insert the invalid node and following content after
     if (panelNode && !panelNode.type.validContent(Fragment.from(slice.content))) {
       var _parentNode$firstChil;
-      const insertPosition = $to.pos + 1;
+      let insertPosition = $to.pos + 1;
+
+      /* Adapting above logic to handle MBE, as it currently assumes that slice can be safely inserted after the panel node, which is not the case for MBE
+         If insertPosition is in MBE and current slice contains invalid content for MBE, we need to insert the slice after the MBE node
+      */
+      if (schema && getBooleanFF('platform.editor.multi-bodied-extension_0rygg')) {
+        const mbeParentOfPanel = findParentNodeOfType(schema.nodes.multiBodiedExtension)(selection);
+        if (mbeParentOfPanel && !mbeParentOfPanel.node.type.validContent(Fragment.from(slice.content))) {
+          insertPosition = mbeParentOfPanel.start + mbeParentOfPanel.node.nodeSize - 1;
+        }
+      }
       tr.replaceRange(insertPosition, insertPosition, slice);
       // need to delete the empty paragraph at the top of the panel
       const parentNode = tr.doc.resolve($from.before()).node();

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

@@ -29,7 +29,8 @@ export function insertSliceForLists(_ref) {
   if (panelNode && isEmptyNode(panelNode) && $from.node() === $to.node()) {
     return insertSliceInsideOfPanelNodeSelected(panelNode)({
       tr: tr,
-      slice: slice
+      slice: slice,
+      schema: schema
     });
   }
   if (!$cursor || selectionIsInsideList) {

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

@@ -2,6 +2,8 @@ import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Transform } from '@atlaskit/editor-prosemirror/transform';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export function insertSliceIntoEmptyNode(_ref) {
   var tr = _ref.tr,
     slice = _ref.slice;
@@ -60,7 +62,8 @@ export function insertSliceIntoRangeSelectionInsideList(_ref4) {
 export function insertSliceInsideOfPanelNodeSelected(panelNode) {
   return function (_ref5) {
     var tr = _ref5.tr,
-      slice = _ref5.slice;
+      slice = _ref5.slice,
+      schema = _ref5.schema;
     var selection = tr.selection,
       _tr$selection2 = tr.selection,
       $to = _tr$selection2.$to,
@@ -71,6 +74,16 @@ export function insertSliceInsideOfPanelNodeSelected(panelNode) {
     if (panelNode && !panelNode.type.validContent(Fragment.from(slice.content))) {
       var _parentNode$firstChil;
       var insertPosition = $to.pos + 1;
+
+      /* Adapting above logic to handle MBE, as it currently assumes that slice can be safely inserted after the panel node, which is not the case for MBE
+         If insertPosition is in MBE and current slice contains invalid content for MBE, we need to insert the slice after the MBE node
+      */
+      if (schema && getBooleanFF('platform.editor.multi-bodied-extension_0rygg')) {
+        var mbeParentOfPanel = findParentNodeOfType(schema.nodes.multiBodiedExtension)(selection);
+        if (mbeParentOfPanel && !mbeParentOfPanel.node.type.validContent(Fragment.from(slice.content))) {
+          insertPosition = mbeParentOfPanel.start + mbeParentOfPanel.node.nodeSize - 1;
+        }
+      }
       tr.replaceRange(insertPosition, insertPosition, slice);
       // need to delete the empty paragraph at the top of the panel
       var parentNode = tr.doc.resolve($from.before()).node();

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

@@ -1,4 +1,4 @@
-import type { Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function insertSliceIntoEmptyNode({ tr, slice, }: {
     tr: Transaction;
@@ -12,7 +12,8 @@ export declare function insertSliceIntoRangeSelectionInsideList({ tr, slice, }:
     tr: Transaction;
     slice: Slice;
 }): Transaction | undefined;
-export declare function insertSliceInsideOfPanelNodeSelected(panelNode: PMNode): ({ tr, slice }: {
+export declare function insertSliceInsideOfPanelNodeSelected(panelNode: PMNode): ({ tr, slice, schema, }: {
     tr: Transaction;
     slice: Slice;
+    schema?: Schema<any, any> | undefined;
 }) => void;

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

@@ -1,4 +1,4 @@
-import type { Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function insertSliceIntoEmptyNode({ tr, slice, }: {
     tr: Transaction;
@@ -12,7 +12,8 @@ export declare function insertSliceIntoRangeSelectionInsideList({ tr, slice, }:
     tr: Transaction;
     slice: Slice;
 }): Transaction | undefined;
-export declare function insertSliceInsideOfPanelNodeSelected(panelNode: PMNode): ({ tr, slice }: {
+export declare function insertSliceInsideOfPanelNodeSelected(panelNode: PMNode): ({ tr, slice, schema, }: {
     tr: Transaction;
     slice: Slice;
+    schema?: Schema<any, any> | undefined;
 }) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "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.10.0",
+    "@atlaskit/editor-common": "^78.11.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-annotation": "^1.1.0",
     "@atlaskit/editor-plugin-better-type-history": "^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.6.0",
+    "@atlaskit/editor-plugin-media": "^1.7.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-tables": "^2.5.0",
     "@atlaskit/media-client": "^26.2.0",
@@ -131,6 +131,9 @@
     },
     "platform.editor.place-cursor-inside-text-block": {
       "type": "boolean"
+    },
+    "platform.editor.multi-bodied-extension_0rygg": {
+      "type": "boolean"
     }
   }
 }