@atlaskit/editor-plugin-block-controls 7.7.8 → 7.7.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.7.9
+
+### Patch Changes
+
+- [`ae4f9cd8ff5f7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ae4f9cd8ff5f7) -
+  [ux] [EDITOR-2757] Remove breakout mark when drag and drop node in bodiedSyncBlock
+- Updated dependencies
+
 ## 7.7.8
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-node.js

@@ -18,6 +18,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _main = require("../pm-plugins/main");
@@ -313,7 +314,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
     var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _analytics.INPUT_METHOD.DRAG_AND_DROP;
     var formatMessage = arguments.length > 3 ? arguments[3] : undefined;
     return function (_ref7) {
-      var _api$blockControls$co, _api$accessibilityUti;
+      var _convertedNodeSlice, _api$blockControls$co, _api$accessibilityUti;
       var tr = _ref7.tr;
       if (!api || start < 0 || to < 0) {
         return tr;
@@ -350,7 +351,8 @@ var moveNode = exports.moveNode = function moveNode(api) {
       var $to = tr.doc.resolve(to);
       var $handlePos = tr.doc.resolve(start);
       var nodeCopy = tr.doc.slice(sliceFrom, sliceTo, false); // cut the content
-      var destType = $to.node().type;
+      var destNode = $to.node();
+      var destType = destNode.type;
       var destParent = $to.node($to.depth);
       var sourceNode = $handlePos.nodeAfter;
 
@@ -379,7 +381,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
         return tr;
       }
       var convertedNodeSlice = transformSourceSlice(nodeCopy, destType);
-      var convertedNode = convertedNodeSlice === null || convertedNodeSlice === void 0 ? void 0 : convertedNodeSlice.content;
+      var convertedNode = (_convertedNodeSlice = convertedNodeSlice) === null || _convertedNodeSlice === void 0 ? void 0 : _convertedNodeSlice.content;
       if (!convertedNode) {
         return tr;
       }
@@ -387,6 +389,20 @@ var moveNode = exports.moveNode = function moveNode(api) {
         sliceFrom = sliceFrom - 1;
       }
 
+      // Currently we don't support breakout mark for children nodes of bodiedSyncBlock node
+      // Hence strip out the mark for now
+      if (destNode.type.name === 'bodiedSyncBlock' && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true)) {
+        var _convertedNodeSlice2;
+        var nodes = [];
+        (_convertedNodeSlice2 = convertedNodeSlice) === null || _convertedNodeSlice2 === void 0 || _convertedNodeSlice2.content.forEach(function (node) {
+          nodes.push(node.mark(node.marks.filter(function (mark) {
+            return mark.type.name !== 'breakout';
+          })));
+        });
+        convertedNodeSlice = new _model.Slice(_model.Fragment.from(nodes), 0, 0);
+        convertedNode = convertedNodeSlice.content;
+      }
+
       // delete the content from the original position
       tr.delete(sliceFrom, sliceTo);
       var mappedTo = tr.mapping.map(to);

package/dist/es2019/editor-commands/move-node.js

@@ -5,11 +5,12 @@ import { expandSelectionBounds, GapCursorSelection } from '@atlaskit/editor-comm
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
@@ -315,7 +316,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
 export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_DROP, formatMessage) => ({
   tr
 }) => {
-  var _api$blockControls$co2, _api$accessibilityUti;
+  var _convertedNodeSlice, _api$blockControls$co2, _api$accessibilityUti;
   if (!api || start < 0 || to < 0) {
     return tr;
   }
@@ -352,7 +353,8 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   const $to = tr.doc.resolve(to);
   const $handlePos = tr.doc.resolve(start);
   const nodeCopy = tr.doc.slice(sliceFrom, sliceTo, false); // cut the content
-  const destType = $to.node().type;
+  const destNode = $to.node();
+  const destType = destNode.type;
   const destParent = $to.node($to.depth);
   const sourceNode = $handlePos.nodeAfter;
 
@@ -380,8 +382,8 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   if (!canMoveNodeToIndex(destParent, $to.index(), $handlePos.node().child($handlePos.index()), $to)) {
     return tr;
   }
-  const convertedNodeSlice = transformSourceSlice(nodeCopy, destType);
-  const convertedNode = convertedNodeSlice === null || convertedNodeSlice === void 0 ? void 0 : convertedNodeSlice.content;
+  let convertedNodeSlice = transformSourceSlice(nodeCopy, destType);
+  let convertedNode = (_convertedNodeSlice = convertedNodeSlice) === null || _convertedNodeSlice === void 0 ? void 0 : _convertedNodeSlice.content;
   if (!convertedNode) {
     return tr;
   }
@@ -389,6 +391,18 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     sliceFrom = sliceFrom - 1;
   }
 
+  // Currently we don't support breakout mark for children nodes of bodiedSyncBlock node
+  // Hence strip out the mark for now
+  if (destNode.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true)) {
+    var _convertedNodeSlice2;
+    const nodes = [];
+    (_convertedNodeSlice2 = convertedNodeSlice) === null || _convertedNodeSlice2 === void 0 ? void 0 : _convertedNodeSlice2.content.forEach(node => {
+      nodes.push(node.mark(node.marks.filter(mark => mark.type.name !== 'breakout')));
+    });
+    convertedNodeSlice = new Slice(Fragment.from(nodes), 0, 0);
+    convertedNode = convertedNodeSlice.content;
+  }
+
   // delete the content from the original position
   tr.delete(sliceFrom, sliceTo);
   const mappedTo = tr.mapping.map(to);

package/dist/esm/editor-commands/move-node.js

@@ -8,11 +8,12 @@ import { expandSelectionBounds, GapCursorSelection } from '@atlaskit/editor-comm
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
@@ -307,7 +308,7 @@ export var moveNode = function moveNode(api) {
     var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : INPUT_METHOD.DRAG_AND_DROP;
     var formatMessage = arguments.length > 3 ? arguments[3] : undefined;
     return function (_ref7) {
-      var _api$blockControls$co, _api$accessibilityUti;
+      var _convertedNodeSlice, _api$blockControls$co, _api$accessibilityUti;
       var tr = _ref7.tr;
       if (!api || start < 0 || to < 0) {
         return tr;
@@ -344,7 +345,8 @@ export var moveNode = function moveNode(api) {
       var $to = tr.doc.resolve(to);
       var $handlePos = tr.doc.resolve(start);
       var nodeCopy = tr.doc.slice(sliceFrom, sliceTo, false); // cut the content
-      var destType = $to.node().type;
+      var destNode = $to.node();
+      var destType = destNode.type;
       var destParent = $to.node($to.depth);
       var sourceNode = $handlePos.nodeAfter;
 
@@ -373,7 +375,7 @@ export var moveNode = function moveNode(api) {
         return tr;
       }
       var convertedNodeSlice = transformSourceSlice(nodeCopy, destType);
-      var convertedNode = convertedNodeSlice === null || convertedNodeSlice === void 0 ? void 0 : convertedNodeSlice.content;
+      var convertedNode = (_convertedNodeSlice = convertedNodeSlice) === null || _convertedNodeSlice === void 0 ? void 0 : _convertedNodeSlice.content;
       if (!convertedNode) {
         return tr;
       }
@@ -381,6 +383,20 @@ export var moveNode = function moveNode(api) {
         sliceFrom = sliceFrom - 1;
       }
 
+      // Currently we don't support breakout mark for children nodes of bodiedSyncBlock node
+      // Hence strip out the mark for now
+      if (destNode.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true)) {
+        var _convertedNodeSlice2;
+        var nodes = [];
+        (_convertedNodeSlice2 = convertedNodeSlice) === null || _convertedNodeSlice2 === void 0 || _convertedNodeSlice2.content.forEach(function (node) {
+          nodes.push(node.mark(node.marks.filter(function (mark) {
+            return mark.type.name !== 'breakout';
+          })));
+        });
+        convertedNodeSlice = new Slice(Fragment.from(nodes), 0, 0);
+        convertedNode = convertedNodeSlice.content;
+      }
+
       // delete the content from the original position
       tr.delete(sliceFrom, sliceTo);
       var mappedTo = tr.mapping.map(to);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.7.8",
+	"version": "7.7.9",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -52,10 +52,10 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
-		"@atlaskit/primitives": "^16.2.0",
+		"@atlaskit/primitives": "^16.3.0",
 		"@atlaskit/theme": "^21.0.0",
 		"@atlaskit/tmp-editor-statsig": "^13.42.0",
-		"@atlaskit/tokens": "^8.2.0",
+		"@atlaskit/tokens": "^8.3.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",