@atlaskit/editor-plugin-block-controls 3.3.3 → 3.3.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.3.4
+
+### Patch Changes
+
+- [#122078](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122078)
+  [`b0ffa0b719b38`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b0ffa0b719b38) -
+  [ux] ED-26811 fixing the copy and paste issue for copy and paste
+- Updated dependencies
+
 ## 3.3.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils/getSelection.js

@@ -41,6 +41,16 @@ var isNodeWithMedia = function isNodeWithMedia(tr, start, nodeSize) {
   });
   return hasMedia;
 };
+var isNodeWithMediaOrExtension = function isNodeWithMediaOrExtension(tr, start, nodeSize) {
+  var $startPos = tr.doc.resolve(start);
+  var hasMediaOrExtension = false;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n) {
+    if (['media', 'extension'].includes(n.type.name)) {
+      hasMediaOrExtension = true;
+    }
+  });
+  return hasMediaOrExtension;
+};
 var getSelection = exports.getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
@@ -48,7 +58,8 @@ var getSelection = exports.getSelection = function getSelection(tr, start) {
   var $startPos = tr.doc.resolve(start);
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   var isBlockQuoteWithMedia = nodeName === 'blockquote' && isNodeWithMedia(tr, start, nodeSize);
-  if (isNodeSelection && nodeName !== 'blockquote' || isBlockQuoteWithMedia ||
+  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr, start, nodeSize);
+  if (isNodeSelection && nodeName !== 'blockquote' || ((0, _platformFeatureFlags.fg)('platform_editor_non_macros_copy_and_paste_fix') ? isBlockQuoteWithMediaOrExtension : isBlockQuoteWithMedia) ||
   // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
   ['decisionList', 'layoutColumn'].includes(nodeName || '')) {
     return new _state.NodeSelection($startPos);

package/dist/es2019/pm-plugins/utils/getSelection.js

@@ -35,6 +35,16 @@ const isNodeWithMedia = (tr, start, nodeSize) => {
   });
   return hasMedia;
 };
+const isNodeWithMediaOrExtension = (tr, start, nodeSize) => {
+  const $startPos = tr.doc.resolve(start);
+  let hasMediaOrExtension = false;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, n => {
+    if (['media', 'extension'].includes(n.type.name)) {
+      hasMediaOrExtension = true;
+    }
+  });
+  return hasMediaOrExtension;
+};
 export const getSelection = (tr, start) => {
   const node = tr.doc.nodeAt(start);
   const isNodeSelection = node && NodeSelection.isSelectable(node);
@@ -42,7 +52,8 @@ export const getSelection = (tr, start) => {
   const $startPos = tr.doc.resolve(start);
   const nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   const isBlockQuoteWithMedia = nodeName === 'blockquote' && isNodeWithMedia(tr, start, nodeSize);
-  if (isNodeSelection && nodeName !== 'blockquote' || isBlockQuoteWithMedia ||
+  const isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr, start, nodeSize);
+  if (isNodeSelection && nodeName !== 'blockquote' || (fg('platform_editor_non_macros_copy_and_paste_fix') ? isBlockQuoteWithMediaOrExtension : isBlockQuoteWithMedia) ||
   // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
   ['decisionList', 'layoutColumn'].includes(nodeName || '')) {
     return new NodeSelection($startPos);

package/dist/esm/pm-plugins/utils/getSelection.js

@@ -35,6 +35,16 @@ var isNodeWithMedia = function isNodeWithMedia(tr, start, nodeSize) {
   });
   return hasMedia;
 };
+var isNodeWithMediaOrExtension = function isNodeWithMediaOrExtension(tr, start, nodeSize) {
+  var $startPos = tr.doc.resolve(start);
+  var hasMediaOrExtension = false;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n) {
+    if (['media', 'extension'].includes(n.type.name)) {
+      hasMediaOrExtension = true;
+    }
+  });
+  return hasMediaOrExtension;
+};
 export var getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && NodeSelection.isSelectable(node);
@@ -42,7 +52,8 @@ export var getSelection = function getSelection(tr, start) {
   var $startPos = tr.doc.resolve(start);
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   var isBlockQuoteWithMedia = nodeName === 'blockquote' && isNodeWithMedia(tr, start, nodeSize);
-  if (isNodeSelection && nodeName !== 'blockquote' || isBlockQuoteWithMedia ||
+  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr, start, nodeSize);
+  if (isNodeSelection && nodeName !== 'blockquote' || (fg('platform_editor_non_macros_copy_and_paste_fix') ? isBlockQuoteWithMediaOrExtension : isBlockQuoteWithMedia) ||
   // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
   ['decisionList', 'layoutColumn'].includes(nodeName || '')) {
     return new NodeSelection($startPos);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.3.3",
+	"version": "3.3.4",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -166,6 +166,9 @@
 		},
 		"platform_editor_ease_of_use_metrics": {
 			"type": "boolean"
+		},
+		"platform_editor_non_macros_copy_and_paste_fix": {
+			"type": "boolean"
 		}
 	}
 }