@atlaskit/editor-plugin-block-controls 2.13.12 → 2.13.14

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.13.14
+
+### Patch Changes
+
+- [#163579](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/163579)
+  [`15dc53a3077f1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/15dc53a3077f1) -
+  Hide unnecessary inline drop targets
+- Updated dependencies
+
+## 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

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/pm-plugins/decorations-drop-target.js

@@ -163,6 +163,9 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       depth = $pos.depth;
       if (isAdvancedLayoutsPreRelease2) {
+        if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) === pos && activeNode.nodeType !== 'layoutColumn') {
+          return false;
+        }
         if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && (parent === null || parent === void 0 ? void 0 : parent.firstChild) !== node && (
         // Not the first node
         (parent === null || parent === void 0 ? void 0 : parent.childCount) < (0, _consts.maxLayoutColumnSupported)() || isSameLayout)) {

package/dist/cjs/ui/drop-target-layout.js

@@ -39,6 +39,7 @@ var dropTargetLayoutHintStyle = (0, _react2.css)({
   width: 0
 });
 var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(props) {
+  var _api$blockControls;
   var api = props.api,
     getPos = props.getPos,
     parent = props.parent;
@@ -51,10 +52,9 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
   var _useActiveAnchorTrack = (0, _activeAnchorTracker.useActiveAnchorTracker)(anchorName),
     _useActiveAnchorTrack2 = (0, _slicedToArray2.default)(_useActiveAnchorTrack, 1),
     isActiveAnchor = _useActiveAnchorTrack2[0];
+  var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+    activeNode = _ref.activeNode;
   var onDrop = (0, _react.useCallback)(function () {
-    var _api$blockControls;
-    var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
-      activeNode = _ref.activeNode;
     if (!activeNode) {
       return;
     }
@@ -64,7 +64,7 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
       var from = activeNode.pos;
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(from, to));
     }
-  }, [api, getPos]);
+  }, [api, getPos, activeNode]);
   (0, _react.useEffect)(function () {
     if (ref.current) {
       return (0, _adapter.dropTargetForElements)({
@@ -79,6 +79,9 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
       });
     }
   }, [onDrop]);
+  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return null;
+  }
   return (0, _react2.jsx)("div", {
     ref: ref,
     css: dropTargetLayoutStyle,

package/dist/cjs/ui/drop-target-v2.js

@@ -178,7 +178,7 @@ var HoverZone = function HoverZone(_ref) {
   });
 };
 var DropTargetV2 = exports.DropTargetV2 = function DropTargetV2(props) {
-  var _dynamicStyle;
+  var _api$blockControls, _dynamicStyle;
   var api = props.api,
     getPos = props.getPos,
     prevNode = props.prevNode,
@@ -196,10 +196,9 @@ var DropTargetV2 = exports.DropTargetV2 = function DropTargetV2(props) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width']),
     widthState = _useSharedPluginState.widthState;
   var isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
+  var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+    activeNode = _ref2.activeNode;
   var onDrop = function onDrop() {
-    var _api$blockControls;
-    var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
-      activeNode = _ref2.activeNode;
     if (!activeNode) {
       return;
     }
@@ -255,7 +254,7 @@ var DropTargetV2 = exports.DropTargetV2 = function DropTargetV2(props) {
     anchorRectCache: anchorRectCache,
     position: "lower",
     isNestedDropTarget: isNestedDropTarget
-  }), (0, _inlineDropTarget.shouldAllowInlineDropTarget)(isNestedDropTarget, nextNode, isSameLayout) && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget, (0, _extends2.default)({}, props, {
+  }), (0, _inlineDropTarget.shouldAllowInlineDropTarget)(isNestedDropTarget, nextNode, isSameLayout, activeNode) && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget, (0, _extends2.default)({}, props, {
     position: "left"
   })), (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget, (0, _extends2.default)({}, props, {
     position: "right"

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/cjs/utils/inline-drop-target.js

@@ -10,12 +10,16 @@ var _advancedLayoutsFlags = require("./advanced-layouts-flags");
 var _checkMediaLayout = require("./check-media-layout");
 var shouldAllowInlineDropTarget = exports.shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(isNested, node) {
   var isSameLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var activeNode = arguments.length > 3 ? arguments[3] : undefined;
   if (!(0, _advancedLayoutsFlags.isPreRelease1)() || isNested) {
     return false;
   }
   if ((0, _checkMediaLayout.isWrappedMedia)(node)) {
     return false;
   }
+  if ((0, _advancedLayoutsFlags.isPreRelease2)() && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return false;
+  }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
     return node.childCount < (0, _consts.maxLayoutColumnSupported)() || (0, _advancedLayoutsFlags.isPreRelease2)() && isSameLayout;
   }

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),

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

@@ -25,8 +25,8 @@ const shouldIgnoreNode = (node, ignore_nodes, depth, parent) => {
 
   // TODO use isWrappedMedia when clean up the feature flag
   const isMediaSingle = 'mediaSingle' === node.type.name && fg('platform_editor_element_dnd_nested_fix_patch_1');
-  const isFirstTableHeaderOrTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && ['tableHeader', 'tableRow'].includes(node.type.name) && isPreRelease1();
-  if (isFirstTableHeaderOrTableRow) {
+  const isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && isPreRelease1();
+  if (isFirstTableRow) {
     return false;
   }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
@@ -84,8 +84,9 @@ export const nodeDecorations = (newState, from, to) => {
       var _anchorName2;
       anchorName = (_anchorName2 = anchorName) !== null && _anchorName2 !== void 0 ? _anchorName2 : `--node-anchor-${node.type.name}-${index}`;
     }
+    const anchorStyles = ['tableRow', 'media'].includes(node.type.name) ? `anchor-name: ${anchorName};` : `anchor-name: ${anchorName}; ${pos === 0 && !fg('platform_editor_element_dnd_nested_fix_patch_3') ? 'margin-top: 0px;' : ''} ${fg('platform_editor_element_dnd_nested_fix_patch_3') ? '' : 'position: relative; z-index: 1;'}`;
     decs.push(Decoration.node(pos, pos + node.nodeSize, {
-      style: `anchor-name: ${anchorName}; ${pos === 0 && !fg('platform_editor_element_dnd_nested_fix_patch_3') ? 'margin-top: 0px;' : ''} ${fg('platform_editor_element_dnd_nested_fix_patch_3') ? '' : 'position: relative; z-index: 1;'}`,
+      style: anchorStyles,
       ['data-drag-handler-anchor-name']: anchorName,
       ['data-drag-handler-node-type']: node.type.name,
       ['data-drag-handler-anchor-depth']: `${depth}`

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

@@ -155,6 +155,9 @@ export const dropTargetDecorations = (newState, api, formatMessage, activeNode,
     if (editorExperiment('nested-dnd', true)) {
       depth = $pos.depth;
       if (isAdvancedLayoutsPreRelease2) {
+        if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) === pos && activeNode.nodeType !== 'layoutColumn') {
+          return false;
+        }
         if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && (parent === null || parent === void 0 ? void 0 : parent.firstChild) !== node && (
         // Not the first node
         (parent === null || parent === void 0 ? void 0 : parent.childCount) < maxLayoutColumnSupported() || isSameLayout)) {

package/dist/es2019/ui/drop-target-layout.js

@@ -31,6 +31,7 @@ const dropTargetLayoutHintStyle = css({
   width: 0
 });
 export const DropTargetLayout = props => {
+  var _api$blockControls;
   const {
     api,
     getPos,
@@ -40,11 +41,10 @@ export const DropTargetLayout = props => {
   const [isDraggedOver, setIsDraggedOver] = useState(false);
   const anchorName = getNodeAnchor(parent);
   const [isActiveAnchor] = useActiveAnchorTracker(anchorName);
+  const {
+    activeNode
+  } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
   const onDrop = useCallback(() => {
-    var _api$blockControls;
-    const {
-      activeNode
-    } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
     if (!activeNode) {
       return;
     }
@@ -56,7 +56,7 @@ export const DropTargetLayout = props => {
       } = activeNode;
       api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.moveToLayout(from, to));
     }
-  }, [api, getPos]);
+  }, [api, getPos, activeNode]);
   useEffect(() => {
     if (ref.current) {
       return dropTargetForElements({
@@ -71,6 +71,9 @@ export const DropTargetLayout = props => {
       });
     }
   }, [onDrop]);
+  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return null;
+  }
   return jsx("div", {
     ref: ref,
     css: dropTargetLayoutStyle,

package/dist/es2019/ui/drop-target-v2.js

@@ -166,6 +166,7 @@ const HoverZone = ({
   });
 };
 export const DropTargetV2 = props => {
+  var _api$blockControls;
   const {
     api,
     getPos,
@@ -182,11 +183,10 @@ export const DropTargetV2 = props => {
     widthState
   } = useSharedPluginState(api, ['width']);
   const isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
+  const {
+    activeNode
+  } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
   const onDrop = () => {
-    var _api$blockControls;
-    const {
-      activeNode
-    } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
     if (!activeNode) {
       return;
     }
@@ -239,7 +239,7 @@ export const DropTargetV2 = props => {
     anchorRectCache: anchorRectCache,
     position: "lower",
     isNestedDropTarget: isNestedDropTarget
-  }), shouldAllowInlineDropTarget(isNestedDropTarget, nextNode, isSameLayout) && jsx(Fragment, null, jsx(InlineDropTarget, _extends({}, props, {
+  }), shouldAllowInlineDropTarget(isNestedDropTarget, nextNode, isSameLayout, activeNode) && jsx(Fragment, null, jsx(InlineDropTarget, _extends({}, props, {
     position: "left"
   })), jsx(InlineDropTarget, _extends({}, props, {
     position: "right"