@atlaskit/editor-plugin-block-controls 3.6.0 → 3.7.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.7.0
+
+### Minor Changes
+
+- [#134661](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134661)
+  [`78fa52a2a4178`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/78fa52a2a4178) -
+  Fix layoutColumn losing breakout mark on re-order
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.6.0
 
 ### Minor Changes

package/dist/cjs/editor-commands/move-to-layout.js

@@ -271,8 +271,12 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
       // if not found, get from source node,
       var breakoutMode = getBreakoutMode(toNode, breakout) || getBreakoutMode(sourceContent, breakout);
 
+      // we don't want to remove marks when moving/re-ordering layoutSection
+      var shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_3'));
+      var fromContentBeforeBreakoutMarksRemoved = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
+
       // remove breakout from source content
-      var fromContentWithoutBreakout = removeBreakoutMarks(tr, $sourceFrom, sourceTo);
+      var fromContentWithoutBreakout = shouldRemoveMarks ? removeBreakoutMarks(tr, $sourceFrom, sourceTo) : fromContentBeforeBreakoutMarksRemoved;
       if (!fromContentWithoutBreakout) {
         return tr;
       }

package/dist/es2019/editor-commands/move-to-layout.js

@@ -263,8 +263,12 @@ export const moveToLayout = api => (from, to, options) => ({
   // if not found, get from source node,
   const breakoutMode = getBreakoutMode(toNode, breakout) || getBreakoutMode(sourceContent, breakout);
 
+  // we don't want to remove marks when moving/re-ordering layoutSection
+  const shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && fg('platform_editor_elements_dnd_multi_select_patch_3'));
+  const fromContentBeforeBreakoutMarksRemoved = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
+
   // remove breakout from source content
-  let fromContentWithoutBreakout = removeBreakoutMarks(tr, $sourceFrom, sourceTo);
+  let fromContentWithoutBreakout = shouldRemoveMarks ? removeBreakoutMarks(tr, $sourceFrom, sourceTo) : fromContentBeforeBreakoutMarksRemoved;
   if (!fromContentWithoutBreakout) {
     return tr;
   }

package/dist/esm/editor-commands/move-to-layout.js

@@ -265,8 +265,12 @@ export var moveToLayout = function moveToLayout(api) {
       // if not found, get from source node,
       var breakoutMode = getBreakoutMode(toNode, breakout) || getBreakoutMode(sourceContent, breakout);
 
+      // we don't want to remove marks when moving/re-ordering layoutSection
+      var shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && fg('platform_editor_elements_dnd_multi_select_patch_3'));
+      var fromContentBeforeBreakoutMarksRemoved = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
+
       // remove breakout from source content
-      var fromContentWithoutBreakout = removeBreakoutMarks(tr, $sourceFrom, sourceTo);
+      var fromContentWithoutBreakout = shouldRemoveMarks ? removeBreakoutMarks(tr, $sourceFrom, sourceTo) : fromContentBeforeBreakoutMarksRemoved;
       if (!fromContentWithoutBreakout) {
         return tr;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.6.0",
+	"version": "3.7.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -53,7 +53,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.0.0",
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.5.0",
+		"@atlaskit/tmp-editor-statsig": "^4.6.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -164,6 +164,9 @@
 		},
 		"platform_editor_controls_patch_1": {
 			"type": "boolean"
+		},
+		"platform_editor_elements_dnd_multi_select_patch_3": {
+			"type": "boolean"
 		}
 	}
 }