@atlaskit/editor-plugin-block-controls 11.2.10 → 11.2.11

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 11.2.11
+
+### Patch Changes
+
+- [`ab837b5646256`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ab837b5646256) -
+  [ux] EDITOR-6274 Clean up platform_editor_element_drag_and_drop_multiselect
+- Updated dependencies
+
 ## 11.2.10
 
 ### Patch Changes

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

@@ -126,7 +126,6 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
   return function (state) {
     var selection = state.selection;
     var isParentNodeOfTypeLayout = !!(0, _utils2.findParentNodeOfType)([state.schema.nodes.layoutSection])(state.selection);
-    var isMultiSelectEnabled = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
     var expandedSelection = (0, _selection.expandSelectionBounds)(selection.$anchor, selection.$head);
     var expandedAnchor = expandedSelection.$anchor.pos;
     var expandedHead = expandedSelection.$head.pos;
@@ -137,11 +136,11 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
       var LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
-    var currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from : getCurrentNodePos(state);
+    var currentNodePos = !getFocusedHandle(state) && !selection.empty ? hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from : getCurrentNodePos(state);
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       var $currentNodePos = state.doc.resolve(currentNodePos);
-      var nodeAfterPos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      var nodeAfterPos = !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
       var isTopLevelNode = $currentNodePos.depth === 0;
       var moveToPos = -1;
       var isLayoutColumnSelected = selection instanceof _state.NodeSelection && selection.node.type.name === 'layoutColumn';
@@ -282,20 +281,10 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
           return tr;
         });
         return true;
-      } else if (nodeType && !isMultiSelectEnabled) {
+      } else {
         var _api$core8;
-        // If the node is first/last one, only select the node
         api === null || api === void 0 || (_api$core8 = api.core) === null || _api$core8 === void 0 || _api$core8.actions.execute(function (_ref5) {
           var tr = _ref5.tr;
-          (0, _getSelection.selectNode)(tr, currentNodePos, nodeType, api);
-          tr.scrollIntoView();
-          return tr;
-        });
-        return true;
-      } else if (isMultiSelectEnabled) {
-        var _api$core9;
-        api === null || api === void 0 || (_api$core9 = api.core) === null || _api$core9 === void 0 || _api$core9.actions.execute(function (_ref6) {
-          var tr = _ref6.tr;
           api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
             tr: tr
           });
@@ -312,9 +301,9 @@ var moveNode = exports.moveNode = function moveNode(api) {
   return function (start, to) {
     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) {
+    return function (_ref6) {
       var _api$blockControls$sh, _convertedNodeSlice, _api$accessibilityUti;
-      var tr = _ref7.tr;
+      var tr = _ref6.tr;
       if (!api || start < 0 || to < 0) {
         return tr;
       }
@@ -325,7 +314,6 @@ var moveNode = exports.moveNode = function moveNode(api) {
       var sliceFrom = start;
       var sliceTo;
       var sourceNodeTypes, hasSelectedMultipleNodes;
-      var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
       if ((0, _platformFeatureFlags.fg)('platform_editor_ease_of_use_metrics')) {
         var _api$metrics;
         api === null || api === void 0 || (_api$metrics = api.metrics) === null || _api$metrics === void 0 || _api$metrics.commands.setContentMoved()({
@@ -341,17 +329,13 @@ var moveNode = exports.moveNode = function moveNode(api) {
         var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, sliceFrom, sliceTo);
         hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
         sourceNodeTypes = attributes.nodeTypes;
-      } else if (isMultiSelect) {
+      } else {
         var slicePosition = (0, _selection2.getSelectedSlicePosition)(start, tr, api);
         sliceFrom = slicePosition.from;
         sliceTo = slicePosition.to;
         var _attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, sliceFrom, sliceTo);
         hasSelectedMultipleNodes = _attributes.hasSelectedMultipleNodes;
         sourceNodeTypes = _attributes.nodeTypes;
-      } else {
-        var _handleNode$nodeSize;
-        var size = (_handleNode$nodeSize = handleNode === null || handleNode === void 0 ? void 0 : handleNode.nodeSize) !== null && _handleNode$nodeSize !== void 0 ? _handleNode$nodeSize : 1;
-        sliceTo = sliceFrom + size;
       }
       var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
         expand = _tr$doc$type$schema$n.expand,
@@ -428,13 +412,11 @@ var moveNode = exports.moveNode = function moveNode(api) {
         tr.setMeta(_main.key, _objectSpread(_objectSpread({}, _currMeta), {}, {
           preservedSelectionMapping: new _transform.Mapping([new _transform.StepMap([0, 0, nodeMovedOffset])])
         }));
-      } else if (isMultiSelect) {
+      } else {
         var _api$blockControls$co;
         tr = (_api$blockControls$co = api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(mappedTo, mappedTo + sliceSize)({
           tr: tr
         })) !== null && _api$blockControls$co !== void 0 ? _api$blockControls$co : tr;
-      } else {
-        tr = (0, _getSelection.selectNode)(tr, mappedTo, handleNode.type.name, api);
       }
       var currMeta = tr.getMeta(_main.key);
       tr.setMeta(_main.key, _objectSpread(_objectSpread({}, currMeta), {}, {
@@ -455,7 +437,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
         }
       }
       if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
-        (0, _analytics2.attachMoveNodeAnalytics)(tr, inputMethod, $handlePos.depth, handleNode.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $handlePos.sameParent($mappedTo), api, sourceNodeTypes, hasSelectedMultipleNodes);
+        (0, _analytics2.attachMoveNodeAnalytics)(tr, inputMethod, $handlePos.depth, sourceNodeTypes, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $handlePos.sameParent($mappedTo), api, hasSelectedMultipleNodes);
       } else {
         var _api$analytics;
         api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
@@ -463,16 +445,14 @@ var moveNode = exports.moveNode = function moveNode(api) {
           action: _analytics.ACTION.MOVED,
           actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
           actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-          attributes: _objectSpread({
+          attributes: {
             nodeDepth: $handlePos.depth,
-            nodeType: handleNode.type.name,
+            nodeTypes: sourceNodeTypes,
             destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
             destinationNodeType: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name,
-            inputMethod: inputMethod
-          }, isMultiSelect && {
-            sourceNodeTypes: sourceNodeTypes,
+            inputMethod: inputMethod,
             hasSelectedMultipleNodes: hasSelectedMultipleNodes
-          })
+          }
         })(tr);
       }
       var movedMessage = to > sliceFrom ? _messages.blockControlsMessages.movedDown : _messages.blockControlsMessages.movedup;

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

@@ -46,26 +46,11 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
 };
 var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceContent, from, to, tr, $originalFrom, $originalTo, api, selectMovedNode) {
   var isSameLayout = (0, _validation.isInSameLayout)($originalFrom, $originalTo);
-  var sourceContentEndPos = -1;
-  var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
-  var sourceNodeTypes, hasSelectedMultipleNodes;
-  if (isMultiSelect) {
-    if (sourceContent instanceof _model.Fragment) {
-      sourceContentEndPos = from + sourceContent.size;
-      var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, from, sourceContentEndPos);
-      hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-      sourceNodeTypes = attributes.nodeTypes;
-    }
-  } else {
-    if (sourceContent instanceof _model.Node) {
-      sourceContentEndPos = from + sourceContent.nodeSize;
-    }
-  }
-  if (sourceContentEndPos === -1) {
-    return tr;
-  }
+  var sourceContentEndPos = from + sourceContent.size;
+  var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, from, sourceContentEndPos);
+  var sourceNodeTypes = attributes.nodeTypes,
+    hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
   if (isSameLayout) {
-    var _$originalFrom$nodeAf;
     // reorder columns
     tr.delete(from, sourceContentEndPos);
     var mappedTo = tr.mapping.map(to);
@@ -73,12 +58,11 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
     if (selectMovedNode) {
       tr.setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
     }
-    (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api, sourceNodeTypes, hasSelectedMultipleNodes);
+    (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', true, api, hasSelectedMultipleNodes);
   } else if (toLayout.childCount < (0, _consts.maxLayoutColumnSupported)()) {
-    var _$originalFrom$nodeAf2;
     (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(from), sourceContentEndPos);
     insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
-    (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api, sourceNodeTypes, hasSelectedMultipleNodes);
+    (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', false, api, hasSelectedMultipleNodes);
   }
   return tr;
 };
@@ -96,22 +80,11 @@ var insertToDestinationNoWidthUpdate = function insertToDestinationNoWidthUpdate
     layoutColumn = _ref2.layoutColumn;
   var content = null;
   try {
-    if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-      if (sourceContent instanceof _model.Fragment) {
-        var _sourceFragment$first;
-        var sourceFragment = sourceContent;
-        content = layoutColumn.createChecked({
-          width: 0
-        }, (0, _checkFragment.isFragmentOfType)(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
-      }
-    } else {
-      if (sourceContent instanceof _model.Node) {
-        var sourceNode = sourceContent;
-        content = layoutColumn.createChecked({
-          width: 0
-        }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
-      }
-    }
+    var _sourceFragment$first;
+    var sourceFragment = sourceContent;
+    content = layoutColumn.createChecked({
+      width: 0
+    }, (0, _checkFragment.isFragmentOfType)(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
   } catch (error) {
     (0, _monitoring.logException)(error, {
       location: 'editor-plugin-block-controls/move-to-layout'
@@ -154,7 +127,6 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
     return;
   }
   var $from = tr.doc.resolve(from);
-  var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
 
   // invalid from position or dragging a layout
   if (!$from.nodeAfter || $from.nodeAfter.type === layoutSection) {
@@ -163,7 +135,7 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
   var sourceContent = $from.nodeAfter;
   var sourceFrom = from;
   var sourceTo = from + sourceContent.nodeSize;
-  if (isMultiSelect && !moveNodeAtCursorPos) {
+  if (!moveNodeAtCursorPos) {
     var _getMultiSelectionIfP = (0, _selection.getMultiSelectionIfPosInside)(api, from),
       anchor = _getMultiSelectionIfP.anchor,
       head = _getMultiSelectionIfP.head;
@@ -190,71 +162,51 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
   };
 };
 var removeBreakoutMarks = function removeBreakoutMarks(tr, $from, to) {
-  var fromContentWithoutBreakout = $from.nodeAfter;
+  var fromContentWithoutBreakout = null;
   var _ref4 = tr.doc.type.schema.marks || {},
     breakout = _ref4.breakout;
-  if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-    tr.doc.nodesBetween($from.pos, to, function (node, pos, parent) {
-      // should never remove breakout from previous layoutSection
-      if ((0, _expValEquals.expValEquals)('platform_editor_breakout_resizing', 'isEnabled', true)) {
-        if (node.type.name === 'layoutSection') {
-          return false;
-        }
-      }
-
-      // breakout doesn't exist on nested nodes
-      if ((parent === null || parent === void 0 ? void 0 : parent.type.name) === 'doc' && node.marks.some(function (m) {
-        return m.type === breakout;
-      })) {
-        tr.removeNodeMark(pos, breakout);
+  tr.doc.nodesBetween($from.pos, to, function (node, pos, parent) {
+    // should never remove breakout from previous layoutSection
+    if ((0, _expValEquals.expValEquals)('platform_editor_breakout_resizing', 'isEnabled', true)) {
+      if (node.type.name === 'layoutSection') {
+        return false;
       }
+    }
 
-      // descending is not needed as  breakout doesn't exist on nested nodes
-      return false;
-    });
-    // resolve again the source content after node updated (remove breakout marks)
-    fromContentWithoutBreakout = tr.doc.slice($from.pos, to).content;
-  } else {
-    if (breakout && $from.nodeAfter && $from.nodeAfter.marks.some(function (m) {
+    // breakout doesn't exist on nested nodes
+    if ((parent === null || parent === void 0 ? void 0 : parent.type.name) === 'doc' && node.marks.some(function (m) {
       return m.type === breakout;
     })) {
-      tr.removeNodeMark($from.pos, breakout);
-      // resolve again the source node after node updated (remove breakout marks)
-      fromContentWithoutBreakout = tr.doc.resolve($from.pos).nodeAfter;
+      tr.removeNodeMark(pos, breakout);
     }
-  }
+
+    // descending is not needed as  breakout doesn't exist on nested nodes
+    return false;
+  });
+  // resolve again the source content after node updated (remove breakout marks)
+  fromContentWithoutBreakout = tr.doc.slice($from.pos, to).content;
   return fromContentWithoutBreakout;
 };
 var getBreakoutMode = function getBreakoutMode(content, breakout) {
-  if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-    if (content instanceof _model.Node) {
-      var _content$marks$find;
-      return (_content$marks$find = content.marks.find(function (m) {
+  if (content instanceof _model.Node) {
+    var _content$marks$find;
+    return (_content$marks$find = content.marks.find(function (m) {
+      return m.type === breakout;
+    })) === null || _content$marks$find === void 0 ? void 0 : _content$marks$find.attrs.mode;
+  } else if (content instanceof _model.Fragment) {
+    // Find the first breakout mode in the fragment
+    var firstBreakoutMode;
+    for (var i = 0; i < content.childCount; i++) {
+      var child = content.child(i);
+      var breakoutMark = child.marks.find(function (m) {
         return m.type === breakout;
-      })) === null || _content$marks$find === void 0 ? void 0 : _content$marks$find.attrs.mode;
-    } else if (content instanceof _model.Fragment) {
-      // Find the first breakout mode in the fragment
-      var firstBreakoutMode;
-      for (var i = 0; i < content.childCount; i++) {
-        var child = content.child(i);
-        var breakoutMark = child.marks.find(function (m) {
-          return m.type === breakout;
-        });
-        if (breakoutMark) {
-          firstBreakoutMode = breakoutMark.attrs.mode;
-          break;
-        }
+      });
+      if (breakoutMark) {
+        firstBreakoutMode = breakoutMark.attrs.mode;
+        break;
       }
-      return firstBreakoutMode;
-    }
-  } else {
-    // Without multi-select support, we can assume source content is of type PMNode
-    if (content instanceof _model.Node) {
-      var _content$marks$find2;
-      return (_content$marks$find2 = content.marks.find(function (m) {
-        return m.type === breakout;
-      })) === null || _content$marks$find2 === void 0 ? void 0 : _content$marks$find2.attrs.mode;
     }
+    return firstBreakoutMode;
   }
 };
 var getBreakoutModeAndWidth = function getBreakoutModeAndWidth(content, breakout) {
@@ -269,30 +221,20 @@ var getBreakoutModeAndWidth = function getBreakoutModeAndWidth(content, breakout
       breakoutWidth: mark.attrs.width
     } : null;
   };
-  if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-    if (content instanceof _model.Node) {
-      return extractBreakoutAttributes(findBreakoutMark(content));
-    } else if (content instanceof _model.Fragment) {
-      // Find the first breakout mode in the fragment
-      for (var i = 0; i < content.childCount; i++) {
-        var child = content.child(i);
-        var breakoutMark = findBreakoutMark(child);
-        if (breakoutMark) {
-          return extractBreakoutAttributes(breakoutMark);
-        }
+  if (content instanceof _model.Node) {
+    return extractBreakoutAttributes(findBreakoutMark(content));
+  } else if (content instanceof _model.Fragment) {
+    // Find the first breakout mode in the fragment
+    for (var i = 0; i < content.childCount; i++) {
+      var child = content.child(i);
+      var breakoutMark = findBreakoutMark(child);
+      if (breakoutMark) {
+        return extractBreakoutAttributes(breakoutMark);
       }
     }
-  } else {
-    // Without multi-select support, we can assume source content is of type PMNode
-    if (content instanceof _model.Node) {
-      return extractBreakoutAttributes(findBreakoutMark(content));
-    }
   }
   return null;
 };
-
-// TODO: ED-26959 - As part of platform_editor_element_drag_and_drop_multiselect clean up,
-// source content variable that has type of `PMNode | Fragment` should be updated to `Fragment` only
 var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
   return function (from, to, options) {
     return function (_ref5) {
@@ -328,8 +270,8 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
       }
 
       // 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));
-      var fromContentBeforeBreakoutMarksRemoved = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
+      var shouldRemoveMarks = $sourceFrom.node().type !== layoutSection;
+      var fromContentBeforeBreakoutMarksRemoved = tr.doc.slice($sourceFrom.pos, sourceTo).content;
 
       // remove breakout from source content
       var fromContentWithoutBreakout = shouldRemoveMarks ? removeBreakoutMarks(tr, $sourceFrom, sourceTo) : fromContentBeforeBreakoutMarksRemoved;
@@ -342,7 +284,6 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           tr: tr
         });
       }
-      var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
       if (toNode.type === layoutSection) {
         var toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize - 1 : to + 1;
         return moveToExistingLayout(toNode, to, fromContentWithoutBreakout, $sourceFrom.pos, toPos, tr, $sourceFrom, $to, api, options === null || options === void 0 ? void 0 : options.selectMovedNode);
@@ -362,24 +303,15 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           // resolve again the source node after node updated (remove breakout marks)
           toNodeWithoutBreakout = tr.doc.resolve(to).nodeAfter || toNode;
         }
-        if (isMultiSelect) {
-          if ((0, _checkFragment.isFragmentOfType)(fromContentWithoutBreakout, 'layoutColumn') && fromContentWithoutBreakout.firstChild) {
-            fromContentWithoutBreakout = fromContentWithoutBreakout.firstChild.content;
-          }
-        } else {
-          if (fromContentWithoutBreakout instanceof _model.Node && fromContentWithoutBreakout.type.name === 'layoutColumn') {
-            fromContentWithoutBreakout = fromContentWithoutBreakout.content;
-          }
+        if ((0, _checkFragment.isFragmentOfType)(fromContentWithoutBreakout, 'layoutColumn') && fromContentWithoutBreakout.firstChild) {
+          fromContentWithoutBreakout = fromContentWithoutBreakout.firstChild.content;
         }
         var layoutContents = options !== null && options !== void 0 && options.moveToEnd ? [toNodeWithoutBreakout, fromContentWithoutBreakout] : [fromContentWithoutBreakout, toNodeWithoutBreakout];
         var newLayout = createNewLayout(tr.doc.type.schema, layoutContents);
         if (newLayout) {
-          var sourceNodeTypes, hasSelectedMultipleNodes;
-          if (isMultiSelect) {
-            var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, $sourceFrom.pos, sourceTo);
+          var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, $sourceFrom.pos, sourceTo);
+          var sourceNodeTypes = attributes.nodeTypes,
             hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-            sourceNodeTypes = attributes.nodeTypes;
-          }
           tr = (0, _removeFromSource.removeFromSource)(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);

package/dist/cjs/pm-plugins/decorations-drop-target-active.js

@@ -44,24 +44,19 @@ var canMoveNodeOrSliceToPos = exports.canMoveNodeOrSliceToPos = function canMove
   var $activeNodePos = typeof activeNodePos === 'number' && state.doc.resolve(activeNodePos);
   var activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
   var handleInsideSelection = activeNodePos !== undefined && activeNodePos >= selectionFrom && activeNodePos <= selectionTo;
-  if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-    var selectionSlice = state.doc.slice(selectionFrom, selectionTo, false);
-    var selectionSliceChildCount = selectionSlice.content.childCount;
-    var canDropSingleNode = true;
-    var canDropMultipleNodes = true;
+  var selectionSlice = state.doc.slice(selectionFrom, selectionTo, false);
+  var selectionSliceChildCount = selectionSlice.content.childCount;
+  var canDropSingleNode = true;
+  var canDropMultipleNodes = true;
 
-    // when there is only one node in the slice, use the same logic as when multi select is not on
-    if (selectionSliceChildCount > 1 && handleInsideSelection) {
-      canDropMultipleNodes = (0, _validation.canMoveSliceToIndex)(selectionSlice, selectionFrom, selectionTo, parent, index, $toPos);
-    } else {
-      canDropSingleNode = !!(activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $toPos, node));
-    }
-    if (!canDropMultipleNodes || !canDropSingleNode) {
-      return false;
-    }
+  // when there is only one node in the slice, use the same logic as when multi select is not on
+  if (selectionSliceChildCount > 1 && handleInsideSelection) {
+    canDropMultipleNodes = (0, _validation.canMoveSliceToIndex)(selectionSlice, selectionFrom, selectionTo, parent, index, $toPos);
   } else {
-    var canDrop = activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $toPos, node);
-    return canDrop;
+    canDropSingleNode = !!(activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $toPos, node));
+  }
+  if (!canDropMultipleNodes || !canDropSingleNode) {
+    return false;
   }
   return true;
 };

package/dist/cjs/pm-plugins/decorations-drop-target.js

@@ -173,7 +173,6 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
   var activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   var $activeNodePos = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos);
   var activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
-  var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
   anchorRectCache === null || anchorRectCache === void 0 || anchorRectCache.clear();
   var prevNodeStack = [];
   var popNodeStack = function popNodeStack(depth) {
@@ -229,31 +228,21 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
       return shouldDescend(node); //skip over, don't consider it a valid depth
     }
 
-    // When multi select is on, validate all the nodes in the selection instead of just the handle node
-    if (isMultiSelect) {
-      var selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
-      var selectionSliceChildCount = selectionSlice.content.childCount;
-      var canDropSingleNode = true;
-      var canDropMultipleNodes = true;
+    // validate all the nodes in the selection instead of just the handle node
+    var selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
+    var selectionSliceChildCount = selectionSlice.content.childCount;
+    var canDropSingleNode = true;
+    var canDropMultipleNodes = true;
 
-      // when there is only one node in the slice, use the same logic as when multi select is not on
-      if (selectionSliceChildCount > 1 && handleInsideSelection) {
-        canDropMultipleNodes = (0, _validation.canMoveSliceToIndex)(selectionSlice, selectionFrom, selectionTo, parent, index, $pos);
-      } else {
-        canDropSingleNode = !!(activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $pos, node));
-      }
-      if (!canDropMultipleNodes || !canDropSingleNode) {
-        pushNodeStack(node, depth);
-        return false; //not valid pos, so nested not valid either
-      }
+    // when there is only one node in the slice, use the same logic as when multi select is not on
+    if (selectionSliceChildCount > 1 && handleInsideSelection) {
+      canDropMultipleNodes = (0, _validation.canMoveSliceToIndex)(selectionSlice, selectionFrom, selectionTo, parent, index, $pos);
     } else {
-      var canDrop = activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $pos, node);
-
-      //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
-      if (!canDrop) {
-        pushNodeStack(node, depth);
-        return false; //not valid pos, so nested not valid either
-      }
+      canDropSingleNode = !!(activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $pos, node));
+    }
+    if (!canDropMultipleNodes || !canDropSingleNode) {
+      pushNodeStack(node, depth);
+      return false; //not valid pos, so nested not valid either
     }
     var parentTypesWithEndDropTarget = (0, _experiments.editorExperiment)('platform_synced_block', true) ? PARENT_WITH_END_DROP_TARGET_NEXT : PARENT_WITH_END_DROP_TARGET;
     if (parent.lastChild === node && !(0, _utils.isEmptyParagraph)(node) && parentTypesWithEndDropTarget.includes(parent.type.name)) {