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

package/dist/es2019/pm-plugins/utils/remove-from-source.js

@@ -5,18 +5,8 @@ import { isFragmentOfType } from './check-fragment';
 import { MIN_LAYOUT_COLUMN } from './consts';
 import { updateColumnWidths } from './update-column-widths';
 export const removeFromSource = (tr, $from, to) => {
-  var _sourceContent, _sourceContent2;
-  let sourceContent = $from.nodeAfter;
-  let isLayoutColumn = ((_sourceContent = sourceContent) === null || _sourceContent === void 0 ? void 0 : _sourceContent.type.name) === 'layoutColumn';
-  let sourceNodeEndPos = $from.pos + (((_sourceContent2 = sourceContent) === null || _sourceContent2 === void 0 ? void 0 : _sourceContent2.nodeSize) || 1);
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    sourceContent = tr.doc.slice($from.pos, to).content;
-    isLayoutColumn = isFragmentOfType(sourceContent, 'layoutColumn');
-    sourceNodeEndPos = to === undefined ? $from.pos + sourceContent.size : to;
-  }
-  if (!sourceContent) {
-    return tr;
-  }
+  const sourceContent = tr.doc.slice($from.pos, to).content;
+  const isLayoutColumn = isFragmentOfType(sourceContent, 'layoutColumn');
 
   /**
    * This logic is used to handle the case when a user tries to delete a layout column
@@ -29,7 +19,7 @@ export const removeFromSource = (tr, $from, to) => {
       // Only delete the layout content, but keep the layout column itself
       // This logic should be remove when we clean up the code for single column layouts.
       // since this step has no effect on the layout column, because the parent node is removed in the later step.
-      tr.delete($from.pos + 1, sourceNodeEndPos - 1);
+      tr.delete($from.pos + 1, to - 1);
 
       // This check should be remove when clean up the code for single column layouts.
       // since it has been checked in the previous step.
@@ -52,6 +42,6 @@ export const removeFromSource = (tr, $from, to) => {
       updateColumnWidths(tr, $from.parent, $from.before($from.depth), sourceParent.childCount - 1);
     }
   }
-  tr.delete($from.pos, sourceNodeEndPos);
+  tr.delete($from.pos, to);
   return tr;
 };

package/dist/es2019/ui/drag-handle.js

@@ -370,7 +370,6 @@ export const DragHandle = ({
   });
   const start = getPos();
   const isLayoutColumn = nodeType === 'layoutColumn';
-  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
 
   // Dynamically calculate if node is top-level based on current position (gated by experiment)
   const isTopLevelNodeDynamic = useMemo(() => {
@@ -449,7 +448,7 @@ export const DragHandle = ({
         actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
         attributes: {
           nodeDepth: resolvedStartPos.depth,
-          nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
+          nodeTypes: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
       expandAndUpdateSelection({
@@ -481,9 +480,6 @@ export const DragHandle = ({
   }, [api, view, getPos, nodeType, anchorName]);
   const handleOnClick = useCallback(e => {
     var _api$core2;
-    if (!isMultiSelect) {
-      setDragHandleSelected(!dragHandleSelected);
-    }
     api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
       tr
     }) => {
@@ -494,7 +490,7 @@ export const DragHandle = ({
       }
       const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
       const $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? tr.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : tr.selection.$anchor;
-      if (!isMultiSelect || tr.selection.empty || !e.shiftKey) {
+      if (tr.selection.empty || !e.shiftKey) {
         tr = selectNode(tr, startPos, nodeType, api);
       } else if (isTopLevelNodeValue && $anchor.depth <= DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
         var _api$blockControls3;
@@ -515,13 +511,13 @@ export const DragHandle = ({
         actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
         attributes: {
           nodeDepth: resolvedMovingNode.depth,
-          nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
+          nodeTypes: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
         }
       })(tr);
       return tr;
     });
     view.focus();
-  }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNodeValue, nodeType]);
+  }, [api, view, getPos, isTopLevelNodeValue, nodeType]);
   const handleKeyDown = useCallback(e => {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -540,9 +536,6 @@ export const DragHandle = ({
         const $startPos = tr.doc.resolve(startPos + node.nodeSize);
         const selection = new TextSelection($startPos);
         tr.setSelection(selection);
-        !isMultiSelect && tr.setMeta(key, {
-          pos: startPos
-        });
         return tr;
       });
     } else if (![e.altKey, e.ctrlKey, e.shiftKey].some(pressed => pressed)) {
@@ -550,7 +543,7 @@ export const DragHandle = ({
       // return focus to editor to resume editing from caret position
       view.focus();
     }
-  }, [getPos, api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, isMultiSelect, view]);
+  }, [getPos, api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, view]);
   const handleKeyDownNew = useCallback(e => {
     // allow user to use spacebar to select the node
     if (e.key === 'Enter' || !e.repeat && e.key === ' ') {
@@ -619,28 +612,25 @@ export const DragHandle = ({
       onGenerateDragPreview: ({
         nativeSetDragImage
       }) => {
-        var _api$blockControls$sh2;
-        if (isMultiSelect) {
-          var _api$core6;
-          api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(({
-            tr
-          }) => {
-            const handlePos = getPos();
-            if (typeof handlePos !== 'number') {
-              return tr;
-            }
-            const newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
-            if (!tr.selection.empty && newHandlePosCheck) {
-              var _api$blockControls6;
-              api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.setMultiSelectPositions()({
-                tr
-              });
-            } else {
-              tr = selectNode(tr, handlePos, nodeType, api);
-            }
+        var _api$core6, _api$blockControls$sh2;
+        api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(({
+          tr
+        }) => {
+          const handlePos = getPos();
+          if (typeof handlePos !== 'number') {
             return tr;
-          });
-        }
+          }
+          const newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
+          if (!tr.selection.empty && newHandlePosCheck) {
+            var _api$blockControls6;
+            api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.setMultiSelectPositions()({
+              tr
+            });
+          } else {
+            tr = selectNode(tr, handlePos, nodeType, api);
+          }
+          return tr;
+        });
         const startPos = getPos();
         const state = view.state;
         const {
@@ -659,7 +649,7 @@ export const DragHandle = ({
           sliceTo = Math.max(anchor, head);
         }
         const expandedSlice = doc.slice(sliceFrom, sliceTo);
-        const isDraggingMultiLine = isMultiSelect && startPos !== undefined && startPos >= sliceFrom && startPos < sliceTo && expandedSlice.content.childCount > 1;
+        const isDraggingMultiLine = startPos !== undefined && startPos >= sliceFrom && startPos < sliceTo && expandedSlice.content.childCount > 1;
         setCustomNativeDragPreview({
           getOffset: () => {
             if (!isDraggingMultiLine) {
@@ -771,11 +761,8 @@ export const DragHandle = ({
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
             attributes: {
               nodeDepth: resolvedMovingNode.depth,
-              nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || '',
-              ...(isMultiSelect && {
-                nodeTypes,
-                hasSelectedMultipleNodes
-              })
+              nodeTypes: nodeTypes || '',
+              hasSelectedMultipleNodes
             }
           })(tr);
           return tr;
@@ -783,7 +770,7 @@ export const DragHandle = ({
         view.focus();
       }
     });
-  }, [anchorName, api, getPos, isMultiSelect, nodeType, start, view]);
+  }, [anchorName, api, getPos, nodeType, start, view]);
   const calculatePositionOld = useCallback(() => {
     const pos = getPos();
     const $pos = expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? typeof pos === 'number' && view.state.doc.resolve(pos) : pos && view.state.doc.resolve(pos);
@@ -868,14 +855,14 @@ export const DragHandle = ({
     }
   }, [buttonRef, handleOptions === null || handleOptions === void 0 ? void 0 : handleOptions.isFocused, view]);
   useEffect(() => {
-    if (!isMultiSelect || typeof start !== 'number' || !selection) {
+    if (typeof start !== 'number' || !selection) {
       return;
     }
     setDragHandleSelected(isHandleCorrelatedToSelection(view.state, selection, start));
-  }, [start, selection, view, isMultiSelect]);
+  }, [start, selection, view]);
   useEffect(() => {
     var _api$blockControls$sh4;
-    if (!isMultiSelect || isShiftDown === undefined || view.state.selection.empty || !fg('platform_editor_elements_dnd_shift_click_select')) {
+    if (isShiftDown === undefined || view.state.selection.empty || !fg('platform_editor_elements_dnd_shift_click_select')) {
       return;
     }
     const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh4 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh4 === void 0 ? void 0 : _api$blockControls$sh4.multiSelectDnD;
@@ -885,7 +872,7 @@ export const DragHandle = ({
     } else {
       setDragHandleDisabled(false);
     }
-  }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNodeValue, view]);
+  }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isShiftDown, isTopLevelNodeValue, view]);
   const dragHandleMessage = editorExperiment('platform_editor_block_menu', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: jsx("br", null)
   }) : formatMessage(blockControlsMessages.dragToMove);
@@ -963,7 +950,7 @@ export const DragHandle = ({
     return descriptor.keymap ? [descriptor.description, getAriaKeyshortcuts(descriptor.keymap)] : [descriptor.description];
   }).join('. ');
   const handleOnDrop = event => {
-    editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
+    event.stopPropagation();
   };
   const hasHadInteraction = interactionState !== 'hasNotHadInteraction';
   const browser = getBrowserInfo();

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

@@ -18,7 +18,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
-import { selectNode, setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
+import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { getSelectedSlicePosition } from '../pm-plugins/utils/selection';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
@@ -120,7 +120,6 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
   return function (state) {
     var selection = state.selection;
     var isParentNodeOfTypeLayout = !!findParentNodeOfType([state.schema.nodes.layoutSection])(state.selection);
-    var isMultiSelectEnabled = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
     var expandedSelection = expandSelectionBounds(selection.$anchor, selection.$head);
     var expandedAnchor = expandedSelection.$anchor.pos;
     var expandedHead = expandedSelection.$head.pos;
@@ -131,11 +130,11 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       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 NodeSelection && selection.node.type.name === 'layoutColumn';
@@ -276,20 +275,10 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           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;
-          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
           });
@@ -306,9 +295,9 @@ export var moveNode = function moveNode(api) {
   return function (start, to) {
     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) {
+    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;
       }
@@ -319,7 +308,6 @@ export var moveNode = function moveNode(api) {
       var sliceFrom = start;
       var sliceTo;
       var sourceNodeTypes, hasSelectedMultipleNodes;
-      var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
       if (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()({
@@ -335,17 +323,13 @@ export var moveNode = function moveNode(api) {
         var attributes = getMultiSelectAnalyticsAttributes(tr, sliceFrom, sliceTo);
         hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
         sourceNodeTypes = attributes.nodeTypes;
-      } else if (isMultiSelect) {
+      } else {
         var slicePosition = getSelectedSlicePosition(start, tr, api);
         sliceFrom = slicePosition.from;
         sliceTo = slicePosition.to;
         var _attributes = 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,
@@ -422,13 +406,11 @@ export var moveNode = function moveNode(api) {
         tr.setMeta(key, _objectSpread(_objectSpread({}, _currMeta), {}, {
           preservedSelectionMapping: new Mapping([new 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 = selectNode(tr, mappedTo, handleNode.type.name, api);
       }
       var currMeta = tr.getMeta(key);
       tr.setMeta(key, _objectSpread(_objectSpread({}, currMeta), {}, {
@@ -449,7 +431,7 @@ export var moveNode = function moveNode(api) {
         }
       }
       if (editorExperiment('advanced_layouts', true)) {
-        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);
+        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({
@@ -457,16 +439,14 @@ export var moveNode = function moveNode(api) {
           action: ACTION.MOVED,
           actionSubject: ACTION_SUBJECT.ELEMENT,
           actionSubjectId: 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 ? blockControlsMessages.movedDown : blockControlsMessages.movedup;

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

@@ -40,26 +40,11 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
 };
 var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceContent, from, to, tr, $originalFrom, $originalTo, api, selectMovedNode) {
   var isSameLayout = isInSameLayout($originalFrom, $originalTo);
-  var sourceContentEndPos = -1;
-  var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
-  var sourceNodeTypes, hasSelectedMultipleNodes;
-  if (isMultiSelect) {
-    if (sourceContent instanceof Fragment) {
-      sourceContentEndPos = from + sourceContent.size;
-      var attributes = getMultiSelectAnalyticsAttributes(tr, from, sourceContentEndPos);
-      hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-      sourceNodeTypes = attributes.nodeTypes;
-    }
-  } else {
-    if (sourceContent instanceof PMNode) {
-      sourceContentEndPos = from + sourceContent.nodeSize;
-    }
-  }
-  if (sourceContentEndPos === -1) {
-    return tr;
-  }
+  var sourceContentEndPos = from + sourceContent.size;
+  var attributes = 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);
@@ -67,12 +52,11 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
     if (selectMovedNode) {
       tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
     }
-    attachMoveNodeAnalytics(tr, 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);
+    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', true, api, hasSelectedMultipleNodes);
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
-    var _$originalFrom$nodeAf2;
     removeFromSource(tr, tr.doc.resolve(from), sourceContentEndPos);
     insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
-    attachMoveNodeAnalytics(tr, 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);
+    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', false, api, hasSelectedMultipleNodes);
   }
   return tr;
 };
@@ -90,22 +74,11 @@ var insertToDestinationNoWidthUpdate = function insertToDestinationNoWidthUpdate
     layoutColumn = _ref2.layoutColumn;
   var content = null;
   try {
-    if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-      if (sourceContent instanceof Fragment) {
-        var _sourceFragment$first;
-        var sourceFragment = sourceContent;
-        content = layoutColumn.createChecked({
-          width: 0
-        }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
-      }
-    } else {
-      if (sourceContent instanceof PMNode) {
-        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
+    }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
   } catch (error) {
     logException(error, {
       location: 'editor-plugin-block-controls/move-to-layout'
@@ -148,7 +121,6 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
     return;
   }
   var $from = tr.doc.resolve(from);
-  var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
 
   // invalid from position or dragging a layout
   if (!$from.nodeAfter || $from.nodeAfter.type === layoutSection) {
@@ -157,7 +129,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 = getMultiSelectionIfPosInside(api, from),
       anchor = _getMultiSelectionIfP.anchor,
       head = _getMultiSelectionIfP.head;
@@ -184,71 +156,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 (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 (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 (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 (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    if (content instanceof PMNode) {
-      var _content$marks$find;
-      return (_content$marks$find = content.marks.find(function (m) {
+  if (content instanceof PMNode) {
+    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 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 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 PMNode) {
-      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) {
@@ -263,30 +215,20 @@ var getBreakoutModeAndWidth = function getBreakoutModeAndWidth(content, breakout
       breakoutWidth: mark.attrs.width
     } : null;
   };
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    if (content instanceof PMNode) {
-      return extractBreakoutAttributes(findBreakoutMark(content));
-    } else if (content instanceof 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 PMNode) {
+    return extractBreakoutAttributes(findBreakoutMark(content));
+  } else if (content instanceof 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 PMNode) {
-      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
 export var moveToLayout = function moveToLayout(api) {
   return function (from, to, options) {
     return function (_ref5) {
@@ -322,8 +264,8 @@ export var moveToLayout = function moveToLayout(api) {
       }
 
       // 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));
-      var fromContentBeforeBreakoutMarksRemoved = 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;
@@ -336,7 +278,6 @@ export var moveToLayout = function moveToLayout(api) {
           tr: tr
         });
       }
-      var isMultiSelect = 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);
@@ -356,24 +297,15 @@ export var 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 (isFragmentOfType(fromContentWithoutBreakout, 'layoutColumn') && fromContentWithoutBreakout.firstChild) {
-            fromContentWithoutBreakout = fromContentWithoutBreakout.firstChild.content;
-          }
-        } else {
-          if (fromContentWithoutBreakout instanceof PMNode && fromContentWithoutBreakout.type.name === 'layoutColumn') {
-            fromContentWithoutBreakout = fromContentWithoutBreakout.content;
-          }
+        if (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 = getMultiSelectAnalyticsAttributes(tr, $sourceFrom.pos, sourceTo);
+          var attributes = getMultiSelectAnalyticsAttributes(tr, $sourceFrom.pos, sourceTo);
+          var sourceNodeTypes = attributes.nodeTypes,
             hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-            sourceNodeTypes = attributes.nodeTypes;
-          }
           tr = removeFromSource(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);