@atlaskit/editor-plugin-block-controls 7.2.9 → 7.2.11

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.2.11
+
+### Patch Changes
+
+- [`606c3303a0d61`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/606c3303a0d61) -
+  [ux] ED-29331 fix block controls misalignment on first line of empty document with
+  platform_editor_native_anchor_support on
+- Updated dependencies
+
+## 7.2.10
+
+### Patch Changes
+
+- [`2470543de66c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2470543de66c4) -
+  [ux] ED-29341 fix block quote drag handle is hard to trigger behind with
+  platform_editor_native_anchor_support on
+- Updated dependencies
+
 ## 7.2.9
 
 ### Patch Changes
@@ -552,7 +570,6 @@
   shared context or singletons.
 
   **HOW TO ADJUST:**
-
   - Consumers must now explicitly install `@atlaskit/editor-common` in their own project if they use
     any of these editor plugins.
   - Ensure the version you install matches the version required by the plugins.
@@ -2246,7 +2263,6 @@
 - [#171014](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171014)
   [`6163248356c63`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6163248356c63) -
   [ED-25833] Replace the following FGs with experiment `platform_editor_advanced_layouts`
-
   - platform_editor_advanced_layouts_breakout_resizing
   - platform_editor_advanced_layouts_pre_release_1
   - platform_editor_advanced_layouts_pre_release_2

package/dist/cjs/pm-plugins/handle-mouse-down.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleMouseDown = void 0;
 var _styles = require("@atlaskit/editor-common/styles");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
   return function (view, event) {
@@ -12,7 +13,6 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
       return false;
     }
     if (!view.editable) {
-      var _rootNode$type$name, _rootNode$type$name2;
       var targetPos = view.posAtDOM(event.target, 0);
       // always fetch top level position for mouseDown to avoid drag handle positions being incorrect
       var rootPos = view.state.doc.resolve(targetPos).before(1);
@@ -20,7 +20,19 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
       if (!rootNode) {
         return false;
       }
-      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+      if ((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true)) {
+        var _rootNode$type$name, _rootNode$type$name2;
+        var anchorName = api === null || api === void 0 ? void 0 : api.core.actions.getAnchorIdForNode(rootNode, rootPos);
+
+        // don't show the handles if we can't find an anchor
+        if (!anchorName) {
+          return false;
+        }
+        api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, anchorName, (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, anchorName, (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+      } else {
+        var _rootNode$type$name3, _rootNode$type$name4;
+        api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name3 = rootNode.type.name) !== null && _rootNode$type$name3 !== void 0 ? _rootNode$type$name3 : '', undefined, rootPos, '', (_rootNode$type$name4 = rootNode.type.name) !== null && _rootNode$type$name4 !== void 0 ? _rootNode$type$name4 : ''));
+      }
     } else {
       var isDragHandle = event.target.closest((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? _styles.DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle]') !== null;
       api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -100,10 +100,20 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
         rootElement = parentElement;
       }
     }
+    var anchorName;
+    if ((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true)) {
+      anchorName = rootElement.getAttribute((0, _domAttrName.getAnchorAttrName)());
+
+      // don't show handles if we can't find an anchor
+      if (!anchorName) {
+        return false;
+      }
+    } else {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      anchorName = rootElement.getAttribute((0, _domAttrName.getAnchorAttrName)());
+    }
 
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    var anchorName = rootElement.getAttribute((0, _domAttrName.getAnchorAttrName)());
     // No need to update handle position if its already there
     if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName) === anchorName) {
       return false;

package/dist/cjs/pm-plugins/main.js

@@ -503,7 +503,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     }
   }
   var isEmptyDoc = (0, _utils.isEmptyDocument)(newState.doc);
-  if (isEmptyDoc) {
+  if (isEmptyDoc && !(0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true)) {
     var hasNodeDecoration = !!(0, _decorationsAnchor.findNodeDecs)(newState, decorations).length;
     if (!hasNodeDecoration) {
       decorations = decorations.add(newState.doc, [(0, _decorationsDragHandle.emptyParagraphNodeDecorations)()]);

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

@@ -129,7 +129,7 @@ var extendedHoverZoneNext = function extendedHoverZoneNext() {
     height: '100%',
     cursor: 'default',
     zIndex: 1
-  }), '&& [data-drag-handler-anchor-name][data-layout-column]::after', {
+  }), "&&& ".concat(dragHandlerAnchorSelectorNext, "[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
@@ -144,7 +144,7 @@ var extendedHoverZoneNext = function extendedHoverZoneNext() {
     zIndex: 1
   })), 'hr[data-drag-handler-anchor-name]', {
     overflow: 'visible'
-  }), '[data-blocks-drag-handle-container="true"] + [data-drag-handler-anchor-depth="0"]::after', {
+  }), "[data-blocks-drag-handle-container=\"true\"] + ".concat(dragHandlerAnchorSelectorNext, ":not([").concat(_domAttrName.NODE_ANCHOR_ATTR_NAME, "] [").concat(_domAttrName.NODE_ANCHOR_ATTR_NAME, "])::after"), {
     display: 'none'
   }));
 };
@@ -175,7 +175,7 @@ var extendedDragZone = (0, _react.css)({
 });
 var extendedDragZoneNext = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': (0, _defineProperty2.default)({}, "&& > ".concat(dragHandlerAnchorSelectorNext, "::after"), {
+  '.ProseMirror': (0, _defineProperty2.default)({}, "&& ".concat(dragHandlerAnchorSelectorNext, ":not([").concat(_domAttrName.NODE_ANCHOR_ATTR_NAME, "] [").concat(_domAttrName.NODE_ANCHOR_ATTR_NAME, "])::after"), {
     width: 'var(--ak-editor-max-container-width)',
     left: "calc((100% - var(--ak-editor-max-container-width))/2)"
   })
@@ -376,12 +376,9 @@ var withAnchorNameZindexStyle = (0, _react.css)({
 });
 var withAnchorNameZindexStyleNext = (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(_domAttrName.NODE_ANCHOR_ATTR_NAME, "]:not([").concat(_domAttrName.NODE_ANCHOR_ATTR_NAME, "] [").concat(_domAttrName.NODE_ANCHOR_ATTR_NAME, "])"), {
+    zIndex: 1
+  })
 });
 
 // This style is used to define width for block card (with datasource) that does not have layout

package/dist/es2019/pm-plugins/handle-mouse-down.js

@@ -1,11 +1,11 @@
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 export const handleMouseDown = api => (view, event) => {
   if (!(event.target instanceof HTMLElement)) {
     return false;
   }
   if (!view.editable) {
-    var _rootNode$type$name, _rootNode$type$name2;
     const targetPos = view.posAtDOM(event.target, 0);
     // always fetch top level position for mouseDown to avoid drag handle positions being incorrect
     const rootPos = view.state.doc.resolve(targetPos).before(1);
@@ -13,7 +13,19 @@ export const handleMouseDown = api => (view, event) => {
     if (!rootNode) {
       return false;
     }
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+    if (expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
+      var _rootNode$type$name, _rootNode$type$name2;
+      const anchorName = api === null || api === void 0 ? void 0 : api.core.actions.getAnchorIdForNode(rootNode, rootPos);
+
+      // don't show the handles if we can't find an anchor
+      if (!anchorName) {
+        return false;
+      }
+      api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, anchorName, (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, anchorName, (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+    } else {
+      var _rootNode$type$name3, _rootNode$type$name4;
+      api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name3 = rootNode.type.name) !== null && _rootNode$type$name3 !== void 0 ? _rootNode$type$name3 : '', undefined, rootPos, '', (_rootNode$type$name4 = rootNode.type.name) !== null && _rootNode$type$name4 !== void 0 ? _rootNode$type$name4 : ''));
+    }
   } else {
     const isDragHandle = event.target.closest(expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle]') !== null;
     api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -90,10 +90,20 @@ export const handleMouseOver = (view, event, api) => {
         rootElement = parentElement;
       }
     }
+    let anchorName;
+    if (expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
+      anchorName = rootElement.getAttribute(getAnchorAttrName());
+
+      // don't show handles if we can't find an anchor
+      if (!anchorName) {
+        return false;
+      }
+    } else {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      anchorName = rootElement.getAttribute(getAnchorAttrName());
+    }
 
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const anchorName = rootElement.getAttribute(getAnchorAttrName());
     // No need to update handle position if its already there
     if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName) === anchorName) {
       return false;

package/dist/es2019/pm-plugins/main.js

@@ -501,7 +501,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     }
   }
   const isEmptyDoc = isEmptyDocument(newState.doc);
-  if (isEmptyDoc) {
+  if (isEmptyDoc && !expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
     const hasNodeDecoration = !!findNodeDecs(newState, decorations).length;
     if (!hasNodeDecoration) {
       decorations = decorations.add(newState.doc, [emptyParagraphNodeDecorations()]);

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

@@ -149,8 +149,8 @@ const extendedHoverZoneNext = () => css({
       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': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
+    [`&&& ${dragHandlerAnchorSelectorNext}[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
@@ -171,8 +171,8 @@ const extendedHoverZoneNext = () => css({
     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': {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  [`[data-blocks-drag-handle-container="true"] + ${dragHandlerAnchorSelectorNext}:not([${NODE_ANCHOR_ATTR_NAME}] [${NODE_ANCHOR_ATTR_NAME}])::after`]: {
     display: 'none'
   }
 });
@@ -219,8 +219,8 @@ const extendedDragZone = css({
 const extendedDragZoneNext = 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, @atlaskit/ui-styling-standard/no-unsafe-values
-    [`&& > ${dragHandlerAnchorSelectorNext}::after`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    [`&& ${dragHandlerAnchorSelectorNext}:not([${NODE_ANCHOR_ATTR_NAME}] [${NODE_ANCHOR_ATTR_NAME}])::after`]: {
       width: 'var(--ak-editor-max-container-width)',
       left: `calc((100% - var(--ak-editor-max-container-width))/2)`
     }
@@ -447,8 +447,8 @@ const withAnchorNameZindexStyle = css({
 const withAnchorNameZindexStyleNext = 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]': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    [`&& [${NODE_ANCHOR_ATTR_NAME}]:not([${NODE_ANCHOR_ATTR_NAME}] [${NODE_ANCHOR_ATTR_NAME}])`]: {
       zIndex: 1
     }
   }

package/dist/esm/pm-plugins/handle-mouse-down.js

@@ -1,4 +1,5 @@
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 export var handleMouseDown = function handleMouseDown(api) {
   return function (view, event) {
@@ -6,7 +7,6 @@ export var handleMouseDown = function handleMouseDown(api) {
       return false;
     }
     if (!view.editable) {
-      var _rootNode$type$name, _rootNode$type$name2;
       var targetPos = view.posAtDOM(event.target, 0);
       // always fetch top level position for mouseDown to avoid drag handle positions being incorrect
       var rootPos = view.state.doc.resolve(targetPos).before(1);
@@ -14,7 +14,19 @@ export var handleMouseDown = function handleMouseDown(api) {
       if (!rootNode) {
         return false;
       }
-      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+      if (expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
+        var _rootNode$type$name, _rootNode$type$name2;
+        var anchorName = api === null || api === void 0 ? void 0 : api.core.actions.getAnchorIdForNode(rootNode, rootPos);
+
+        // don't show the handles if we can't find an anchor
+        if (!anchorName) {
+          return false;
+        }
+        api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, anchorName, (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, anchorName, (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+      } else {
+        var _rootNode$type$name3, _rootNode$type$name4;
+        api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name3 = rootNode.type.name) !== null && _rootNode$type$name3 !== void 0 ? _rootNode$type$name3 : '', undefined, rootPos, '', (_rootNode$type$name4 = rootNode.type.name) !== null && _rootNode$type$name4 !== void 0 ? _rootNode$type$name4 : ''));
+      }
     } else {
       var isDragHandle = event.target.closest(expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle]') !== null;
       api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -93,10 +93,20 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
         rootElement = parentElement;
       }
     }
+    var anchorName;
+    if (expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
+      anchorName = rootElement.getAttribute(getAnchorAttrName());
+
+      // don't show handles if we can't find an anchor
+      if (!anchorName) {
+        return false;
+      }
+    } else {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      anchorName = rootElement.getAttribute(getAnchorAttrName());
+    }
 
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    var anchorName = rootElement.getAttribute(getAnchorAttrName());
     // No need to update handle position if its already there
     if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName) === anchorName) {
       return false;

package/dist/esm/pm-plugins/main.js

@@ -496,7 +496,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     }
   }
   var isEmptyDoc = isEmptyDocument(newState.doc);
-  if (isEmptyDoc) {
+  if (isEmptyDoc && !expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
     var hasNodeDecoration = !!findNodeDecs(newState, decorations).length;
     if (!hasNodeDecoration) {
       decorations = decorations.add(newState.doc, [emptyParagraphNodeDecorations()]);

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

@@ -122,7 +122,7 @@ var extendedHoverZoneNext = function extendedHoverZoneNext() {
     height: '100%',
     cursor: 'default',
     zIndex: 1
-  }), '&& [data-drag-handler-anchor-name][data-layout-column]::after', {
+  }), "&&& ".concat(dragHandlerAnchorSelectorNext, "[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
@@ -137,7 +137,7 @@ var extendedHoverZoneNext = function extendedHoverZoneNext() {
     zIndex: 1
   })), 'hr[data-drag-handler-anchor-name]', {
     overflow: 'visible'
-  }), '[data-blocks-drag-handle-container="true"] + [data-drag-handler-anchor-depth="0"]::after', {
+  }), "[data-blocks-drag-handle-container=\"true\"] + ".concat(dragHandlerAnchorSelectorNext, ":not([").concat(NODE_ANCHOR_ATTR_NAME, "] [").concat(NODE_ANCHOR_ATTR_NAME, "])::after"), {
     display: 'none'
   }));
 };
@@ -168,7 +168,7 @@ var extendedDragZone = css({
 });
 var extendedDragZoneNext = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': _defineProperty({}, "&& > ".concat(dragHandlerAnchorSelectorNext, "::after"), {
+  '.ProseMirror': _defineProperty({}, "&& ".concat(dragHandlerAnchorSelectorNext, ":not([").concat(NODE_ANCHOR_ATTR_NAME, "] [").concat(NODE_ANCHOR_ATTR_NAME, "])::after"), {
     width: 'var(--ak-editor-max-container-width)',
     left: "calc((100% - var(--ak-editor-max-container-width))/2)"
   })
@@ -369,12 +369,9 @@ var withAnchorNameZindexStyle = css({
 });
 var withAnchorNameZindexStyleNext = 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': _defineProperty({}, "&& [".concat(NODE_ANCHOR_ATTR_NAME, "]:not([").concat(NODE_ANCHOR_ATTR_NAME, "] [").concat(NODE_ANCHOR_ATTR_NAME, "])"), {
+    zIndex: 1
+  })
 });
 
 // This style is used to define width for block card (with datasource) that does not have layout

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.2.9",
+	"version": "7.2.11",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^15.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.10.0",
+		"@atlaskit/tmp-editor-statsig": "^13.12.0",
 		"@atlaskit/tokens": "^6.5.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@babel/runtime": "^7.0.0",
@@ -64,7 +64,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.12.0",
+		"@atlaskit/editor-common": "^110.13.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"