@atlaskit/editor-plugin-block-controls 2.13.11 → 2.13.13

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.13.13
+
+### Patch Changes
+
+- [#164606](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/164606)
+  [`34e9782c56a3f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/34e9782c56a3f) -
+  tidy platform_editor_empty_line_prompt experiment
+- [#163518](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/163518)
+  [`0c4fc567f6cfd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0c4fc567f6cfd) -
+  ED-25705 fix sticky header
+- Updated dependencies
+
+## 2.13.12
+
+### Patch Changes
+
+- [#163103](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/163103)
+  [`ec14916563763`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ec14916563763) -
+  [ux] [ED-25060] Implement drag and drop a layout column to another layout section
+
 ## 2.13.11
 
 ### Patch Changes

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

@@ -33,26 +33,19 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
   }
   return null;
 };
-var updateColumnWidths = function updateColumnWidths(tr, layoutNode, layoutNodePos, newColumnWidth) {
+var updateColumnWidths = function updateColumnWidths(tr, layoutNode, layoutNodePos, childCount) {
+  var newColumnWidth = _consts2.DEFAULT_COLUMN_DISTRIBUTIONS[childCount];
   if (newColumnWidth) {
     layoutNode.content.forEach(function (node, offset) {
       if (node.type.name === 'layoutColumn') {
-        tr = tr.setNodeAttribute(layoutNodePos + offset + 1, 'width', newColumnWidth);
+        tr.setNodeAttribute(layoutNodePos + offset + 1, 'width', newColumnWidth);
       }
     });
   }
-  return tr;
-};
-
-/**
- * Insert a node into an existing layout at position `to` and delete the node
- */
-var moveNode = function moveNode(from, to, newNode, sourceNodeSize, tr) {
-  tr.insert(to, newNode).setSelection(new _state.NodeSelection(tr.doc.resolve(to))).scrollIntoView();
-  var mappedFrom = tr.mapping.map(from);
-  var mappedFromEnd = mappedFrom + sourceNodeSize;
-  tr.delete(mappedFrom, mappedFromEnd);
-  return tr;
+  return {
+    newColumnWidth: newColumnWidth,
+    tr: tr
+  };
 };
 var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceNode, from, to, tr, isSameLayout) {
   if (isSameLayout) {
@@ -61,16 +54,41 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
     var mappedTo = tr.mapping.map(to);
     tr.insert(mappedTo, sourceNode).setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
   } else if (toLayout.childCount < (0, _consts.maxLayoutColumnSupported)()) {
-    var newColumnWidth = _consts2.DEFAULT_COLUMN_DISTRIBUTIONS[toLayout.childCount + 1];
-    updateColumnWidths(tr, toLayout, toLayoutPos, newColumnWidth);
-    var _ref2 = tr.doc.type.schema.nodes || {},
-      layoutColumn = _ref2.layoutColumn;
-    moveNode(from, to, layoutColumn.create({
-      width: newColumnWidth
-    }, sourceNode), sourceNode.nodeSize, tr);
+    insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
+    var mappedFrom = tr.mapping.map(from);
+    removeFromSource(tr, tr.doc.resolve(mappedFrom));
   }
   return tr;
 };
+var removeFromSource = function removeFromSource(tr, $from) {
+  var sourceNode = $from.nodeAfter;
+  var sourceParent = $from.parent;
+  if (!sourceNode) {
+    return tr;
+  }
+  var sourceNodeEndPos = $from.pos + sourceNode.nodeSize;
+  if (sourceNode.type.name === 'layoutColumn') {
+    if (sourceParent.childCount === _consts.MIN_LAYOUT_COLUMN) {
+      tr.delete($from.pos + 1, sourceNodeEndPos - 1);
+      return tr;
+    } else {
+      updateColumnWidths(tr, $from.parent, $from.before($from.depth), sourceParent.childCount - 1);
+    }
+  }
+  tr.delete($from.pos, sourceNodeEndPos);
+  return tr;
+};
+var insertToDestination = function insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos) {
+  var _ref2 = updateColumnWidths(tr, toLayout, toLayoutPos, toLayout.childCount + 1) || {},
+    newColumnWidth = _ref2.newColumnWidth;
+  var _ref3 = tr.doc.type.schema.nodes || {},
+    layoutColumn = _ref3.layoutColumn;
+  var content = layoutColumn.createChecked({
+    width: newColumnWidth
+  }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
+  tr.insert(to, content).setSelection(new _state.NodeSelection(tr.doc.resolve(to))).scrollIntoView();
+  return tr;
+};
 
 /**
  * Check if the node at `from` can be moved to node at `to` to create/expand a layout.
@@ -80,10 +98,10 @@ var canMoveToLayout = function canMoveToLayout(from, to, tr) {
   if (from === to) {
     return;
   }
-  var _ref3 = tr.doc.type.schema.nodes || {},
-    layoutSection = _ref3.layoutSection,
-    layoutColumn = _ref3.layoutColumn,
-    doc = _ref3.doc;
+  var _ref4 = tr.doc.type.schema.nodes || {},
+    layoutSection = _ref4.layoutSection,
+    layoutColumn = _ref4.layoutColumn,
+    doc = _ref4.doc;
 
   // layout plugin does not exist
   if (!layoutSection || !layoutColumn) {
@@ -112,8 +130,8 @@ var canMoveToLayout = function canMoveToLayout(from, to, tr) {
 };
 var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
   return function (from, to, options) {
-    return function (_ref4) {
-      var tr = _ref4.tr;
+    return function (_ref5) {
+      var tr = _ref5.tr;
       var canMove = canMoveToLayout(from, to, tr);
       if (!canMove) {
         return tr;
@@ -122,11 +140,11 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
         fromNode = canMove.fromNode,
         $from = canMove.$from,
         $to = canMove.$to;
-      var _ref5 = tr.doc.type.schema.nodes || {},
-        layoutSection = _ref5.layoutSection,
-        layoutColumn = _ref5.layoutColumn;
-      var _ref6 = tr.doc.type.schema.marks || {},
-        breakout = _ref6.breakout;
+      var _ref6 = tr.doc.type.schema.nodes || {},
+        layoutSection = _ref6.layoutSection,
+        layoutColumn = _ref6.layoutColumn;
+      var _ref7 = tr.doc.type.schema.marks || {},
+        breakout = _ref7.breakout;
       var fromNodeWithoutBreakout = fromNode;
 
       // remove breakout from node;

package/dist/cjs/consts.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.maxLayoutColumnSupported = exports.DIRECTION = void 0;
+exports.maxLayoutColumnSupported = exports.MIN_LAYOUT_COLUMN = exports.DIRECTION = void 0;
 var _advancedLayoutsFlags = require("./utils/advanced-layouts-flags");
 var DIRECTION = exports.DIRECTION = /*#__PURE__*/function (DIRECTION) {
   DIRECTION["UP"] = "up";
@@ -14,4 +14,5 @@ var DIRECTION = exports.DIRECTION = /*#__PURE__*/function (DIRECTION) {
 }({});
 var maxLayoutColumnSupported = exports.maxLayoutColumnSupported = function maxLayoutColumnSupported() {
   return (0, _advancedLayoutsFlags.isPreRelease2)() ? 5 : 3;
-};
+};
+var MIN_LAYOUT_COLUMN = exports.MIN_LAYOUT_COLUMN = 2;

package/dist/cjs/plugin.js

@@ -5,13 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blockControlsPlugin = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _moveNode = require("./commands/move-node");
 var _moveToLayout = require("./commands/move-to-layout");
-var _emptyBlockExperiment = require("./pm-plugins/empty-block-experiment");
 var _main = require("./pm-plugins/main");
 var _dragHandleMenu = require("./ui/drag-handle-menu");
 var _globalStyles = require("./ui/global-styles");
@@ -27,22 +24,14 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           var getIntl = _ref2.getIntl;
           return (0, _main.createPlugin)(api, getIntl);
         }
-      }].concat((0, _toConsumableArray2.default)((0, _experiments.editorExperiment)('platform_editor_empty_line_prompt', true, {
-        exposure: true
-      }) ? [{
-        name: 'emptyBlockExperimentPlugin',
-        plugin: function plugin(_ref3) {
-          var getIntl = _ref3.getIntl;
-          return (0, _emptyBlockExperiment.createEmptyBlockExperimentPlugin)(api, getIntl);
-        }
-      }] : []));
+      }];
     },
     commands: {
       moveNode: (0, _moveNode.moveNode)(api),
       moveToLayout: (0, _moveToLayout.moveToLayout)(api),
       showDragHandleAt: function showDragHandleAt(pos, anchorName, nodeType, handleOptions) {
-        return function (_ref4) {
-          var tr = _ref4.tr;
+        return function (_ref3) {
+          var tr = _ref3.tr;
           tr.setMeta(_main.key, {
             activeNode: {
               pos: pos,
@@ -55,8 +44,8 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         };
       },
       setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
-        return function (_ref5) {
-          var tr = _ref5.tr;
+        return function (_ref4) {
+          var tr = _ref4.tr;
           var pos = getPos();
           if (pos === undefined) {
             return tr;

package/dist/cjs/pm-plugins/decorations-anchor.js

@@ -33,8 +33,8 @@ var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, pare
 
   // TODO use isWrappedMedia when clean up the feature flag
   var isMediaSingle = 'mediaSingle' === node.type.name && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_1');
-  var isFirstTableHeaderOrTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && ['tableHeader', 'tableRow'].includes(node.type.name) && (0, _advancedLayoutsFlags.isPreRelease1)();
-  if (isFirstTableHeaderOrTableRow) {
+  var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && (0, _advancedLayoutsFlags.isPreRelease1)();
+  if (isFirstTableRow) {
     return false;
   }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
@@ -95,8 +95,9 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
       var _anchorName2;
       anchorName = (_anchorName2 = anchorName) !== null && _anchorName2 !== void 0 ? _anchorName2 : "--node-anchor-".concat(node.type.name, "-").concat(index);
     }
+    var anchorStyles = ['tableRow', 'media'].includes(node.type.name) ? "anchor-name: ".concat(anchorName, ";") : "anchor-name: ".concat(anchorName, "; ").concat(pos === 0 && !(0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? 'margin-top: 0px;' : '', " ").concat((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? '' : 'position: relative; z-index: 1;');
     decs.push(_view.Decoration.node(pos, pos + node.nodeSize, (_Decoration$node = {
-      style: "anchor-name: ".concat(anchorName, "; ").concat(pos === 0 && !(0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? 'margin-top: 0px;' : '', " ").concat((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? '' : 'position: relative; z-index: 1;')
+      style: anchorStyles
     }, (0, _defineProperty2.default)(_Decoration$node, 'data-drag-handler-anchor-name', anchorName), (0, _defineProperty2.default)(_Decoration$node, 'data-drag-handler-node-type', node.type.name), (0, _defineProperty2.default)(_Decoration$node, 'data-drag-handler-anchor-depth', "".concat(depth)), _Decoration$node), {
       type: _decorationsCommon.TYPE_NODE_DEC,
       anchorName: anchorName,

package/dist/cjs/ui/global-styles.js

@@ -11,122 +11,94 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("./consts");
-var _globalStyles = require("./empty-block-experiment/global-styles");
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
+/**
+ * This anchor element selector disregards anchors that are solely utilized for size measurements,
+ * including those within table rows and media.
+ */
+var dragHandlerAnchorSelector = '[data-drag-handler-anchor-name]:not([data-drag-handler-node-type="tableRow"], [data-drag-handler-node-type="media"])';
 var extendedHoverZone = function extendedHoverZone() {
-  return (0, _react.css)({
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '.block-ctrl-drag-preview [data-drag-handler-anchor-name]::after': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
-      display: 'none !important'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '.ProseMirror': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-      '&& [data-drag-handler-anchor-name]::after': {
-        content: '""',
-        position: 'absolute',
-        top: 0,
-        left: '-100%',
-        width: '100%',
-        height: '100%',
-        background: 'transparent',
-        cursor: 'default',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-        zIndex: -1
-      }
-    },
-    // TODO - ED-23995 this style override needs to be moved to the Rule styles after FF cleanup - packages/editor/editor-common/src/styles/shared/rule.ts
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    'hr[data-drag-handler-anchor-name]': {
-      overflow: 'visible'
-    },
-    //eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '[data-blocks-drag-handle-container="true"] + *::after': {
-      display: 'none'
-    }
-  });
+  var _css;
+  return (0, _react.css)((_css = {}, (0, _defineProperty2.default)(_css, ".block-ctrl-drag-preview ".concat(dragHandlerAnchorSelector, "::after"), {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    display: 'none !important'
+  }), (0, _defineProperty2.default)(_css, '.ProseMirror', (0, _defineProperty2.default)({}, "&& ".concat(dragHandlerAnchorSelector, "::after"), {
+    content: '""',
+    position: 'absolute',
+    top: 0,
+    left: '-100%',
+    width: '100%',
+    height: '100%',
+    background: 'transparent',
+    cursor: 'default',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+    zIndex: -1
+  })), (0, _defineProperty2.default)(_css, 'hr[data-drag-handler-anchor-name]', {
+    overflow: 'visible'
+  }), (0, _defineProperty2.default)(_css, '[data-blocks-drag-handle-container="true"] + *::after', {
+    display: 'none'
+  }), _css));
 };
 var extendedHoverZoneNested = function extendedHoverZoneNested() {
-  return (0, _react.css)({
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '.block-ctrl-drag-preview [data-drag-handler-anchor-name]::after': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
-      display: 'none !important'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '.ProseMirror': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-      '&& [data-drag-handler-anchor-name]::after': {
-        content: '""',
-        position: 'absolute',
-        top: 0,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
-        left: "-".concat(_consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP, "px"),
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
-        width: "".concat(_consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP, "px"),
-        height: '100%',
-        cursor: 'default',
-        zIndex: 1
-      },
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-      '&& [data-drag-handler-anchor-depth="0"][data-drag-handler-anchor-name]::after': {
-        content: '""',
-        position: 'absolute',
-        top: 0,
-        left: '-100%',
-        width: '100%',
-        height: '100%',
-        cursor: 'default',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-        zIndex: -1
-      },
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-      '&& :is(.pm-table-cell-content-wrap, .pm-table-header-content-wrap) > [data-drag-handler-anchor-name]::after': {
-        content: '""',
-        position: 'absolute',
-        top: 0,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
-        left: "-".concat((0, _experiments.editorExperiment)('table-nested-dnd', true) ? _consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP : 0, "px"),
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
-        width: "".concat((0, _experiments.editorExperiment)('table-nested-dnd', true) ? _consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP : 0, "px"),
-        height: '100%',
-        cursor: 'default',
-        zIndex: 1
-      },
-      // hover zone for layout column should be placed near the top of the column (where drag handle is)
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-      '&& [data-drag-handler-anchor-name][data-layout-column]::after': {
-        content: '""',
-        position: 'absolute',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
-        top: "".concat(-_consts.DRAG_HANDLE_WIDTH / 2, "px"),
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
-        left: 0,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
-        width: '100%',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-        height: "".concat(_consts.DRAG_HANDLE_WIDTH, "px"),
-        cursor: 'default',
-        zIndex: 1
-      }
-    },
-    // TODO - ED-23995 this style override needs to be moved to the Rule styles after FF cleanup - packages/editor/editor-common/src/styles/shared/rule.ts
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    'hr[data-drag-handler-anchor-name]': {
-      overflow: 'visible'
-    },
-    //Hide pseudo element at top depth level. Leave for nested depths to prevent mouseover loop.
-    //eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '[data-blocks-drag-handle-container="true"] + [data-drag-handler-anchor-depth="0"]::after': {
-      display: 'none'
-    }
-  });
+  var _ProseMirror2, _css2;
+  return (0, _react.css)((_css2 = {}, (0, _defineProperty2.default)(_css2, ".block-ctrl-drag-preview ".concat(dragHandlerAnchorSelector, "::after"), {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    display: 'none !important'
+  }), (0, _defineProperty2.default)(_css2, '.ProseMirror', (_ProseMirror2 = {}, (0, _defineProperty2.default)(_ProseMirror2, "&& ".concat(dragHandlerAnchorSelector, "::after"), {
+    content: '""',
+    position: 'absolute',
+    top: 0,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    left: "-".concat(_consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP, "px"),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    width: "".concat(_consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP, "px"),
+    height: '100%',
+    cursor: 'default',
+    zIndex: 1
+  }), (0, _defineProperty2.default)(_ProseMirror2, "&& [data-drag-handler-anchor-depth=\"0\"]".concat(dragHandlerAnchorSelector, "::after"), {
+    content: '""',
+    position: 'absolute',
+    top: 0,
+    left: '-100%',
+    width: '100%',
+    height: '100%',
+    cursor: 'default',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+    zIndex: -1
+  }), (0, _defineProperty2.default)(_ProseMirror2, "&& :is(.pm-table-cell-content-wrap, .pm-table-header-content-wrap) > ".concat(dragHandlerAnchorSelector, "::after"), {
+    content: '""',
+    position: 'absolute',
+    top: 0,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    left: "-".concat((0, _experiments.editorExperiment)('table-nested-dnd', true) ? _consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP : 0, "px"),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    width: "".concat((0, _experiments.editorExperiment)('table-nested-dnd', true) ? _consts.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP : 0, "px"),
+    height: '100%',
+    cursor: 'default',
+    zIndex: 1
+  }), (0, _defineProperty2.default)(_ProseMirror2, '&& [data-drag-handler-anchor-name][data-layout-column]::after', {
+    content: '""',
+    position: 'absolute',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    top: "".concat(-_consts.DRAG_HANDLE_WIDTH / 2, "px"),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    left: 0,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    width: '100%',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+    height: "".concat(_consts.DRAG_HANDLE_WIDTH, "px"),
+    cursor: 'default',
+    zIndex: 1
+  }), _ProseMirror2)), (0, _defineProperty2.default)(_css2, 'hr[data-drag-handler-anchor-name]', {
+    overflow: 'visible'
+  }), (0, _defineProperty2.default)(_css2, '[data-blocks-drag-handle-container="true"] + [data-drag-handler-anchor-depth="0"]::after', {
+    display: 'none'
+  }), _css2));
 };
 var paragraphWithTrailingBreakAsOnlyChild = '+ :is(p, h1, h2, h3, h4, h5, h6) > .ProseMirror-trailingBreak:only-child';
 var indentatedParagraphWithTrailingBreakAsOnlyChild = '+ div.fabric-editor-indentation-mark > :is(p, h1, h2, h3, h4, h5, h6) > .ProseMirror-trailingBreak:only-child';
@@ -211,21 +183,15 @@ var getTextNodeStyle = function getTextNodeStyle() {
 };
 var withRelativePosStyle = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '&& [data-drag-handler-anchor-name]': {
-      position: 'relative'
-    }
-  }
+  '.ProseMirror': (0, _defineProperty2.default)({}, "&& ".concat(dragHandlerAnchorSelector), {
+    position: 'relative'
+  })
 });
 var withAnchorNameZindexStyle = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '&& [data-drag-handler-anchor-name]': {
-      zIndex: 1
-    }
-  }
+  '.ProseMirror': (0, _defineProperty2.default)({}, "&& ".concat(dragHandlerAnchorSelector), {
+    zIndex: 1
+  })
 });
 var withAnchorNameZindexNestedStyle = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -238,8 +204,6 @@ var withAnchorNameZindexNestedStyle = (0, _react.css)({
 });
 var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWrapper() {
   return (0, _react.jsx)(_react.Global, {
-    styles: [globalStyles(), (0, _experiments.editorExperiment)('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, (0, _experiments.editorExperiment)('platform_editor_empty_line_prompt', true, {
-      exposure: false
-    }) ? _globalStyles.emptyBlockExperimentGlobalStyles : undefined, (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_1') ? withDividerInPanelStyleFix : undefined, (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2') ? withFormatInLayoutStyleFix : undefined, (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? [withRelativePosStyle, topLevelNodeMarginStyles, (0, _experiments.editorExperiment)('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle] : undefined]
+    styles: [globalStyles(), (0, _experiments.editorExperiment)('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_1') ? withDividerInPanelStyleFix : undefined, (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2') ? withFormatInLayoutStyleFix : undefined, (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? [withRelativePosStyle, topLevelNodeMarginStyles, (0, _experiments.editorExperiment)('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle] : undefined]
   });
 };

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

@@ -1,6 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { maxLayoutColumnSupported } from '../consts';
+import { maxLayoutColumnSupported, MIN_LAYOUT_COLUMN } from '../consts';
 import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../ui/consts';
 import { isInSameLayout } from '../utils/validation';
 const createNewLayout = (schema, layoutContents) => {
@@ -28,26 +28,19 @@ const createNewLayout = (schema, layoutContents) => {
   }
   return null;
 };
-const updateColumnWidths = (tr, layoutNode, layoutNodePos, newColumnWidth) => {
+const updateColumnWidths = (tr, layoutNode, layoutNodePos, childCount) => {
+  const newColumnWidth = DEFAULT_COLUMN_DISTRIBUTIONS[childCount];
   if (newColumnWidth) {
     layoutNode.content.forEach((node, offset) => {
       if (node.type.name === 'layoutColumn') {
-        tr = tr.setNodeAttribute(layoutNodePos + offset + 1, 'width', newColumnWidth);
+        tr.setNodeAttribute(layoutNodePos + offset + 1, 'width', newColumnWidth);
       }
     });
   }
-  return tr;
-};
-
-/**
- * Insert a node into an existing layout at position `to` and delete the node
- */
-const moveNode = (from, to, newNode, sourceNodeSize, tr) => {
-  tr.insert(to, newNode).setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
-  const mappedFrom = tr.mapping.map(from);
-  const mappedFromEnd = mappedFrom + sourceNodeSize;
-  tr.delete(mappedFrom, mappedFromEnd);
-  return tr;
+  return {
+    newColumnWidth,
+    tr
+  };
 };
 const moveToExistingLayout = (toLayout, toLayoutPos, sourceNode, from, to, tr, isSameLayout) => {
   if (isSameLayout) {
@@ -56,15 +49,41 @@ const moveToExistingLayout = (toLayout, toLayoutPos, sourceNode, from, to, tr, i
     const mappedTo = tr.mapping.map(to);
     tr.insert(mappedTo, sourceNode).setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
-    const newColumnWidth = DEFAULT_COLUMN_DISTRIBUTIONS[toLayout.childCount + 1];
-    updateColumnWidths(tr, toLayout, toLayoutPos, newColumnWidth);
-    const {
-      layoutColumn
-    } = tr.doc.type.schema.nodes || {};
-    moveNode(from, to, layoutColumn.create({
-      width: newColumnWidth
-    }, sourceNode), sourceNode.nodeSize, tr);
+    insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
+    const mappedFrom = tr.mapping.map(from);
+    removeFromSource(tr, tr.doc.resolve(mappedFrom));
+  }
+  return tr;
+};
+const removeFromSource = (tr, $from) => {
+  const sourceNode = $from.nodeAfter;
+  const sourceParent = $from.parent;
+  if (!sourceNode) {
+    return tr;
   }
+  const sourceNodeEndPos = $from.pos + sourceNode.nodeSize;
+  if (sourceNode.type.name === 'layoutColumn') {
+    if (sourceParent.childCount === MIN_LAYOUT_COLUMN) {
+      tr.delete($from.pos + 1, sourceNodeEndPos - 1);
+      return tr;
+    } else {
+      updateColumnWidths(tr, $from.parent, $from.before($from.depth), sourceParent.childCount - 1);
+    }
+  }
+  tr.delete($from.pos, sourceNodeEndPos);
+  return tr;
+};
+const insertToDestination = (tr, to, sourceNode, toLayout, toLayoutPos) => {
+  const {
+    newColumnWidth
+  } = updateColumnWidths(tr, toLayout, toLayoutPos, toLayout.childCount + 1) || {};
+  const {
+    layoutColumn
+  } = tr.doc.type.schema.nodes || {};
+  const content = layoutColumn.createChecked({
+    width: newColumnWidth
+  }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
+  tr.insert(to, content).setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
   return tr;
 };
 

package/dist/es2019/consts.js

@@ -8,4 +8,5 @@ export let DIRECTION = /*#__PURE__*/function (DIRECTION) {
 }({});
 export const maxLayoutColumnSupported = () => {
   return isPreRelease2() ? 5 : 3;
-};
+};
+export const MIN_LAYOUT_COLUMN = 2;

package/dist/es2019/plugin.js

@@ -1,9 +1,7 @@
 import React from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { moveNode } from './commands/move-node';
 import { moveToLayout } from './commands/move-to-layout';
-import { createEmptyBlockExperimentPlugin } from './pm-plugins/empty-block-experiment';
 import { createPlugin, key } from './pm-plugins/main';
 import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
@@ -18,14 +16,7 @@ export const blockControlsPlugin = ({
       plugin: ({
         getIntl
       }) => createPlugin(api, getIntl)
-    }, ...(editorExperiment('platform_editor_empty_line_prompt', true, {
-      exposure: true
-    }) ? [{
-      name: 'emptyBlockExperimentPlugin',
-      plugin: ({
-        getIntl
-      }) => createEmptyBlockExperimentPlugin(api, getIntl)
-    }] : [])];
+    }];
   },
   commands: {
     moveNode: moveNode(api),