@atlaskit/editor-plugin-block-controls 1.10.4 → 1.10.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.10.6
+
+### Patch Changes
+
+- [#127749](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127749)
+  [`2709d717d9040`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2709d717d9040) -
+  [ux] Dismiss dnd tooltip when cursor exits handle
+
+## 1.10.5
+
+### Patch Changes
+
+- [#127275](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127275)
+  [`45778c5f2adf8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/45778c5f2adf8) -
+  ED-24384 Clean up remove wrap feature flag
+- [#127431](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127431)
+  [`8e4cdcd49d713`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8e4cdcd49d713) -
+  ED-24475 Clean up feature flags in getSelection.ts
+
 ## 1.10.4
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.nodeDecorations = exports.mouseMoveWrapperDecorations = exports.emptyParagraphNodeDecorations = exports.dropTargetDecorations = exports.dragHandleDecoration = void 0;
+exports.nodeDecorations = exports.emptyParagraphNodeDecorations = exports.dropTargetDecorations = exports.dragHandleDecoration = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _bindEventListener = require("bind-event-listener");
@@ -14,7 +14,6 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _dragHandle = require("../ui/drag-handle");
 var _dropTarget = require("../ui/drop-target");
-var _mouseMoveWrapper = require("../ui/mouse-move-wrapper");
 var _validation = require("../utils/validation");
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn'];
 var NESTED_DEPTH = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? 100 : 0;
@@ -138,14 +137,8 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
     } else {
       anchorName = "--node-anchor-".concat(node.type.name, "-").concat(index);
     }
-    var style;
-    if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-      style = "anchor-name: ".concat(anchorName, "; ").concat(pos === 0 ? 'margin-top: 0px;' : '', "; position: relative; z-index: 1;");
-    } else {
-      style = "anchor-name: ".concat(anchorName, "; ").concat(pos === 0 ? 'margin-top: 0px;' : '');
-    }
     decs.push(_view.Decoration.node(pos, pos + node.nodeSize, (_Decoration$node2 = {
-      style: style
+      style: "anchor-name: ".concat(anchorName, "; ").concat(pos === 0 ? 'margin-top: 0px;' : '', "; position: relative; z-index: 1;")
     }, (0, _defineProperty2.default)(_Decoration$node2, 'data-drag-handler-anchor-name', anchorName), (0, _defineProperty2.default)(_Decoration$node2, 'data-drag-handler-node-type', node.type.name), (0, _defineProperty2.default)(_Decoration$node2, 'data-drag-handler-anchor-depth', "".concat(depth)), _Decoration$node2), {
       type: 'node-decoration'
     }));
@@ -153,45 +146,6 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
   });
   return decs;
 };
-/**
- * Setting up decorations around each node to track mousemove events into each node
- * When a mouseenter event is triggered on the node, we will set the activeNode to the node
- * And show the drag handle
- */
-var mouseMoveWrapperDecorations = exports.mouseMoveWrapperDecorations = function mouseMoveWrapperDecorations(newState, api) {
-  var decs = [];
-  unmountDecorations('data-blocks-decoration-container');
-  newState.doc.descendants(function (node, pos, _parent, index) {
-    // Do not render a mouse move wrapper for nodes that have wrapping - this causes wrapping to break
-    var hasWrapping = node.attrs.layout === 'wrap-left' || node.attrs.layout === 'wrap-right';
-    if (hasWrapping) {
-      return false;
-    }
-    var anchorName = "--node-anchor-".concat(node.type.name, "-").concat(index);
-    decs.push(_view.Decoration.widget(pos, function (view, getPos) {
-      var element = document.createElement('div');
-      element.setAttribute('data-blocks-decoration-container', 'true');
-      element.setAttribute('style', 'clear: unset;');
-      _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_mouseMoveWrapper.MouseMoveWrapper, {
-        view: view,
-        api: api,
-        anchorName: anchorName,
-        nodeType: node.type.name,
-        getPos: getPos
-      }), element);
-      return element;
-    }, {
-      type: 'mouse-move-wrapper',
-      side: -1,
-      ignoreSelection: true,
-      stopEvent: function stopEvent(e) {
-        return true;
-      }
-    }));
-    return false;
-  });
-  return decs;
-};
 var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDecoration(api, getIntl, pos, anchorName, nodeType, handleOptions) {
   var unbind;
   var elementType = (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24150') ? 'span' : 'div';
@@ -212,11 +166,10 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23896')) {
       unmountDecorations('data-blocks-drag-handle-container');
     }
-    if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-      // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
-      // due to margins applied to other nodes eg. Headings
-      element.style.clear = 'unset';
-    }
+
+    // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
+    // due to margins applied to other nodes eg. Headings
+    element.style.clear = 'unset';
     _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_reactIntlNext.RawIntlProvider, {
       value: getIntl()
     }, /*#__PURE__*/(0, _react.createElement)(_dragHandle.DragHandle, {

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

@@ -132,23 +132,20 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           decorations = decorations.remove(oldHandle);
         }
         var isDecsMissing = false;
-        var isHandleMissing = false;
         var isDropTargetsMissing = false;
-        if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-          // Ensure decorations stay in sync when nodes are added or removed from the doc
-          isHandleMissing = !(meta !== null && meta !== void 0 && meta.activeNode) && !decorations.find().some(function (_ref6) {
-            var spec = _ref6.spec;
-            return spec.id === 'drag-handle';
-          });
-          var decsLength = decorations.find().filter(function (_ref7) {
-            var spec = _ref7.spec;
-            return spec.id !== 'drag-handle';
-          }).length;
+        // Ensure decorations stay in sync when nodes are added or removed from the doc
+        var isHandleMissing = !(meta !== null && meta !== void 0 && meta.activeNode) && !decorations.find().some(function (_ref6) {
+          var spec = _ref6.spec;
+          return spec.id === 'drag-handle';
+        });
+        var decsLength = decorations.find().filter(function (_ref7) {
+          var spec = _ref7.spec;
+          return spec.id !== 'drag-handle';
+        }).length;
 
-          //TODO: Fix this logic for nested scenarios
-          if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
-            isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
-          }
+        //TODO: Fix this logic for nested scenarios
+        if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+          isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
         }
         if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24372')) {
           var dropTargetLen = decorations.find().filter(function (_ref8) {
@@ -188,12 +185,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
             decorations = _view.DecorationSet.create(newState.doc, []);
           }
           var nodeDecs = (0, _decorations.nodeDecorations)(newState);
-          if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-            decorations = decorations.add(newState.doc, (0, _toConsumableArray2.default)(nodeDecs));
-          } else {
-            var mouseWrapperDecs = (0, _decorations.mouseMoveWrapperDecorations)(newState, api);
-            decorations = decorations.add(newState.doc, [].concat((0, _toConsumableArray2.default)(nodeDecs), (0, _toConsumableArray2.default)(mouseWrapperDecs)));
-          }
+          decorations = decorations.add(newState.doc, (0, _toConsumableArray2.default)(nodeDecs));
 
           // Note: Quite often the handle is not in the right position after a node is moved
           // it is safer for now to not show it when a node is moved
@@ -424,9 +416,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           }
         },
         mouseover: function mouseover(view, event) {
-          if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-            (0, _handleMouseOver.handleMouseOver)(view, event, api);
-          }
+          (0, _handleMouseOver.handleMouseOver)(view, event, api);
           return false;
         },
         keydown: function keydown(view, event) {
@@ -459,74 +449,42 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
     view: function view(editorView) {
       var dom = editorView.dom;
       var editorContentArea = editorView.dom.closest('.fabric-editor-popup-scroll-parent');
-      var resizeObserverHeight;
-      var resizeObserverWidth;
-      if (!(0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-        // Use ResizeObserver to observe height changes
-        resizeObserverHeight = new ResizeObserver((0, _rafSchd.default)(function (entries) {
-          var _entries$;
-          var editorHeight = (_entries$ = entries[0]) === null || _entries$ === void 0 || (_entries$ = _entries$.contentBoxSize[0]) === null || _entries$ === void 0 ? void 0 : _entries$.blockSize;
 
-          // Update the plugin state when the height changes
-          var pluginState = key.getState(editorView.state);
-          if (!(pluginState !== null && pluginState !== void 0 && pluginState.isDragging)) {
-            var isResizerResizing = !!dom.querySelector('.is-resizing');
-            var transaction = editorView.state.tr;
-            if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.isResizerResizing) !== isResizerResizing) {
-              transaction.setMeta('is-resizer-resizing', isResizerResizing);
-            }
-            if (!isResizerResizing && editorHeight) {
+      // Use ResizeObserver to observe width changes
+      var resizeObserverWidth = new ResizeObserver((0, _rafSchd.default)(function (entries) {
+        var editorContentArea = entries[0].target;
+        var editorWidthRight = editorContentArea.getBoundingClientRect().right;
+        var editorWidthLeft = editorContentArea.getBoundingClientRect().left;
+
+        // Update the plugin state when the height changes
+        var pluginState = key.getState(editorView.state);
+        if (!(pluginState !== null && pluginState !== void 0 && pluginState.isDragging)) {
+          var isResizerResizing = !!dom.querySelector('.is-resizing');
+          var transaction = editorView.state.tr;
+          if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.isResizerResizing) !== isResizerResizing) {
+            transaction.setMeta('is-resizer-resizing', isResizerResizing);
+          }
+          if (!isResizerResizing) {
+            if ((0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23394')) {
               transaction.setMeta(key, {
-                editorHeight: editorHeight
+                editorWidthLeft: editorWidthLeft,
+                editorWidthRight: editorWidthRight
               });
             }
-            editorView.dispatch(transaction);
-          }
-        }));
-
-        // Start observing the editor DOM element
-        resizeObserverHeight.observe(dom);
-      }
-      if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-        // Use ResizeObserver to observe width changes
-        resizeObserverWidth = new ResizeObserver((0, _rafSchd.default)(function (entries) {
-          var editorContentArea = entries[0].target;
-          var editorWidthRight = editorContentArea.getBoundingClientRect().right;
-          var editorWidthLeft = editorContentArea.getBoundingClientRect().left;
-
-          // Update the plugin state when the height changes
-          var pluginState = key.getState(editorView.state);
-          if (!(pluginState !== null && pluginState !== void 0 && pluginState.isDragging)) {
-            var isResizerResizing = !!dom.querySelector('.is-resizing');
-            var transaction = editorView.state.tr;
-            if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.isResizerResizing) !== isResizerResizing) {
-              transaction.setMeta('is-resizer-resizing', isResizerResizing);
-            }
-            if (!isResizerResizing) {
-              if ((0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23394')) {
-                transaction.setMeta(key, {
-                  editorWidthLeft: editorWidthLeft,
-                  editorWidthRight: editorWidthRight
-                });
-              }
-            }
-            editorView.dispatch(transaction);
           }
-        }));
-        if (editorContentArea && (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23394')) {
-          resizeObserverWidth.observe(editorContentArea);
+          editorView.dispatch(transaction);
         }
+      }));
+      if (editorContentArea && (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23394')) {
+        resizeObserverWidth.observe(editorContentArea);
       }
 
       // Start pragmatic monitors
       var pragmaticCleanup = destroyFn(api);
       return {
         destroy: function destroy() {
-          if (!(0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-            resizeObserverHeight.unobserve(dom);
-          }
-          if (editorContentArea && (0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-            (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23394') && resizeObserverWidth.unobserve(editorContentArea);
+          if (editorContentArea && (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23394')) {
+            resizeObserverWidth.unobserve(editorContentArea);
           }
           pragmaticCleanup();
         }

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

@@ -68,7 +68,7 @@ var selectedStyles = (0, _react2.css)({
   color: "var(--ds-icon-selected, #0C66E4)"
 });
 var DragHandleInternal = function DragHandleInternal(_ref) {
-  var _api$core2, _api$analytics2, _api$core5, _api$core7;
+  var _api$core2, _api$analytics2, _api$core4, _api$core6;
   var view = _ref.view,
     api = _ref.api,
     getPos = _ref.getPos,
@@ -137,32 +137,13 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
     view.focus();
   }, [dragHandleSelected, api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, view, getPos, start, nodeType]);
 
-  // handleMouseDown required along with onClick to ensure the correct selection
-  // is set immediately when the drag handle is clicked. Otherwise browser native
-  // drag and drop can take over and cause unpredictable behaviour.
+  // TODO - This needs to be investigated further. Drag preview generation is not always working
+  // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
+  // but ensures the preview is generated correctly.
   var handleMouseDown = (0, _react.useCallback)(function () {
     var _api$core3;
     api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
       var tr = _ref3.tr;
-      if (start === undefined) {
-        return tr;
-      }
-      tr = (0, _utils.selectNode)(tr, start, nodeType);
-      tr.setMeta(_main.key, {
-        pos: start
-      });
-      return tr;
-    });
-    view.focus();
-  }, [start, api, view, nodeType]);
-
-  // TODO - This needs to be investigated further. Drag preview generation is not always working
-  // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
-  // but ensures the preview is generated correctly.
-  var handleMouseDownWrapperRemoved = (0, _react.useCallback)(function () {
-    var _api$core4;
-    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref4) {
-      var tr = _ref4.tr;
       var startPos = (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24304') ? getPos() : start;
       if (startPos === undefined) {
         return tr;
@@ -179,16 +160,16 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       });
       return tr;
     });
-  }, [api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions, getPos, start]);
+  }, [api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, getPos, start]);
   var handleKeyDown = (0, _react.useCallback)(function (e) {
     if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
       // allow user to use spacebar to select the node
 
       if (!e.repeat && e.key === ' ') {
-        var _api$core6;
+        var _api$core5;
         var startPos = (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24304') ? getPos() : start;
-        api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref5) {
-          var tr = _ref5.tr;
+        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref4) {
+          var tr = _ref4.tr;
           if (startPos === undefined) {
             return tr;
           }
@@ -212,7 +193,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
         view.focus();
       }
     }
-  }, [getPos, start, api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 ? void 0 : _api$core7.actions, view]);
+  }, [getPos, start, api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions, view]);
   (0, _react.useEffect)(function () {
     var element = buttonRef.current;
     if (!element) {
@@ -226,11 +207,11 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
           start: start
         };
       },
-      onGenerateDragPreview: function onGenerateDragPreview(_ref6) {
-        var nativeSetDragImage = _ref6.nativeSetDragImage;
+      onGenerateDragPreview: function onGenerateDragPreview(_ref5) {
+        var nativeSetDragImage = _ref5.nativeSetDragImage;
         (0, _setCustomNativeDragPreview.setCustomNativeDragPreview)({
-          render: function render(_ref7) {
-            var container = _ref7.container;
+          render: function render(_ref6) {
+            var container = _ref6.container;
             var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -241,13 +222,13 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
         });
       },
       onDragStart: function onDragStart() {
-        var _api$core8;
+        var _api$core7;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core8 = api.core) === null || _api$core8 === void 0 || _api$core8.actions.execute(function (_ref8) {
+        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref7) {
           var _api$blockControls, _api$analytics3;
-          var tr = _ref8.tr;
+          var tr = _ref7.tr;
           api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.setNodeDragged(start, anchorName, nodeType)({
             tr: tr
           });
@@ -292,20 +273,14 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       }
     }
     if (supportsAnchor) {
-      return (0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2') ? {
+      return {
         left: hasResizer || isExtension || isEmbedCard || isBlockCard && innerContainer ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, macroInteractionUpdates), ")") : "calc(anchor(".concat(anchorName, " start) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts.dragHandleGap)(nodeType), "px)"),
         top: (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: hasResizer || isExtension || isBlockCard || isEmbedCard ? (0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, macroInteractionUpdates) : "calc(anchor(".concat(anchorName, " start) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts.dragHandleGap)(nodeType), "px)"),
-        top: (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 (0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2') ? {
+    return {
       left: hasResizer || isExtension || isEmbedCard || isBlockCard && innerContainer ? "calc(".concat((dom === null || dom === void 0 ? void 0 : dom.offsetLeft) || 0, "px + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, macroInteractionUpdates), ")") : (0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, macroInteractionUpdates),
       top: (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_ed_23674') ? (0, _dragHandlePositions.getTopPosition)(dom, nodeType) : (0, _dragHandlePositions.getTopPosition)(dom)
-    } : {
-      left: (0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, macroInteractionUpdates),
-      top: (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_ed_23674') ? (0, _dragHandlePositions.getTopPosition)(dom, nodeType) : (0, _dragHandlePositions.getTopPosition)(dom)
     };
   }, [anchorName, nodeType, view, blockCardWidth, macroInteractionUpdates]);
   var _useState5 = (0, _react.useState)({
@@ -381,7 +356,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
         ,
         style: (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23896') ? newPositionStyles : positionStyles,
         onClick: handleOnClick,
-        onMouseDown: (0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2') ? handleMouseDownWrapperRemoved : handleMouseDown,
+        onMouseDown: handleMouseDown,
         onKeyDown: handleKeyDown,
         "data-testid": "block-ctrl-drag-handle"
       }, (0, _react2.jsx)(_dragHandler.default, {
@@ -394,6 +369,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
     content: (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
       helpDescriptors: helpDescriptors
     }),
+    ignoreTooltipPointerEvents: true,
     onShow: function onShow() {
       var _api$accessibilityUti;
       api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 || _api$accessibilityUti.actions.ariaNotify(message, {

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

@@ -19,10 +19,7 @@ var dragPreview = exports.dragPreview = function dragPreview(container, dom, nod
   container.style.pointerEvents = 'none';
   var parent = document.createElement('div');
   // ProseMirror class is required to make sure the cloned dom is styled correctly
-  parent.classList.add('ProseMirror');
-  if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-    parent.classList.add('block-ctrl-drag-preview');
-  }
+  parent.classList.add('ProseMirror', 'block-ctrl-drag-preview');
   var embedCard = dom.querySelector('.embedCardView-content-wrap');
   var shouldBeGenericPreview = nodeType === 'embedCard' || nodeType === 'extension' || !!embedCard;
   if ((0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189')) {

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

@@ -130,6 +130,6 @@ var getTextNodeStyle = function getTextNodeStyle() {
 };
 var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWrapper() {
   return (0, _react.jsx)(_react.Global, {
-    styles: [globalStyles, (0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2') ? (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? extendedHoverZoneNested : extendedHoverZone : false, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
+    styles: [globalStyles, (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? extendedHoverZoneNested : extendedHoverZone, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
   });
 };

package/dist/cjs/utils/getSelection.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.selectNode = exports.getSelection = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var getSelection = exports.getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
@@ -22,7 +21,7 @@ var getSelection = exports.getSelection = function getSelection(tr, start) {
   } else if (
   // Even though mediaGroup is not selectable,
   // we need a quick way to make all child media nodes appear as selected without the need for a custom selection
-  (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaGroup' && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23842')) {
+  (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaGroup') {
     return new _state.NodeSelection($startPos);
   } else {
     // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
@@ -31,28 +30,16 @@ var getSelection = exports.getSelection = function getSelection(tr, start) {
     var foundInlineNode = false;
     var inlineNodeEndPos = 0;
     tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
-      if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-ed-23905')) {
-        if (n.isInline) {
-          inlineNodeEndPos = pos + n.nodeSize;
-        }
-        if (n.isInline && !foundInlineNode) {
-          inlineNodePos = pos;
-          foundInlineNode = true;
-        }
-      } else {
-        if (foundInlineNode) {
-          return false;
-        }
-        if (n.isInline) {
-          inlineNodePos = pos;
-          foundInlineNode = true;
-          return false;
-        }
+      if (n.isInline) {
+        inlineNodeEndPos = pos + n.nodeSize;
+      }
+      if (n.isInline && !foundInlineNode) {
+        inlineNodePos = pos;
+        foundInlineNode = true;
       }
       return true;
     });
-    var inlineNodeDepth = inlineNodePos - start;
-    return new _state.TextSelection(tr.doc.resolve((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-ed-23905') ? inlineNodeEndPos : start + nodeSize - inlineNodeDepth), tr.doc.resolve(inlineNodePos));
+    return new _state.TextSelection(tr.doc.resolve(inlineNodeEndPos), tr.doc.resolve(inlineNodePos));
   }
 };
 var selectNode = exports.selectNode = function selectNode(tr, start, nodeType) {

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

@@ -6,7 +6,6 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { DragHandle } from '../ui/drag-handle';
 import { DropTarget } from '../ui/drop-target';
-import { MouseMoveWrapper } from '../ui/mouse-move-wrapper';
 import { canMoveToIndex } from '../utils/validation';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn'];
 const NESTED_DEPTH = fg('platform_editor_elements_dnd_nested') ? 100 : 0;
@@ -130,14 +129,8 @@ export const nodeDecorations = newState => {
     } else {
       anchorName = `--node-anchor-${node.type.name}-${index}`;
     }
-    let style;
-    if (fg('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-      style = `anchor-name: ${anchorName}; ${pos === 0 ? 'margin-top: 0px;' : ''}; position: relative; z-index: 1;`;
-    } else {
-      style = `anchor-name: ${anchorName}; ${pos === 0 ? 'margin-top: 0px;' : ''}`;
-    }
     decs.push(Decoration.node(pos, pos + node.nodeSize, {
-      style,
+      style: `anchor-name: ${anchorName}; ${pos === 0 ? 'margin-top: 0px;' : ''}; position: relative; z-index: 1;`,
       ['data-drag-handler-anchor-name']: anchorName,
       ['data-drag-handler-node-type']: node.type.name,
       ['data-drag-handler-anchor-depth']: `${depth}`
@@ -148,45 +141,6 @@ export const nodeDecorations = newState => {
   });
   return decs;
 };
-/**
- * Setting up decorations around each node to track mousemove events into each node
- * When a mouseenter event is triggered on the node, we will set the activeNode to the node
- * And show the drag handle
- */
-export const mouseMoveWrapperDecorations = (newState, api) => {
-  const decs = [];
-  unmountDecorations('data-blocks-decoration-container');
-  newState.doc.descendants((node, pos, _parent, index) => {
-    // Do not render a mouse move wrapper for nodes that have wrapping - this causes wrapping to break
-    const hasWrapping = node.attrs.layout === 'wrap-left' || node.attrs.layout === 'wrap-right';
-    if (hasWrapping) {
-      return false;
-    }
-    const anchorName = `--node-anchor-${node.type.name}-${index}`;
-    decs.push(Decoration.widget(pos, (view, getPos) => {
-      const element = document.createElement('div');
-      element.setAttribute('data-blocks-decoration-container', 'true');
-      element.setAttribute('style', 'clear: unset;');
-      ReactDOM.render( /*#__PURE__*/createElement(MouseMoveWrapper, {
-        view,
-        api,
-        anchorName,
-        nodeType: node.type.name,
-        getPos
-      }), element);
-      return element;
-    }, {
-      type: 'mouse-move-wrapper',
-      side: -1,
-      ignoreSelection: true,
-      stopEvent: e => {
-        return true;
-      }
-    }));
-    return false;
-  });
-  return decs;
-};
 export const dragHandleDecoration = (api, getIntl, pos, anchorName, nodeType, handleOptions) => {
   let unbind;
   const elementType = fg('platform_editor_element_drag_and_drop_ed_24150') ? 'span' : 'div';
@@ -207,11 +161,10 @@ export const dragHandleDecoration = (api, getIntl, pos, anchorName, nodeType, ha
     if (fg('platform_editor_element_drag_and_drop_ed_23896')) {
       unmountDecorations('data-blocks-drag-handle-container');
     }
-    if (fg('platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2')) {
-      // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
-      // due to margins applied to other nodes eg. Headings
-      element.style.clear = 'unset';
-    }
+
+    // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
+    // due to margins applied to other nodes eg. Headings
+    element.style.clear = 'unset';
     ReactDOM.render( /*#__PURE__*/createElement(RawIntlProvider, {
       value: getIntl()
     }, /*#__PURE__*/createElement(DragHandle, {