@atlaskit/editor-plugin-block-controls 2.13.29 → 2.13.31

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.13.31
+
+### Patch Changes
+
+- [#171553](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171553)
+  [`ef0f90dd048d8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ef0f90dd048d8) -
+  [ED-25917] Replace dynamic styles for inline hover zone with css var
+- [#171077](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171077)
+  [`0a92cf56671ac`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0a92cf56671ac) -
+  ED-25867 always show drag handler for layout columns
+- Updated dependencies
+
+## 2.13.30
+
+### Patch Changes
+
+- [#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
+
 ## 2.13.29
 
 ### Patch Changes

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

@@ -10,7 +10,6 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _decorationsCommon = require("./decorations-common");
-var _advancedLayoutsFlags = require("./utils/advanced-layouts-flags");
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
 var IGNORE_NODES_NEXT = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption'];
 var IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
@@ -23,7 +22,7 @@ var shouldDescendIntoNode = exports.shouldDescendIntoNode = function shouldDesce
       return false;
     }
   }
-  if ((0, _advancedLayoutsFlags.isPreRelease1)()) {
+  if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
     return !IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT.includes(node.type.name);
   }
   return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
@@ -33,7 +32,7 @@ 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 isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && (0, _advancedLayoutsFlags.isPreRelease1)();
+  var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && (0, _experiments.editorExperiment)('advanced_layouts', true);
   if (isFirstTableRow) {
     return false;
   }
@@ -73,7 +72,7 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
   var decs = [];
   var docFrom = from === undefined || from < 0 ? 0 : from;
   var docTo = to === undefined || to > newState.doc.nodeSize - 2 ? newState.doc.nodeSize - 2 : to;
-  var ignore_nodes = (0, _advancedLayoutsFlags.isPreRelease2)() ? IGNORE_NODES_NEXT : IGNORE_NODES;
+  var ignore_nodes = (0, _experiments.editorExperiment)('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
   newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
     var _Decoration$node;
     var depth = 0;

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

@@ -18,7 +18,6 @@ var _dropTarget = require("../ui/drop-target");
 var _dropTargetLayout = require("../ui/drop-target-layout");
 var _dropTargetV = require("../ui/drop-target-v2");
 var _decorationsCommon = require("./decorations-common");
-var _advancedLayoutsFlags = require("./utils/advanced-layouts-flags");
 var _consts2 = require("./utils/consts");
 var _dragTargetDebug = require("./utils/drag-target-debug");
 var _validation = require("./utils/validation");
@@ -186,7 +185,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     popNodeStack(depth);
     prevNodeStack.push(node);
   };
-  var isAdvancedLayoutsPreRelease2 = (0, _advancedLayoutsFlags.isPreRelease2)();
+  var isAdvancedLayoutsPreRelease2 = (0, _experiments.editorExperiment)('advanced_layouts', true);
   newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
     var depth = 0;
     // drop target deco at the end position

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleMouseOver = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _advancedLayoutsFlags = require("./utils/advanced-layouts-flags");
 var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(target) {
   if (target instanceof HTMLHeadingElement || target instanceof HTMLParagraphElement) {
     var _target$parentElement;
@@ -14,26 +13,6 @@ var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(t
   }
   return false;
 };
-var isEmptyParagraphOrPlaceholder = function isEmptyParagraphOrPlaceholder(node) {
-  if (node && node.type.name === 'paragraph') {
-    var _node$firstChild;
-    return node.childCount === 0 || node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'placeholder';
-  }
-  return false;
-};
-var isLayoutColumnWithoutContent = function isLayoutColumnWithoutContent(node) {
-  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutColumn') {
-    var foundNonEmptyNode = false;
-    for (var i = 0; i < node.childCount; i++) {
-      var child = node.child(i);
-      if (!isEmptyParagraphOrPlaceholder(child)) {
-        foundNonEmptyNode = true;
-        break;
-      }
-    }
-    return !foundNonEmptyNode;
-  }
-};
 var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -56,7 +35,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     if ((0, _experiments.editorExperiment)('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
     }
-    if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && (0, _advancedLayoutsFlags.isPreRelease1)()) {
+    if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
       rootElement = rootElement.closest('[data-drag-handler-anchor-name][data-drag-handler-node-type="mediaSingle"]');
       if (!rootElement) {
         return false;
@@ -99,11 +78,6 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    var node = view.state.doc.nodeAt(pos);
-    if ((0, _advancedLayoutsFlags.isPreRelease2)() && node && isLayoutColumnWithoutContent(node)) {
-      // Don't show drag handle when there is no content/only placeholder in layout column
-      return false;
-    }
     var rootPos;
     if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       rootPos = view.state.doc.resolve(pos).pos;

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

@@ -25,7 +25,6 @@ var _decorationsDropTarget = require("./decorations-drop-target");
 var _handleMouseOver = require("./handle-mouse-over");
 var _keymap = require("./keymap");
 var _activeAnchorTracker = require("./utils/active-anchor-tracker");
-var _advancedLayoutsFlags = require("./utils/advanced-layouts-flags");
 var _anchorUtils = require("./utils/anchor-utils");
 var _dragTargetDebug = require("./utils/drag-target-debug");
 var _transactions = require("./utils/transactions");
@@ -502,7 +501,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           return false;
         },
         dragenter: function dragenter(_view, event) {
-          if ((0, _advancedLayoutsFlags.isPreRelease2)()) {
+          if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
             if (isHTMLElement(event.target)) {
               var closestParentElement = event.target.closest('[data-drag-handler-anchor-depth="0"]');
               if (closestParentElement) {
@@ -516,7 +515,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
         },
         dragstart: function dragstart(view) {
           var _anchorRectCache;
-          if ((0, _advancedLayoutsFlags.isPreRelease2)()) {
+          if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
             _activeAnchorTracker.defaultActiveAnchorTracker.reset();
           }
           (_anchorRectCache = anchorRectCache) === null || _anchorRectCache === void 0 || _anchorRectCache.setEditorView(view);

package/dist/cjs/pm-plugins/utils/active-anchor-tracker.js

@@ -11,7 +11,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _events = require("events");
 var _react = require("react");
-var _advancedLayoutsFlags = require("./advanced-layouts-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var ActiveAnchorTracker = exports.ActiveAnchorTracker = /*#__PURE__*/function () {
   function ActiveAnchorTracker() {
     (0, _classCallCheck2.default)(this, ActiveAnchorTracker);
@@ -67,7 +67,7 @@ var useActiveAnchorTracker = exports.useActiveAnchorTracker = function useActive
     setIsActive(eventIsActive);
   };
   (0, _react.useEffect)(function () {
-    if (activeAnchorTracker && anchorName && (0, _advancedLayoutsFlags.isPreRelease2)()) {
+    if (activeAnchorTracker && anchorName && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
       activeAnchorTracker.subscribe(anchorName, onActive);
       var unsubscribe = function unsubscribe() {
         activeAnchorTracker.unsubscribe(anchorName, onActive);

package/dist/cjs/pm-plugins/utils/consts.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.maxLayoutColumnSupported = exports.MIN_LAYOUT_COLUMN = exports.DIRECTION = void 0;
-var _advancedLayoutsFlags = require("./advanced-layouts-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var DIRECTION = exports.DIRECTION = /*#__PURE__*/function (DIRECTION) {
   DIRECTION["UP"] = "up";
   DIRECTION["DOWN"] = "down";
@@ -13,6 +13,6 @@ var DIRECTION = exports.DIRECTION = /*#__PURE__*/function (DIRECTION) {
   return DIRECTION;
 }({});
 var maxLayoutColumnSupported = exports.maxLayoutColumnSupported = function maxLayoutColumnSupported() {
-  return (0, _advancedLayoutsFlags.isPreRelease2)() ? 5 : 3;
+  return (0, _experiments.editorExperiment)('advanced_layouts', true) ? 5 : 3;
 };
 var MIN_LAYOUT_COLUMN = exports.MIN_LAYOUT_COLUMN = 2;

package/dist/cjs/pm-plugins/utils/inline-drop-target.js

@@ -5,23 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shouldAllowInlineDropTarget = void 0;
 var _utils = require("@atlaskit/editor-common/utils");
-var _advancedLayoutsFlags = require("./advanced-layouts-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _checkMediaLayout = require("./check-media-layout");
 var _consts = require("./consts");
 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) {
+  if ((0, _experiments.editorExperiment)('advanced_layouts', false) || isNested) {
     return false;
   }
   if ((0, _checkMediaLayout.isWrappedMedia)(node)) {
     return false;
   }
-  if ((0, _advancedLayoutsFlags.isPreRelease2)() && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+  if ((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;
+    return node.childCount < (0, _consts.maxLayoutColumnSupported)() || isSameLayout;
   }
   return !(0, _utils.isEmptyParagraph)(node);
 };

package/dist/cjs/pm-plugins/utils/validation.js

@@ -9,7 +9,6 @@ exports.transformSliceExpandToNestedExpand = exports.transformExpandToNestedExpa
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _advancedLayoutsFlags = require("./advanced-layouts-flags");
 var isInsideTable = exports.isInsideTable = function isInsideTable(nodeType) {
   var _nodeType$schema$node = nodeType.schema.nodes,
     tableCell = _nodeType$schema$node.tableCell,
@@ -81,7 +80,7 @@ function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNode) {
   var srcNodeType = srcNode.type;
   var parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
   var activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
-  if ((0, _advancedLayoutsFlags.isPreRelease2)() && activeNodeType === 'layoutColumn') {
+  if (activeNodeType === 'layoutColumn' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
     // Allow drag layout column and drop into layout section
     if ((destNode === null || destNode === void 0 ? void 0 : destNode.type.name) === 'layoutSection' || parentNodeType === 'doc') {
       return true;

package/dist/cjs/ui/consts.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.topPositionAdjustment = exports.spaceLookupMap = exports.nodeMargins = exports.getNestedNodeLeftPaddingMargin = exports.dropTargetMarginMap = exports.dragHandleGap = exports.DRAG_HANDLE_ZINDEX = exports.DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_NARROW_GAP = exports.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP = exports.DRAG_HANDLE_MAX_GAP = exports.DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_H6_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H5_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H4_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H3_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DEFAULT_GAP = exports.DRAG_HANDLE_BORDER_RADIUS = exports.DEFAULT_COLUMN_DISTRIBUTIONS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _dropTargetMarginMap;
 var DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_HEIGHT = 24;
 var DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_WIDTH = 12;
@@ -27,7 +27,7 @@ var dragHandleGap = exports.dragHandleGap = function dragHandleGap(nodeType, par
   if (parentNodeType && parentNodeType !== 'doc') {
     return DRAG_HANDLE_NARROW_GAP;
   }
-  if (nodeType === 'layoutSection' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_breakout_resizing')) {
+  if (nodeType === 'layoutSection' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
     return DRAG_HANDLE_MAX_GAP + 12;
   }
   if (nodeTypeExcludeList.includes(nodeType)) {
@@ -55,7 +55,7 @@ var getNestedNodeLeftPaddingMargin = exports.getNestedNodeLeftPaddingMargin = fu
   }
 };
 var topPositionAdjustment = exports.topPositionAdjustment = function topPositionAdjustment(nodeType) {
-  if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_breakout_resizing')) {
+  if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
     switch (nodeType) {
       case 'rule':
         return -DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT;

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

@@ -23,7 +23,6 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _main = require("../pm-plugins/main");
 var _utils = require("../pm-plugins/utils");
-var _advancedLayoutsFlags = require("../pm-plugins/utils/advanced-layouts-flags");
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
 var _consts = require("./consts");
 var _dragPreview = require("./drag-preview");
@@ -147,7 +146,7 @@ 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, _advancedLayoutsFlags.isPreRelease2)()) && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24885')) {
+    if (!(isLayoutColumn && (0, _experiments.editorExperiment)('advanced_layouts', true)) && (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) {
@@ -161,7 +160,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         return tr;
       }
       var selection;
-      if (isLayoutColumn && (0, _advancedLayoutsFlags.isPreRelease2)()) {
+      if (isLayoutColumn && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
         selection = new _state.NodeSelection(tr.doc.resolve(startPos));
       } else {
         var $startPos = tr.doc.resolve(startPos + node.nodeSize);
@@ -294,8 +293,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     var isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     if (supportsAnchor) {
       return {
-        left: isEdgeCase ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : (0, _advancedLayoutsFlags.isPreRelease2)() && isLayoutColumn ? "calc((anchor(".concat(anchorName, " right) + anchor(").concat(anchorName, " left))/2 - ").concat(_consts.DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(anchorName, " start) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts.dragHandleGap)(nodeType, parentNodeType), "px)"),
-        top: (0, _advancedLayoutsFlags.isPreRelease2)() && isLayoutColumn ? "calc(anchor(".concat(anchorName, " top) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px)") : (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_ed_23674') ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _consts.topPositionAdjustment)(nodeType), "px)") : anchorName.includes('table') ? "calc(anchor(".concat(anchorName, " start) + ").concat(_consts.DRAG_HANDLE_HEIGHT, "px)") : "anchor(".concat(anchorName, " start)")
+        left: isEdgeCase ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc((anchor(".concat(anchorName, " right) + anchor(").concat(anchorName, " left))/2 - ").concat(_consts.DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(anchorName, " start) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts.dragHandleGap)(nodeType, parentNodeType), "px)"),
+        top: (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(anchorName, " top) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px)") : (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_ed_23674') ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _consts.topPositionAdjustment)(nodeType), "px)") : anchorName.includes('table') ? "calc(anchor(".concat(anchorName, " start) + ").concat(_consts.DRAG_HANDLE_HEIGHT, "px)") : "anchor(".concat(anchorName, " start)")
       };
     }
     return {
@@ -418,7 +417,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       // eslint-disable-next-line @atlaskit/design-system/no-html-button
       (0, _react2.jsx)("button", {
         type: "button",
-        css: [dragHandleButtonStyles, (0, _advancedLayoutsFlags.isPreRelease2)() && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
+        css: [dragHandleButtonStyles, (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
         ref: buttonRef
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,

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

@@ -17,7 +17,6 @@ var _constants = require("@atlaskit/theme/constants");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
-var _advancedLayoutsFlags = require("../pm-plugins/utils/advanced-layouts-flags");
 var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
 var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
 var _inlineDropTarget = require("../pm-plugins/utils/inline-drop-target");
@@ -97,7 +96,7 @@ var HoverZone = function HoverZone(_ref) {
       return (0, _adapter.dropTargetForElements)({
         element: ref.current,
         onDragEnter: function onDragEnter() {
-          if (!isNestedDropTarget && (0, _advancedLayoutsFlags.isPreRelease2)()) {
+          if (!isNestedDropTarget && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
             setActiveAnchor();
           }
           _onDragEnter();

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InlineDropTarget = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -14,7 +15,6 @@ var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _colors = require("@atlaskit/theme/colors");
 var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
-var _advancedLayoutsFlags = require("../pm-plugins/utils/advanced-layouts-flags");
 var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
 var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
 /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
@@ -26,10 +26,31 @@ var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 
+var HOVER_ZONE_WIDTH = '--editor-blocks-inline-hover-zone-width';
+var HOVER_ZONE_HEIGHT = '--editor-blocks-inline-hover-zone-height';
+var HOVER_ZONE_TOP = '--editor-blocks-inline-hover-zone-top';
+var HOVER_ZONE_BOTTOM = '--editor-blocks-inline-hover-zone-bottom';
+var HOVER_ZONE_ANCHOR_NAME = '--editor-blocks-inline-hover-zone-anchor-name';
 var hoverZoneCommonStyle = (0, _react2.css)({
   position: 'absolute',
   // above the top and bottom drop zone as block hover zone
-  zIndex: 120
+  zIndex: 120,
+  positionAnchor: "var(".concat(HOVER_ZONE_ANCHOR_NAME, ")"),
+  minWidth: "var(--ds-space-100, 8px)",
+  left: 0,
+  right: 0,
+  width: "var(".concat(HOVER_ZONE_WIDTH, ")"),
+  height: "var(".concat(HOVER_ZONE_HEIGHT, ")")
+});
+var leftHoverZoneStyle = (0, _react2.css)({
+  right: "unset",
+  top: "var(".concat(HOVER_ZONE_TOP, ")"),
+  bottom: 'unset'
+});
+var rightHoverZoneStyle = (0, _react2.css)({
+  left: "unset",
+  top: 'unset',
+  bottom: "var(".concat(HOVER_ZONE_BOTTOM, ")")
 });
 
 // gap between node boundary and drop indicator/drop zone
@@ -85,7 +106,6 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
     _useActiveAnchorTrack2 = (0, _slicedToArray2.default)(_useActiveAnchorTrack, 1),
     isActiveAnchor = _useActiveAnchorTrack2[0];
   var isLeftPosition = position === 'left';
-  var shouldShowResponsiveLayout = (0, _advancedLayoutsFlags.showResponsiveLayout)();
   var nodeDimension = (0, _react.useMemo)(function () {
     if (!nextNode) {
       return defaultNodeDimension;
@@ -126,7 +146,7 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
 
     // Set the height target anchor name to the first or last column of the layout section so that it also works for stacked layout
     var heightTargetAnchorName = targetAnchorName;
-    if (shouldShowResponsiveLayout && nextNode.type.name === 'layoutSection' && nextNode.firstChild && nextNode.lastChild) {
+    if (nextNode.type.name === 'layoutSection' && nextNode.firstChild && nextNode.lastChild) {
       heightTargetAnchorName = isLeftPosition ? (0, _decorationsCommon.getNodeAnchor)(nextNode.firstChild) : (0, _decorationsCommon.getNodeAnchor)(nextNode.lastChild);
     }
     if ((0, _anchorUtils.isAnchorSupported)()) {
@@ -159,7 +179,7 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
       };
     }
     return defaultNodeDimension;
-  }, [anchorName, anchorRectCache, nextNode, position, isLeftPosition, shouldShowResponsiveLayout]);
+  }, [anchorName, anchorRectCache, nextNode, position, isLeftPosition]);
   var onDrop = (0, _react.useCallback)(function () {
     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()) || {},
@@ -176,27 +196,17 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
       }));
     }
   }, [api, getPos, position]);
-  var inlineHoverZoneRectStyle = (0, _react.useMemo)(function () {
+  var hoverZoneRectStyle = (0, _react.useMemo)(function () {
+    var _ref3;
     var isLayoutNode = (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'layoutSection';
-    var layoutAdjustment = isLayoutNode && shouldShowResponsiveLayout ? {
+    var layoutAdjustment = isLayoutNode ? {
       width: 11,
       height: 4,
       top: 6,
       bottom: 2
     } : undefined;
-    return (0, _react2.css)({
-      positionAnchor: anchorName,
-      minWidth: "var(--ds-space-100, 8px)",
-      left: isLeftPosition ? 0 : 'unset',
-      right: isLeftPosition ? 'unset' : 0,
-      top: "calc(anchor(top))",
-      width: nodeDimension.widthOffset ? "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px + ").concat(nodeDimension.widthOffset, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)") : "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)"),
-      height: "calc(".concat(nodeDimension.height, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0, "px)")
-    }, isLayoutNode && shouldShowResponsiveLayout && {
-      top: isLeftPosition ? "calc(".concat(nodeDimension.top, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0, "px)") : 'unset',
-      bottom: isLeftPosition ? 'unset' : "calc(".concat(nodeDimension.bottom, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0, "px)")
-    });
-  }, [anchorName, isLeftPosition, nodeDimension, nextNode, shouldShowResponsiveLayout]);
+    return _ref3 = {}, (0, _defineProperty2.default)(_ref3, HOVER_ZONE_WIDTH, nodeDimension.widthOffset ? "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px + ").concat(nodeDimension.widthOffset, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)") : "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_HEIGHT, "calc(".concat(nodeDimension.height, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_TOP, "calc(".concat(nodeDimension.top, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_BOTTOM, "calc(".concat(nodeDimension.bottom, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_ANCHOR_NAME, anchorName), _ref3;
+  }, [nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name, nodeDimension, anchorName]);
   var dropIndicatorPos = (0, _react.useMemo)(function () {
     return isLeftPosition ? 'right' : 'left';
   }, [isLeftPosition]);
@@ -217,7 +227,10 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
   return (0, _react2.jsx)("div", {
     ref: ref,
     "data-testid": "drop-target-hover-zone-".concat(position),
-    css: [hoverZoneCommonStyle, inlineHoverZoneRectStyle]
+    css: [hoverZoneCommonStyle, isLeftPosition ? leftHoverZoneStyle : rightHoverZoneStyle]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
+    ,
+    style: hoverZoneRectStyle
   }, isDraggedOver || (0, _dragTargetDebug.isBlocksDragTargetDebug)() ? (0, _react2.jsx)(_box.DropIndicator, {
     edge: dropIndicatorPos
   }) : isActiveAnchor && (0, _react2.jsx)("div", {

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

@@ -2,7 +2,6 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNestedDepth, getNodeAnchor, TYPE_NODE_DEC } from './decorations-common';
-import { isPreRelease1, isPreRelease2 } from './utils/advanced-layouts-flags';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
 const IGNORE_NODES_NEXT = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption'];
 const IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
@@ -15,7 +14,7 @@ export const shouldDescendIntoNode = node => {
       return false;
     }
   }
-  if (isPreRelease1()) {
+  if (editorExperiment('advanced_layouts', true)) {
     return !IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT.includes(node.type.name);
   }
   return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
@@ -25,7 +24,7 @@ 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 isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && isPreRelease1();
+  const isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && editorExperiment('advanced_layouts', true);
   if (isFirstTableRow) {
     return false;
   }
@@ -63,7 +62,7 @@ export const nodeDecorations = (newState, from, to) => {
   const decs = [];
   const docFrom = from === undefined || from < 0 ? 0 : from;
   const docTo = to === undefined || to > newState.doc.nodeSize - 2 ? newState.doc.nodeSize - 2 : to;
-  const ignore_nodes = isPreRelease2() ? IGNORE_NODES_NEXT : IGNORE_NODES;
+  const ignore_nodes = editorExperiment('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
   newState.doc.nodesBetween(docFrom, docTo, (node, pos, parent, index) => {
     let depth = 0;
     let anchorName;

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

@@ -10,7 +10,6 @@ import { DropTarget } from '../ui/drop-target';
 import { DropTargetLayout } from '../ui/drop-target-layout';
 import { DropTargetV2, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET } from '../ui/drop-target-v2';
 import { getNestedDepth, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
-import { isPreRelease2 } from './utils/advanced-layouts-flags';
 import { maxLayoutColumnSupported } from './utils/consts';
 import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
 import { canMoveNodeToIndex, isInSameLayout } from './utils/validation';
@@ -175,7 +174,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
     popNodeStack(depth);
     prevNodeStack.push(node);
   };
-  const isAdvancedLayoutsPreRelease2 = isPreRelease2();
+  const isAdvancedLayoutsPreRelease2 = editorExperiment('advanced_layouts', true);
   newState.doc.nodesBetween(docFrom, docTo, (node, pos, parent, index) => {
     let depth = 0;
     // drop target deco at the end position

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

@@ -1,6 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { isPreRelease1, isPreRelease2 } from './utils/advanced-layouts-flags';
 const isEmptyNestedParagraphOrHeading = target => {
   if (target instanceof HTMLHeadingElement || target instanceof HTMLParagraphElement) {
     var _target$parentElement;
@@ -8,26 +7,6 @@ const isEmptyNestedParagraphOrHeading = target => {
   }
   return false;
 };
-const isEmptyParagraphOrPlaceholder = node => {
-  if (node && node.type.name === 'paragraph') {
-    var _node$firstChild;
-    return node.childCount === 0 || node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'placeholder';
-  }
-  return false;
-};
-const isLayoutColumnWithoutContent = node => {
-  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutColumn') {
-    let foundNonEmptyNode = false;
-    for (let i = 0; i < node.childCount; i++) {
-      const child = node.child(i);
-      if (!isEmptyParagraphOrPlaceholder(child)) {
-        foundNonEmptyNode = true;
-        break;
-      }
-    }
-    return !foundNonEmptyNode;
-  }
-};
 export const handleMouseOver = (view, event, api) => {
   var _api$blockControls, _target$classList;
   const {
@@ -51,7 +30,7 @@ export const handleMouseOver = (view, event, api) => {
     if (editorExperiment('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
     }
-    if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && isPreRelease1()) {
+    if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && editorExperiment('advanced_layouts', true)) {
       rootElement = rootElement.closest('[data-drag-handler-anchor-name][data-drag-handler-node-type="mediaSingle"]');
       if (!rootElement) {
         return false;
@@ -94,11 +73,6 @@ export const handleMouseOver = (view, event, api) => {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    const node = view.state.doc.nodeAt(pos);
-    if (isPreRelease2() && node && isLayoutColumnWithoutContent(node)) {
-      // Don't show drag handle when there is no content/only placeholder in layout column
-      return false;
-    }
     let rootPos;
     if (editorExperiment('nested-dnd', true)) {
       rootPos = view.state.doc.resolve(pos).pos;

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

@@ -17,7 +17,6 @@ import { dropTargetDecorations, findDropTargetDecs } from './decorations-drop-ta
 import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
-import { isPreRelease2 } from './utils/advanced-layouts-flags';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
 import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
 import { getTrMetadata } from './utils/transactions';
@@ -479,7 +478,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           return false;
         },
         dragenter(_view, event) {
-          if (isPreRelease2()) {
+          if (editorExperiment('advanced_layouts', true)) {
             if (isHTMLElement(event.target)) {
               const closestParentElement = event.target.closest('[data-drag-handler-anchor-depth="0"]');
               if (closestParentElement) {
@@ -493,7 +492,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
         },
         dragstart(view) {
           var _anchorRectCache;
-          if (isPreRelease2()) {
+          if (editorExperiment('advanced_layouts', true)) {
             defaultActiveAnchorTracker.reset();
           }
           (_anchorRectCache = anchorRectCache) === null || _anchorRectCache === void 0 ? void 0 : _anchorRectCache.setEditorView(view);

package/dist/es2019/pm-plugins/utils/active-anchor-tracker.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { EventEmitter } from 'events';
 import { useCallback, useEffect, useState } from 'react';
-import { isPreRelease2 } from './advanced-layouts-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export class ActiveAnchorTracker {
   constructor() {
     _defineProperty(this, "lastActiveAnchor", '');
@@ -44,7 +44,7 @@ export const useActiveAnchorTracker = (anchorName, activeAnchorTracker = default
     setIsActive(eventIsActive);
   };
   useEffect(() => {
-    if (activeAnchorTracker && anchorName && isPreRelease2()) {
+    if (activeAnchorTracker && anchorName && editorExperiment('advanced_layouts', true)) {
       activeAnchorTracker.subscribe(anchorName, onActive);
       const unsubscribe = () => {
         activeAnchorTracker.unsubscribe(anchorName, onActive);