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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 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

@@ -55,6 +55,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 +184,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 +215,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) {

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/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

@@ -45,6 +45,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 +176,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 +207,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) {

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/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

@@ -48,6 +48,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 +177,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 +208,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) {

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "13.1.1",
+	"version": "13.1.2",
 	"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": "^113.0.0",
 		"@atlaskit/tokens": "^15.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
 		"@babel/runtime": "^7.0.0",