@atlaskit/editor-plugin-block-controls 2.14.3 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.15.0
+
+### Minor Changes
+
+- [#173846](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/173846)
+  [`9db562f586e8b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9db562f586e8b) -
+  ED-25939 prevent native dnd and use block controls
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.14.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/decorations-drag-handle.js

@@ -33,7 +33,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
   (0, _decorationsCommon.unmountDecorations)(nodeViewPortalProviderAPI, 'data-blocks-drag-handle-container', 'data-blocks-drag-handle-key');
   var unbind;
   var key = (0, _uuid.default)();
-  return _view.Decoration.widget(pos, function (view, getPos) {
+  return _view.Decoration.widget(pos, function (view, getPosUnsafe) {
     var element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
     // platform_editor_element_dnd_nested_fix_patch_2 -> inline decoration causes focus issues when refocusing Editor into first line
@@ -42,6 +42,13 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     element.setAttribute('data-blocks-drag-handle-container', 'true');
     element.setAttribute('data-blocks-drag-handle-key', key);
     var isTopLevelNode = true;
+    var getPos = function getPos() {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       var newPos = (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? getPos() : pos;
       if (typeof newPos === 'number') {

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

@@ -90,7 +90,14 @@ var findDropTargetDecs = exports.findDropTargetDecs = function findDropTargetDec
 };
 var createDropTargetDecoration = exports.createDropTargetDecoration = function createDropTargetDecoration(pos, props, nodeViewPortalProviderAPI, side, anchorRectCache, isSameLayout) {
   var key = (0, _uuid.default)();
-  return _view.Decoration.widget(pos, function (_, getPos) {
+  return _view.Decoration.widget(pos, function (_, getPosUnsafe) {
+    var getPos = function getPos() {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     var element = document.createElement('div');
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);
@@ -138,7 +145,14 @@ var createDropTargetDecoration = exports.createDropTargetDecoration = function c
 };
 var createLayoutDropTargetDecoration = exports.createLayoutDropTargetDecoration = function createLayoutDropTargetDecoration(pos, props, nodeViewPortalProviderAPI, anchorRectCache) {
   var key = (0, _uuid.default)();
-  return _view.Decoration.widget(pos, function (_, getPos) {
+  return _view.Decoration.widget(pos, function (_, getPosUnsafe) {
+    var getPos = function getPos() {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     var element = document.createElement('div');
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);

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

@@ -484,6 +484,11 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           // Currently we can only drag one node at a time
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
+          if ((draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+            // we prevent native DnD for layoutColumn to prevent single column layout.
+            event.preventDefault();
+            return false;
+          }
           var nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
           if (!nodeElement) {
             return false;

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

@@ -146,7 +146,17 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   // but ensures the preview is generated correctly.
   var handleMouseDown = (0, _react.useCallback)(function () {
     var _api$core3;
-    if (!(isLayoutColumn && (0, _experiments.editorExperiment)('advanced_layouts', true)) && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24885')) {
+    if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
+      // prevent native drag and drop.
+      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _buttonRef$current;
+        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
+      }
+      if (!isLayoutColumn) {
+        return undefined;
+      }
+    }
+    if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24885')) {
       return undefined;
     }
     api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
@@ -363,8 +373,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   (0, _react.useEffect)(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
       var id = requestAnimationFrame(function () {
-        var _buttonRef$current;
-        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
+        var _buttonRef$current2;
+        (_buttonRef$current2 = buttonRef.current) === null || _buttonRef$current2 === void 0 || _buttonRef$current2.focus();
       });
       return function () {
         cancelAnimationFrame(id);

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

@@ -134,6 +134,16 @@ var legacyBreakoutWideLayoutStyle = (0, _react.css)({
     }
   }
 });
+var globalDnDStyle = (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, @atlaskit/ui-styling-standard/no-unsafe-values
+    '[data-layout-content]': {
+      userDrag: 'none',
+      userSelect: 'none'
+    }
+  }
+});
 var globalStyles = function globalStyles() {
   return (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
@@ -219,6 +229,6 @@ var blockCardWithoutLayout = (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)('advanced_layouts', true) ? blockCardWithoutLayout : 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, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1') && globalDnDStyle, (0, _experiments.editorExperiment)('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, (0, _experiments.editorExperiment)('advanced_layouts', true) ? blockCardWithoutLayout : 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]
   });
 };

package/dist/es2019/pm-plugins/decorations-drag-handle.js

@@ -24,7 +24,7 @@ export const dragHandleDecoration = (api, formatMessage, pos, anchorName, nodeTy
   unmountDecorations(nodeViewPortalProviderAPI, 'data-blocks-drag-handle-container', 'data-blocks-drag-handle-key');
   let unbind;
   const key = uuid();
-  return Decoration.widget(pos, (view, getPos) => {
+  return Decoration.widget(pos, (view, getPosUnsafe) => {
     const element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
     // platform_editor_element_dnd_nested_fix_patch_2 -> inline decoration causes focus issues when refocusing Editor into first line
@@ -33,6 +33,13 @@ export const dragHandleDecoration = (api, formatMessage, pos, anchorName, nodeTy
     element.setAttribute('data-blocks-drag-handle-container', 'true');
     element.setAttribute('data-blocks-drag-handle-key', key);
     let isTopLevelNode = true;
+    const getPos = () => {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     if (editorExperiment('nested-dnd', true)) {
       const newPos = fg('platform_editor_element_dnd_nested_fix_patch_3') ? getPos() : pos;
       if (typeof newPos === 'number') {

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

@@ -78,7 +78,14 @@ export const findDropTargetDecs = (decorations, from, to) => {
 };
 export const createDropTargetDecoration = (pos, props, nodeViewPortalProviderAPI, side, anchorRectCache, isSameLayout) => {
   const key = uuid();
-  return Decoration.widget(pos, (_, getPos) => {
+  return Decoration.widget(pos, (_, getPosUnsafe) => {
+    const getPos = () => {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     const element = document.createElement('div');
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);
@@ -127,7 +134,14 @@ export const createDropTargetDecoration = (pos, props, nodeViewPortalProviderAPI
 };
 export const createLayoutDropTargetDecoration = (pos, props, nodeViewPortalProviderAPI, anchorRectCache) => {
   const key = uuid();
-  return Decoration.widget(pos, (_, getPos) => {
+  return Decoration.widget(pos, (_, getPosUnsafe) => {
+    const getPos = () => {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     const element = document.createElement('div');
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);

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

@@ -461,6 +461,11 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           // Currently we can only drag one node at a time
           // so we only need to check first child
           const draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
+          if ((draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+            // we prevent native DnD for layoutColumn to prevent single column layout.
+            event.preventDefault();
+            return false;
+          }
           const nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
           if (!nodeElement) {
             return false;

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

@@ -129,7 +129,17 @@ export const DragHandle = ({
   // but ensures the preview is generated correctly.
   const handleMouseDown = useCallback(() => {
     var _api$core3;
-    if (!(isLayoutColumn && editorExperiment('advanced_layouts', true)) && fg('platform_editor_element_drag_and_drop_ed_24885')) {
+    if (editorExperiment('advanced_layouts', true)) {
+      // prevent native drag and drop.
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _buttonRef$current;
+        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
+      }
+      if (!isLayoutColumn) {
+        return undefined;
+      }
+    }
+    if (fg('platform_editor_element_drag_and_drop_ed_24885')) {
       return undefined;
     }
     api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
@@ -344,8 +354,8 @@ export const DragHandle = ({
   useEffect(() => {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && fg('platform_editor_element_drag_and_drop_ed_23873')) {
       const id = requestAnimationFrame(() => {
-        var _buttonRef$current;
-        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
+        var _buttonRef$current2;
+        (_buttonRef$current2 = buttonRef.current) === null || _buttonRef$current2 === void 0 ? void 0 : _buttonRef$current2.focus();
       });
       return () => {
         cancelAnimationFrame(id);

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

@@ -160,6 +160,16 @@ const legacyBreakoutWideLayoutStyle = css({
     }
   }
 });
+const globalDnDStyle = 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
+    '[data-layout-content]': {
+      userDrag: 'none',
+      userSelect: 'none'
+    }
+  }
+});
 const globalStyles = () => fg('platform_editor_element_dnd_nested_fix_patch_3') ? css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror-widget:first-child + *:not([data-panel-type], .code-block, [data-node-type="nestedExpand"], [data-layout-section="true"])': {
@@ -261,6 +271,6 @@ const blockCardWithoutLayout = css({
 });
 export const GlobalStylesWrapper = () => {
   return jsx(Global, {
-    styles: [globalStyles(), editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, fg('platform_editor_element_dnd_nested_fix_patch_1') ? withDividerInPanelStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_2') ? withFormatInLayoutStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_3') ? [withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle] : undefined]
+    styles: [globalStyles(), fg('platform_editor_advanced_layouts_post_fix_patch_1') && globalDnDStyle, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, fg('platform_editor_element_dnd_nested_fix_patch_1') ? withDividerInPanelStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_2') ? withFormatInLayoutStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_3') ? [withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle] : undefined]
   });
 };

package/dist/esm/pm-plugins/decorations-drag-handle.js

@@ -26,7 +26,7 @@ export var dragHandleDecoration = function dragHandleDecoration(api, formatMessa
   unmountDecorations(nodeViewPortalProviderAPI, 'data-blocks-drag-handle-container', 'data-blocks-drag-handle-key');
   var unbind;
   var key = uuid();
-  return Decoration.widget(pos, function (view, getPos) {
+  return Decoration.widget(pos, function (view, getPosUnsafe) {
     var element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
     // platform_editor_element_dnd_nested_fix_patch_2 -> inline decoration causes focus issues when refocusing Editor into first line
@@ -35,6 +35,13 @@ export var dragHandleDecoration = function dragHandleDecoration(api, formatMessa
     element.setAttribute('data-blocks-drag-handle-container', 'true');
     element.setAttribute('data-blocks-drag-handle-key', key);
     var isTopLevelNode = true;
+    var getPos = function getPos() {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     if (editorExperiment('nested-dnd', true)) {
       var newPos = fg('platform_editor_element_dnd_nested_fix_patch_3') ? getPos() : pos;
       if (typeof newPos === 'number') {

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

@@ -83,7 +83,14 @@ export var findDropTargetDecs = function findDropTargetDecs(decorations, from, t
 };
 export var createDropTargetDecoration = function createDropTargetDecoration(pos, props, nodeViewPortalProviderAPI, side, anchorRectCache, isSameLayout) {
   var key = uuid();
-  return Decoration.widget(pos, function (_, getPos) {
+  return Decoration.widget(pos, function (_, getPosUnsafe) {
+    var getPos = function getPos() {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     var element = document.createElement('div');
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);
@@ -131,7 +138,14 @@ export var createDropTargetDecoration = function createDropTargetDecoration(pos,
 };
 export var createLayoutDropTargetDecoration = function createLayoutDropTargetDecoration(pos, props, nodeViewPortalProviderAPI, anchorRectCache) {
   var key = uuid();
-  return Decoration.widget(pos, function (_, getPos) {
+  return Decoration.widget(pos, function (_, getPosUnsafe) {
+    var getPos = function getPos() {
+      try {
+        return getPosUnsafe();
+      } catch (e) {
+        return undefined;
+      }
+    };
     var element = document.createElement('div');
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);

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

@@ -477,6 +477,11 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           // Currently we can only drag one node at a time
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
+          if ((draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+            // we prevent native DnD for layoutColumn to prevent single column layout.
+            event.preventDefault();
+            return false;
+          }
           var nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
           if (!nodeElement) {
             return false;

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

@@ -137,7 +137,17 @@ export var DragHandle = function DragHandle(_ref) {
   // but ensures the preview is generated correctly.
   var handleMouseDown = useCallback(function () {
     var _api$core3;
-    if (!(isLayoutColumn && editorExperiment('advanced_layouts', true)) && fg('platform_editor_element_drag_and_drop_ed_24885')) {
+    if (editorExperiment('advanced_layouts', true)) {
+      // prevent native drag and drop.
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _buttonRef$current;
+        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
+      }
+      if (!isLayoutColumn) {
+        return undefined;
+      }
+    }
+    if (fg('platform_editor_element_drag_and_drop_ed_24885')) {
       return undefined;
     }
     api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
@@ -354,8 +364,8 @@ export var DragHandle = function DragHandle(_ref) {
   useEffect(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && fg('platform_editor_element_drag_and_drop_ed_23873')) {
       var id = requestAnimationFrame(function () {
-        var _buttonRef$current;
-        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
+        var _buttonRef$current2;
+        (_buttonRef$current2 = buttonRef.current) === null || _buttonRef$current2 === void 0 || _buttonRef$current2.focus();
       });
       return function () {
         cancelAnimationFrame(id);

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

@@ -127,6 +127,16 @@ var legacyBreakoutWideLayoutStyle = css({
     }
   }
 });
+var globalDnDStyle = 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
+    '[data-layout-content]': {
+      userDrag: 'none',
+      userSelect: 'none'
+    }
+  }
+});
 var globalStyles = function globalStyles() {
   return fg('platform_editor_element_dnd_nested_fix_patch_3') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
@@ -212,6 +222,6 @@ var blockCardWithoutLayout = css({
 });
 export var GlobalStylesWrapper = function GlobalStylesWrapper() {
   return jsx(Global, {
-    styles: [globalStyles(), editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, fg('platform_editor_element_dnd_nested_fix_patch_1') ? withDividerInPanelStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_2') ? withFormatInLayoutStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_3') ? [withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle] : undefined]
+    styles: [globalStyles(), fg('platform_editor_advanced_layouts_post_fix_patch_1') && globalDnDStyle, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, fg('platform_editor_element_dnd_nested_fix_patch_1') ? withDividerInPanelStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_2') ? withFormatInLayoutStyleFix : undefined, fg('platform_editor_element_dnd_nested_fix_patch_3') ? [withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle] : undefined]
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.14.3",
+	"version": "2.15.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.2.0",
+		"@atlaskit/editor-common": "^96.3.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.0.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",