@atlaskit/editor-plugin-block-controls 13.1.1 → 13.1.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 13.1.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.1.2
+
+### Patch Changes
+
+- [`0aced23fb1739`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0aced23fb1739) -
+  Clean up experiment platform_editor_fix_selection_wrapped_media_embed
+- Updated dependencies
+
 ## 13.1.1
 
 ### Patch Changes

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

@@ -29,8 +29,6 @@ var shouldDescendIntoNode = exports.shouldDescendIntoNode = function shouldDesce
 };
 var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, parent) {
   var _nodeTypes$table, _node$attrs, _node$attrs2;
-  var isEmbedCard = node.type.name === 'embedCard';
-  var isMediaSingle = node.type.name === 'mediaSingle';
   var nodeTypes = node.type.schema.nodes;
   var isTable = node.type.name === (nodeTypes === null || nodeTypes === void 0 || (_nodeTypes$table = nodeTypes.table) === null || _nodeTypes$table === void 0 ? void 0 : _nodeTypes$table.name);
   var parentIsTable = parent && [nodeTypes.tableHeader, nodeTypes.tableCell].includes(parent.type);
@@ -46,9 +44,7 @@ var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, pare
   if (isLegacyContentMacroExtension) {
     return true;
   }
-  return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) && !(0, _experiments.editorExperiment)('platform_editor_fix_selection_wrapped_media_embed', true, {
-    exposure: true
-  }) ? true : ignore_nodes.includes(node.type.name);
+  return ignore_nodes.includes(node.type.name);
 };
 
 /**

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

@@ -11,7 +11,6 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _domAttrName = require("../ui/utils/dom-attr-name");
 var _decorationsAnchor = require("./decorations-anchor");
@@ -55,6 +54,33 @@ var getBlockMarkPanelIndexAdjustment = function getBlockMarkPanelIndexAdjustment
   }
   return index;
 };
+
+/**
+ * If the hovered element is a paragraph adjacent to a wrapped mediaSingle/embedCard,
+ * redirect to the media node so only one drag handle shows (ED-26959).
+ */
+var redirectParagraphToWrappedMedia = function redirectParagraphToWrappedMedia(rootElement, isNativeAnchorSupported) {
+  var hoveredNodeType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
+  if (hoveredNodeType !== 'paragraph') {
+    return rootElement;
+  }
+  var isWrappedMediaEmbedSibling = function isWrappedMediaEmbedSibling(sibling) {
+    if (!sibling || !sibling.getAttribute((0, _domAttrName.getAnchorAttrName)())) {
+      return false;
+    }
+    var siblingType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(sibling) : sibling.getAttribute('data-drag-handler-node-type');
+    var siblingLayout = sibling.getAttribute('layout') || '';
+    return (siblingType === 'mediaSingle' || siblingType === 'embedCard') && ['wrap-left', 'wrap-right'].includes(siblingLayout);
+  };
+  var prevSibling = rootElement.previousElementSibling;
+  var nextSibling = rootElement.nextElementSibling;
+  if (prevSibling && isWrappedMediaEmbedSibling(prevSibling)) {
+    return prevSibling;
+  } else if (nextSibling && isWrappedMediaEmbedSibling(nextSibling)) {
+    return nextSibling;
+  }
+  return rootElement;
+};
 var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$blockControls$sh, _api$blockControls2, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -157,35 +183,14 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
       }
     }
 
-    // When platform_editor_fix_selection_wrapped_media_embed is enabled, a wrapped mediaSingle/embedCard and the
-    // paragraph(s) it floats next to both have anchor decorations. If the hovered rootElement
-    // is a paragraph whose adjacent DOM sibling is a wrapped mediaSingle/embedCard with an
-    // anchor, redirect the handle to the media node so only one handle shows (ED-26959).
+    // A wrapped mediaSingle/embedCard and the paragraph(s) it floats next to both have
+    // anchor decorations. If the hovered rootElement is a paragraph whose adjacent DOM sibling
+    // is a wrapped mediaSingle/embedCard with an anchor, redirect the handle to the media node
+    // so only one handle shows (ED-26959).
     // We check previousElementSibling (wrap-left: media precedes text in DOM) and
     // nextElementSibling (wrap-right: media follows text in DOM).
     // This must happen before anchorName is read so the correct node's handle is shown.
-    if ((0, _experiments.editorExperiment)('platform_editor_fix_selection_wrapped_media_embed', true, {
-      exposure: true
-    })) {
-      var _rootNodeType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
-      if (_rootNodeType === 'paragraph') {
-        var isWrappedMediaEmbedSibling = function isWrappedMediaEmbedSibling(sibling) {
-          if (!sibling || !sibling.getAttribute((0, _domAttrName.getAnchorAttrName)())) {
-            return false;
-          }
-          var siblingType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(sibling) : sibling.getAttribute('data-drag-handler-node-type');
-          var siblingLayout = sibling.getAttribute('layout') || '';
-          return (siblingType === 'mediaSingle' || siblingType === 'embedCard') && ['wrap-left', 'wrap-right'].includes(siblingLayout);
-        };
-        var prevSibling = rootElement.previousElementSibling;
-        var nextSibling = rootElement.nextElementSibling;
-        if (prevSibling && isWrappedMediaEmbedSibling(prevSibling)) {
-          rootElement = prevSibling;
-        } else if (nextSibling && isWrappedMediaEmbedSibling(nextSibling)) {
-          rootElement = nextSibling;
-        }
-      }
-    }
+    rootElement = redirectParagraphToWrappedMedia(rootElement, isNativeAnchorSupported);
     var anchorName;
     if ((0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
       anchorName = rootElement.getAttribute((0, _domAttrName.getAnchorAttrName)());
@@ -209,16 +214,6 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName) === anchorName) {
       return false;
     }
-    if (!(0, _experiments.editorExperiment)('platform_editor_fix_selection_wrapped_media_embed', true, {
-      exposure: true
-    })) {
-      // We want to exclude handles from showing for wrapped nodes
-      // TODO: ED-26959 - We should be able remove these check if we decided to
-      // go we not decoration for wrapped image solution.
-      if (['wrap-right', 'wrap-left'].includes(rootElement.getAttribute('layout') || '')) {
-        return false;
-      }
-    }
     var parentRootElement = rootElement.parentElement;
     var pos;
     if (parentRootElement) {
@@ -235,7 +230,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && (0, _experiments.editorExperiment)('advanced_layouts', true) && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && (0, _experiments.editorExperiment)('advanced_layouts', true) && !(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       // Don't show drag handle for layout column in a single column layout,
       // unless the layout column menu is enabled (menu needs the handle to be accessible).
       return false;

package/dist/cjs/ui/consts.js

@@ -122,7 +122,7 @@ var topPositionAdjustment = exports.topPositionAdjustment = function topPosition
         return DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT;
     }
   }
-  if ((nodeType === 'mediaSingle' || nodeType === 'embedCard') && layout && ['wrap-left', 'wrap-right'].includes(layout) && (0, _experiments.editorExperiment)('platform_editor_fix_selection_wrapped_media_embed', true)) {
+  if ((nodeType === 'mediaSingle' || nodeType === 'embedCard') && layout && ['wrap-left', 'wrap-right'].includes(layout)) {
     return DRAG_HANDLE_WRAPPED_MEDIA_EMBED_TOP_ADJUSTMENT;
   }
   switch (nodeType) {

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

@@ -510,7 +510,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
@@ -561,7 +561,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var mSelect = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
@@ -649,7 +649,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.startPreservingSelection()({
           tr: tr
         });
-        if (nodeType === 'layoutColumn' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
           tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         var rootPos = (0, _experiments.editorExperiment)('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
@@ -949,7 +949,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     }
     var mSelect = api === null || api === void 0 || (_api$blockControls$sh4 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh4 === void 0 ? void 0 : _api$blockControls$sh4.multiSelectDnD;
     var $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? view.state.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : view.state.selection.$anchor;
-    var isLayoutColumnMenuEnabled = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true);
+    var isLayoutColumnMenuEnabled = (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true);
     if (isShiftDown && !(isLayoutColumnMenuEnabled && isLayoutColumn) && (!isTopLevelNodeValue || isTopLevelNodeValue && $anchor.depth > _consts2.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH)) {
       setDragHandleDisabled(true);
     } else {
@@ -961,7 +961,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   }) : formatMessage(_messages.blockControlsMessages.dragToMove);
 
   // Create a string version for aria-label
-  var dragHandleAriaLabel = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(_messages.blockControlsMessages.dragToMoveClickToOpen, {
+  var dragHandleAriaLabel = (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(_messages.blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
   }) : formatMessage(_messages.blockControlsMessages.dragToMove);
   var helpDescriptors = isTopLevelNodeValue ? [{
@@ -1163,7 +1163,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       }
     }, renderButton());
   };
-  var tooltipContent = isLayoutColumn && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
+  var tooltipContent = isLayoutColumn && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
     helpDescriptors: helpDescriptors
   });
   var isTooltip = !dragHandleDisabled;

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

@@ -21,8 +21,6 @@ export const shouldDescendIntoNode = node => {
 };
 const shouldIgnoreNode = (node, ignore_nodes, depth, parent) => {
   var _nodeTypes$table, _node$attrs, _node$attrs2;
-  const isEmbedCard = node.type.name === 'embedCard';
-  const isMediaSingle = node.type.name === 'mediaSingle';
   const nodeTypes = node.type.schema.nodes;
   const isTable = node.type.name === (nodeTypes === null || nodeTypes === void 0 ? void 0 : (_nodeTypes$table = nodeTypes.table) === null || _nodeTypes$table === void 0 ? void 0 : _nodeTypes$table.name);
   const parentIsTable = parent && [nodeTypes.tableHeader, nodeTypes.tableCell].includes(parent.type);
@@ -38,9 +36,7 @@ const shouldIgnoreNode = (node, ignore_nodes, depth, parent) => {
   if (isLegacyContentMacroExtension) {
     return true;
   }
-  return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) && !editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true, {
-    exposure: true
-  }) ? true : ignore_nodes.includes(node.type.name);
+  return ignore_nodes.includes(node.type.name);
 };
 
 /**

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

@@ -3,7 +3,6 @@ import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -45,6 +44,33 @@ const getBlockMarkPanelIndexAdjustment = (parentRootElement, index) => {
   }
   return index;
 };
+
+/**
+ * If the hovered element is a paragraph adjacent to a wrapped mediaSingle/embedCard,
+ * redirect to the media node so only one drag handle shows (ED-26959).
+ */
+const redirectParagraphToWrappedMedia = (rootElement, isNativeAnchorSupported) => {
+  const hoveredNodeType = isNativeAnchorSupported ? getTypeNameFromDom(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
+  if (hoveredNodeType !== 'paragraph') {
+    return rootElement;
+  }
+  const isWrappedMediaEmbedSibling = sibling => {
+    if (!sibling || !sibling.getAttribute(getAnchorAttrName())) {
+      return false;
+    }
+    const siblingType = isNativeAnchorSupported ? getTypeNameFromDom(sibling) : sibling.getAttribute('data-drag-handler-node-type');
+    const siblingLayout = sibling.getAttribute('layout') || '';
+    return (siblingType === 'mediaSingle' || siblingType === 'embedCard') && ['wrap-left', 'wrap-right'].includes(siblingLayout);
+  };
+  const prevSibling = rootElement.previousElementSibling;
+  const nextSibling = rootElement.nextElementSibling;
+  if (prevSibling && isWrappedMediaEmbedSibling(prevSibling)) {
+    return prevSibling;
+  } else if (nextSibling && isWrappedMediaEmbedSibling(nextSibling)) {
+    return nextSibling;
+  }
+  return rootElement;
+};
 export const handleMouseOver = (view, event, api) => {
   var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$editorViewMode$s, _api$blockControls$sh, _api$blockControls2, _api$blockControls2$s, _target$classList;
   const {
@@ -149,35 +175,14 @@ export const handleMouseOver = (view, event, api) => {
       }
     }
 
-    // When platform_editor_fix_selection_wrapped_media_embed is enabled, a wrapped mediaSingle/embedCard and the
-    // paragraph(s) it floats next to both have anchor decorations. If the hovered rootElement
-    // is a paragraph whose adjacent DOM sibling is a wrapped mediaSingle/embedCard with an
-    // anchor, redirect the handle to the media node so only one handle shows (ED-26959).
+    // A wrapped mediaSingle/embedCard and the paragraph(s) it floats next to both have
+    // anchor decorations. If the hovered rootElement is a paragraph whose adjacent DOM sibling
+    // is a wrapped mediaSingle/embedCard with an anchor, redirect the handle to the media node
+    // so only one handle shows (ED-26959).
     // We check previousElementSibling (wrap-left: media precedes text in DOM) and
     // nextElementSibling (wrap-right: media follows text in DOM).
     // This must happen before anchorName is read so the correct node's handle is shown.
-    if (editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true, {
-      exposure: true
-    })) {
-      const rootNodeType = isNativeAnchorSupported ? getTypeNameFromDom(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
-      if (rootNodeType === 'paragraph') {
-        const isWrappedMediaEmbedSibling = sibling => {
-          if (!sibling || !sibling.getAttribute(getAnchorAttrName())) {
-            return false;
-          }
-          const siblingType = isNativeAnchorSupported ? getTypeNameFromDom(sibling) : sibling.getAttribute('data-drag-handler-node-type');
-          const siblingLayout = sibling.getAttribute('layout') || '';
-          return (siblingType === 'mediaSingle' || siblingType === 'embedCard') && ['wrap-left', 'wrap-right'].includes(siblingLayout);
-        };
-        const prevSibling = rootElement.previousElementSibling;
-        const nextSibling = rootElement.nextElementSibling;
-        if (prevSibling && isWrappedMediaEmbedSibling(prevSibling)) {
-          rootElement = prevSibling;
-        } else if (nextSibling && isWrappedMediaEmbedSibling(nextSibling)) {
-          rootElement = nextSibling;
-        }
-      }
-    }
+    rootElement = redirectParagraphToWrappedMedia(rootElement, isNativeAnchorSupported);
     let anchorName;
     if (expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
       anchorName = rootElement.getAttribute(getAnchorAttrName());
@@ -201,16 +206,6 @@ export const handleMouseOver = (view, event, api) => {
     if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName) === anchorName) {
       return false;
     }
-    if (!editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true, {
-      exposure: true
-    })) {
-      // We want to exclude handles from showing for wrapped nodes
-      // TODO: ED-26959 - We should be able remove these check if we decided to
-      // go we not decoration for wrapped image solution.
-      if (['wrap-right', 'wrap-left'].includes(rootElement.getAttribute('layout') || '')) {
-        return false;
-      }
-    }
     const parentRootElement = rootElement.parentElement;
     let pos;
     if (parentRootElement) {
@@ -227,7 +222,7 @@ export const handleMouseOver = (view, event, api) => {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
       // Don't show drag handle for layout column in a single column layout,
       // unless the layout column menu is enabled (menu needs the handle to be accessible).
       return false;

package/dist/es2019/ui/consts.js

@@ -113,7 +113,7 @@ export const topPositionAdjustment = (nodeType, layout) => {
         return DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT;
     }
   }
-  if ((nodeType === 'mediaSingle' || nodeType === 'embedCard') && layout && ['wrap-left', 'wrap-right'].includes(layout) && editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true)) {
+  if ((nodeType === 'mediaSingle' || nodeType === 'embedCard') && layout && ['wrap-left', 'wrap-right'].includes(layout)) {
     return DRAG_HANDLE_WRAPPED_MEDIA_EMBED_TOP_ADJUSTMENT;
   }
   switch (nodeType) {

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

@@ -483,7 +483,7 @@ export const DragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       const resolvedStartPos = tr.doc.resolve(startPos);
@@ -535,7 +535,7 @@ export const DragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
@@ -623,7 +623,7 @@ export const DragHandle = ({
         api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.startPreservingSelection()({
           tr
         });
-        if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
           tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         const rootPos = editorExperiment('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
@@ -929,7 +929,7 @@ export const DragHandle = ({
     }
     const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh4 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh4 === void 0 ? void 0 : _api$blockControls$sh4.multiSelectDnD;
     const $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? view.state.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : view.state.selection.$anchor;
-    const isLayoutColumnMenuEnabled = expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true);
+    const isLayoutColumnMenuEnabled = expValEquals('platform_editor_layout_column_menu', 'isEnabled', true);
     if (isShiftDown && !(isLayoutColumnMenuEnabled && isLayoutColumn) && (!isTopLevelNodeValue || isTopLevelNodeValue && $anchor.depth > DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH)) {
       setDragHandleDisabled(true);
     } else {
@@ -941,7 +941,7 @@ export const DragHandle = ({
   }) : formatMessage(blockControlsMessages.dragToMove);
 
   // Create a string version for aria-label
-  const dragHandleAriaLabel = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  const dragHandleAriaLabel = expValEquals('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
   }) : formatMessage(blockControlsMessages.dragToMove);
   let helpDescriptors = isTopLevelNodeValue ? [{
@@ -1135,7 +1135,7 @@ export const DragHandle = ({
       });
     }
   }, renderButton());
-  const tooltipContent = isLayoutColumn && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
+  const tooltipContent = isLayoutColumn && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
     helpDescriptors: helpDescriptors
   });
   const isTooltip = !dragHandleDisabled;

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

@@ -22,8 +22,6 @@ export var shouldDescendIntoNode = function shouldDescendIntoNode(node) {
 };
 var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, parent) {
   var _nodeTypes$table, _node$attrs, _node$attrs2;
-  var isEmbedCard = node.type.name === 'embedCard';
-  var isMediaSingle = node.type.name === 'mediaSingle';
   var nodeTypes = node.type.schema.nodes;
   var isTable = node.type.name === (nodeTypes === null || nodeTypes === void 0 || (_nodeTypes$table = nodeTypes.table) === null || _nodeTypes$table === void 0 ? void 0 : _nodeTypes$table.name);
   var parentIsTable = parent && [nodeTypes.tableHeader, nodeTypes.tableCell].includes(parent.type);
@@ -39,9 +37,7 @@ var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, pare
   if (isLegacyContentMacroExtension) {
     return true;
   }
-  return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) && !editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true, {
-    exposure: true
-  }) ? true : ignore_nodes.includes(node.type.name);
+  return ignore_nodes.includes(node.type.name);
 };
 
 /**

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

@@ -4,7 +4,6 @@ import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -48,6 +47,33 @@ var getBlockMarkPanelIndexAdjustment = function getBlockMarkPanelIndexAdjustment
   }
   return index;
 };
+
+/**
+ * If the hovered element is a paragraph adjacent to a wrapped mediaSingle/embedCard,
+ * redirect to the media node so only one drag handle shows (ED-26959).
+ */
+var redirectParagraphToWrappedMedia = function redirectParagraphToWrappedMedia(rootElement, isNativeAnchorSupported) {
+  var hoveredNodeType = isNativeAnchorSupported ? getTypeNameFromDom(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
+  if (hoveredNodeType !== 'paragraph') {
+    return rootElement;
+  }
+  var isWrappedMediaEmbedSibling = function isWrappedMediaEmbedSibling(sibling) {
+    if (!sibling || !sibling.getAttribute(getAnchorAttrName())) {
+      return false;
+    }
+    var siblingType = isNativeAnchorSupported ? getTypeNameFromDom(sibling) : sibling.getAttribute('data-drag-handler-node-type');
+    var siblingLayout = sibling.getAttribute('layout') || '';
+    return (siblingType === 'mediaSingle' || siblingType === 'embedCard') && ['wrap-left', 'wrap-right'].includes(siblingLayout);
+  };
+  var prevSibling = rootElement.previousElementSibling;
+  var nextSibling = rootElement.nextElementSibling;
+  if (prevSibling && isWrappedMediaEmbedSibling(prevSibling)) {
+    return prevSibling;
+  } else if (nextSibling && isWrappedMediaEmbedSibling(nextSibling)) {
+    return nextSibling;
+  }
+  return rootElement;
+};
 export var handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$blockControls$sh, _api$blockControls2, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -150,35 +176,14 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
       }
     }
 
-    // When platform_editor_fix_selection_wrapped_media_embed is enabled, a wrapped mediaSingle/embedCard and the
-    // paragraph(s) it floats next to both have anchor decorations. If the hovered rootElement
-    // is a paragraph whose adjacent DOM sibling is a wrapped mediaSingle/embedCard with an
-    // anchor, redirect the handle to the media node so only one handle shows (ED-26959).
+    // A wrapped mediaSingle/embedCard and the paragraph(s) it floats next to both have
+    // anchor decorations. If the hovered rootElement is a paragraph whose adjacent DOM sibling
+    // is a wrapped mediaSingle/embedCard with an anchor, redirect the handle to the media node
+    // so only one handle shows (ED-26959).
     // We check previousElementSibling (wrap-left: media precedes text in DOM) and
     // nextElementSibling (wrap-right: media follows text in DOM).
     // This must happen before anchorName is read so the correct node's handle is shown.
-    if (editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true, {
-      exposure: true
-    })) {
-      var _rootNodeType = isNativeAnchorSupported ? getTypeNameFromDom(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
-      if (_rootNodeType === 'paragraph') {
-        var isWrappedMediaEmbedSibling = function isWrappedMediaEmbedSibling(sibling) {
-          if (!sibling || !sibling.getAttribute(getAnchorAttrName())) {
-            return false;
-          }
-          var siblingType = isNativeAnchorSupported ? getTypeNameFromDom(sibling) : sibling.getAttribute('data-drag-handler-node-type');
-          var siblingLayout = sibling.getAttribute('layout') || '';
-          return (siblingType === 'mediaSingle' || siblingType === 'embedCard') && ['wrap-left', 'wrap-right'].includes(siblingLayout);
-        };
-        var prevSibling = rootElement.previousElementSibling;
-        var nextSibling = rootElement.nextElementSibling;
-        if (prevSibling && isWrappedMediaEmbedSibling(prevSibling)) {
-          rootElement = prevSibling;
-        } else if (nextSibling && isWrappedMediaEmbedSibling(nextSibling)) {
-          rootElement = nextSibling;
-        }
-      }
-    }
+    rootElement = redirectParagraphToWrappedMedia(rootElement, isNativeAnchorSupported);
     var anchorName;
     if (expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
       anchorName = rootElement.getAttribute(getAnchorAttrName());
@@ -202,16 +207,6 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName) === anchorName) {
       return false;
     }
-    if (!editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true, {
-      exposure: true
-    })) {
-      // We want to exclude handles from showing for wrapped nodes
-      // TODO: ED-26959 - We should be able remove these check if we decided to
-      // go we not decoration for wrapped image solution.
-      if (['wrap-right', 'wrap-left'].includes(rootElement.getAttribute('layout') || '')) {
-        return false;
-      }
-    }
     var parentRootElement = rootElement.parentElement;
     var pos;
     if (parentRootElement) {
@@ -228,7 +223,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
       // Don't show drag handle for layout column in a single column layout,
       // unless the layout column menu is enabled (menu needs the handle to be accessible).
       return false;

package/dist/esm/ui/consts.js

@@ -115,7 +115,7 @@ export var topPositionAdjustment = function topPositionAdjustment(nodeType, layo
         return DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT;
     }
   }
-  if ((nodeType === 'mediaSingle' || nodeType === 'embedCard') && layout && ['wrap-left', 'wrap-right'].includes(layout) && editorExperiment('platform_editor_fix_selection_wrapped_media_embed', true)) {
+  if ((nodeType === 'mediaSingle' || nodeType === 'embedCard') && layout && ['wrap-left', 'wrap-right'].includes(layout)) {
     return DRAG_HANDLE_WRAPPED_MEDIA_EMBED_TOP_ADJUSTMENT;
   }
   switch (nodeType) {

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

@@ -506,7 +506,7 @@ export var DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
@@ -557,7 +557,7 @@ export var DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var mSelect = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
@@ -645,7 +645,7 @@ export var DragHandle = function DragHandle(_ref) {
         api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.startPreservingSelection()({
           tr: tr
         });
-        if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
           tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         var rootPos = editorExperiment('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
@@ -945,7 +945,7 @@ export var DragHandle = function DragHandle(_ref) {
     }
     var mSelect = api === null || api === void 0 || (_api$blockControls$sh4 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh4 === void 0 ? void 0 : _api$blockControls$sh4.multiSelectDnD;
     var $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? view.state.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : view.state.selection.$anchor;
-    var isLayoutColumnMenuEnabled = expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true);
+    var isLayoutColumnMenuEnabled = expValEquals('platform_editor_layout_column_menu', 'isEnabled', true);
     if (isShiftDown && !(isLayoutColumnMenuEnabled && isLayoutColumn) && (!isTopLevelNodeValue || isTopLevelNodeValue && $anchor.depth > DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH)) {
       setDragHandleDisabled(true);
     } else {
@@ -957,7 +957,7 @@ export var DragHandle = function DragHandle(_ref) {
   }) : formatMessage(blockControlsMessages.dragToMove);
 
   // Create a string version for aria-label
-  var dragHandleAriaLabel = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  var dragHandleAriaLabel = expValEquals('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
   }) : formatMessage(blockControlsMessages.dragToMove);
   var helpDescriptors = isTopLevelNodeValue ? [{
@@ -1159,7 +1159,7 @@ export var DragHandle = function DragHandle(_ref) {
       }
     }, renderButton());
   };
-  var tooltipContent = isLayoutColumn && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
+  var tooltipContent = isLayoutColumn && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
     helpDescriptors: helpDescriptors
   });
   var isTooltip = !dragHandleDisabled;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "13.1.1",
+	"version": "13.1.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^4.0.0",
 		"@atlaskit/primitives": "^20.0.0",
 		"@atlaskit/theme": "^26.0.0",
-		"@atlaskit/tmp-editor-statsig": "^112.0.0",
+		"@atlaskit/tmp-editor-statsig": "^114.0.0",
 		"@atlaskit/tokens": "^15.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -59,7 +59,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.12.0",
+		"@atlaskit/editor-common": "^116.13.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"