@atlaskit/editor-plugin-block-controls 2.21.3 → 2.21.5

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.21.5
+
+### Patch Changes
+
+- [#104365](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/104365)
+  [`b23e9a45b03a1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b23e9a45b03a1) -
+  Remove use of platform_editor_element_drag_and_drop_debug for drop target VR test
+
+## 2.21.4
+
+### Patch Changes
+
+- [#102952](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102952)
+  [`6d865148eda80`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6d865148eda80) -
+  Fix incorrect drop zone on table cell
+- [#103494](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103494)
+  [`955dbd85f329f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/955dbd85f329f) -
+  [ux] ED-26266: Fixed the drag handle highlight when selecting multiple line in Firefox
+
 ## 2.21.3
 
 ### Patch Changes

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.shouldDescendIntoNode = exports.nodeDecorations = exports.findNodeDecs = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _decorationsCommon = require("./decorations-common");
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
@@ -17,7 +18,7 @@ var shouldDescendIntoNode = exports.shouldDescendIntoNode = function shouldDesce
   // Optimisation to avoid drawing node decorations for empty table cells
   if (['tableCell', 'tableHeader'].includes(node.type.name)) {
     var _node$firstChild;
-    if (node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'paragraph') {
+    if (node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'paragraph' && ((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_6') ? node.firstChild.childCount === 0 : true)) {
       return false;
     }
   }

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

@@ -18,7 +18,6 @@ var _dropTarget = require("../ui/drop-target");
 var _dropTargetLayout = require("../ui/drop-target-layout");
 var _decorationsCommon = require("./decorations-common");
 var _consts2 = require("./utils/consts");
-var _dragTargetDebug = require("./utils/drag-target-debug");
 var _validation = require("./utils/validation");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -227,7 +226,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
       var canDrop = activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $pos, node);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
-      if (!canDrop && !(0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
+      if (!canDrop) {
         pushNodeStack(node, depth);
         return false; //not valid pos, so nested not valid either
       }

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

@@ -27,7 +27,6 @@ var _handleMouseOver = require("./handle-mouse-over");
 var _keymap = require("./keymap");
 var _activeAnchorTracker = require("./utils/active-anchor-tracker");
 var _anchorUtils = require("./utils/anchor-utils");
-var _dragTargetDebug = require("./utils/drag-target-debug");
 var _transactions = require("./utils/transactions");
 var key = exports.key = new _state.PluginKey('blockControls');
 var EDITOR_BLOCKS_DRAG_INIT = 'Editor Blocks Drag Initialization Time';
@@ -219,14 +218,14 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
   var isDropTargetsMissing = ((_meta$isDragging = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging !== void 0 ? _meta$isDragging : isDragging) && maybeNodeCountChanged && !(meta !== null && meta !== void 0 && meta.nodeMoved);
 
   // Remove drop target decorations when dragging stops or they need to be redrawn
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     var dropTargetDecs = (0, _decorationsDropTarget.findDropTargetDecs)(decorations);
     decorations = decorations.remove(dropTargetDecs);
   }
 
   // Add drop targets when dragging starts or some are missing
   if (api) {
-    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
+    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing) {
       var decs = (0, _decorationsDropTarget.dropTargetDecorations)(newState, api, formatMessage, nodeViewPortalProviderAPI, latestActiveNode, anchorRectCache);
       decorations = decorations.add(newState.doc, decs);
     }
@@ -368,7 +367,7 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
     var decs = (0, _decorationsDragHandle.dragHandleDecoration)(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
     decorations = decorations.add(newState.doc, [decs]);
   }
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     // Remove drop target decoration when dragging stops
     var dropTargetDecs = decorations.find(undefined, undefined, function (spec) {
       return spec.type === 'drop-target-decoration';
@@ -386,7 +385,7 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
   if (api) {
     // Add drop targets when node is being dragged
     // if the transaction is only for analytics and user is dragging, continue to draw drop targets
-    if (shouldCreateDropTargets || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
+    if (shouldCreateDropTargets) {
       var _meta$activeNode7;
       var _decs = (0, _decorationsDropTarget.dropTargetDecorations)(newState, api, formatMessage, nodeViewPortalProviderAPI, isNestedEnabled ? (_meta$activeNode7 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode7 !== void 0 ? _meta$activeNode7 : mappedActiveNodePos : meta === null || meta === void 0 ? void 0 : meta.activeNode, anchorRectCache);
       decorations = decorations.add(newState.doc, _decs);

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

@@ -72,6 +72,11 @@ var dragHandleButtonStyles = (0, _react2.css)({
     outline: "2px solid ".concat("var(--ds-border-focused, #388BFF)")
   }
 });
+var dragHandleMultiLineSelectionFixFirefox = (0, _react2.css)({
+  '&::selection': {
+    backgroundColor: 'transparent'
+  }
+});
 var layoutColumnDragHandleStyles = (0, _react2.css)({
   transform: 'rotate(90deg)'
 });
@@ -430,7 +435,10 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       // eslint-disable-next-line @atlaskit/design-system/no-html-button
       (0, _react2.jsx)("button", {
         type: "button",
-        css: [dragHandleButtonStyles, (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
+        css: [dragHandleButtonStyles,
+        // ED-26266: Fixed the drag handle highlight when selecting multiple line in Firefox
+        // See https://product-fabric.atlassian.net/browse/ED-26266
+        _browser.browser.gecko && (0, _platformFeatureFlags.fg)('platform_editor_dnd_handle_highlight_fix_firefox') && dragHandleMultiLineSelectionFixFirefox, (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
         ref: buttonRef
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,

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

@@ -17,7 +17,6 @@ var _colors = require("@atlaskit/theme/colors");
 var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
 var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
-var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
 var _updateSelection = require("../pm-plugins/utils/update-selection");
 /**
  * @jsxRuntime classic
@@ -131,7 +130,7 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
     ,
     css: [dropTargetLayoutStyle, dropTargetStackLayoutHintStyle],
     "data-testid": "block-ctrl-drop-indicator"
-  }, isDraggedOver || (0, _dragTargetDebug.isBlocksDragTargetDebug)() ? (0, _react2.jsx)(_box.DropIndicator, {
+  }, isDraggedOver ? (0, _react2.jsx)(_box.DropIndicator, {
     edge: "right",
     gap: "-".concat(DROP_TARGET_LAYOUT_DROP_ZONE_WIDTH, "px")
   }) : isActiveAnchor && (0, _react2.jsx)("div", {

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

@@ -18,7 +18,6 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
 var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
-var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
 var _inlineDropTarget = require("../pm-plugins/utils/inline-drop-target");
 var _consts = require("./consts");
 var _inlineDropTarget2 = require("./inline-drop-target");
@@ -48,7 +47,11 @@ var styleDropIndicator = (0, _react2.css)({
   height: '100%',
   margin: '0 auto',
   position: 'relative',
-  width: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, ", 100%)")
+  width: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, ", 100%)"),
+  display: 'none'
+});
+var styleDropIndicatorVisible = (0, _react2.css)({
+  display: 'block'
 });
 var nestedDropIndicatorStyle = (0, _react2.css)({
   position: 'relative'
@@ -232,10 +235,8 @@ var DropTarget = exports.DropTarget = function DropTarget(props) {
     ,
     style: dynamicStyle,
     "data-testid": "block-ctrl-drop-target"
-  },
-  // 4px gap to clear expand node border
-  (isDraggedOver || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) && (0, _react2.jsx)("div", {
-    css: styleDropIndicator,
+  }, (0, _react2.jsx)("div", {
+    css: [styleDropIndicator, isDraggedOver && styleDropIndicatorVisible],
     "data-testid": "block-ctrl-drop-indicator"
   }, (0, _react2.jsx)(_box.DropIndicator, {
     edge: "bottom"

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

@@ -17,7 +17,6 @@ var _colors = require("@atlaskit/theme/colors");
 var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
 var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
-var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
 var _updateSelection = require("../pm-plugins/utils/update-selection");
 /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
 /* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
@@ -255,7 +254,7 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
     ,
     style: hoverZoneRectStyle
-  }, isDraggedOver || (0, _dragTargetDebug.isBlocksDragTargetDebug)() ? (0, _react2.jsx)(_box.DropIndicator, {
+  }, isDraggedOver ? (0, _react2.jsx)(_box.DropIndicator, {
     edge: dropIndicatorPos
   }) : isActiveAnchor && (0, _react2.jsx)("div", {
     "data-testid": "block-ctrl-drop-hint",

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

@@ -1,4 +1,5 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNestedDepth, getNodeAnchor, TYPE_NODE_DEC } from './decorations-common';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
@@ -9,7 +10,7 @@ export const shouldDescendIntoNode = node => {
   // Optimisation to avoid drawing node decorations for empty table cells
   if (['tableCell', 'tableHeader'].includes(node.type.name)) {
     var _node$firstChild;
-    if (node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'paragraph') {
+    if (node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'paragraph' && (fg('platform_editor_element_dnd_nested_fix_patch_6') ? node.firstChild.childCount === 0 : true)) {
       return false;
     }
   }

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

@@ -10,7 +10,6 @@ import { DropTarget, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONT
 import { DropTargetLayout } from '../ui/drop-target-layout';
 import { getNestedDepth, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
 import { maxLayoutColumnSupported } from './utils/consts';
-import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
 import { canMoveNodeToIndex, isInSameLayout } from './utils/validation';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
 const PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
@@ -216,7 +215,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
       const canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
-      if (!canDrop && !isBlocksDragTargetDebug()) {
+      if (!canDrop) {
         pushNodeStack(node, depth);
         return false; //not valid pos, so nested not valid either
       }

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

@@ -19,7 +19,6 @@ import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
-import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
 import { getTrMetadata } from './utils/transactions';
 export const key = new PluginKey('blockControls');
 const EDITOR_BLOCKS_DRAG_INIT = 'Editor Blocks Drag Initialization Time';
@@ -219,14 +218,14 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
   const isDropTargetsMissing = ((_meta$isDragging = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging !== void 0 ? _meta$isDragging : isDragging) && maybeNodeCountChanged && !(meta !== null && meta !== void 0 && meta.nodeMoved);
 
   // Remove drop target decorations when dragging stops or they need to be redrawn
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     const dropTargetDecs = findDropTargetDecs(decorations);
     decorations = decorations.remove(dropTargetDecs);
   }
 
   // Add drop targets when dragging starts or some are missing
   if (api) {
-    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing) {
       const decs = dropTargetDecorations(newState, api, formatMessage, nodeViewPortalProviderAPI, latestActiveNode, anchorRectCache);
       decorations = decorations.add(newState.doc, decs);
     }
@@ -355,7 +354,7 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
     const decs = dragHandleDecoration(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
     decorations = decorations.add(newState.doc, [decs]);
   }
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     // Remove drop target decoration when dragging stops
     const dropTargetDecs = decorations.find(undefined, undefined, spec => spec.type === 'drop-target-decoration');
     decorations = decorations.remove(dropTargetDecs);
@@ -371,7 +370,7 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
   if (api) {
     // Add drop targets when node is being dragged
     // if the transaction is only for analytics and user is dragging, continue to draw drop targets
-    if (shouldCreateDropTargets || isBlocksDragTargetDebug()) {
+    if (shouldCreateDropTargets) {
       var _meta$activeNode7;
       const decs = dropTargetDecorations(newState, api, formatMessage, nodeViewPortalProviderAPI, isNestedEnabled ? (_meta$activeNode7 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode7 !== void 0 ? _meta$activeNode7 : mappedActiveNodePos : meta === null || meta === void 0 ? void 0 : meta.activeNode, anchorRectCache);
       decorations = decorations.add(newState.doc, decs);

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

@@ -61,6 +61,11 @@ const dragHandleButtonStyles = css({
     outline: `2px solid ${"var(--ds-border-focused, #388BFF)"}`
   }
 });
+const dragHandleMultiLineSelectionFixFirefox = css({
+  '&::selection': {
+    backgroundColor: 'transparent'
+  }
+});
 const layoutColumnDragHandleStyles = css({
   transform: 'rotate(90deg)'
 });
@@ -409,7 +414,10 @@ export const DragHandle = ({
   // eslint-disable-next-line @atlaskit/design-system/no-html-button
   jsx("button", {
     type: "button",
-    css: [dragHandleButtonStyles, editorExperiment('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
+    css: [dragHandleButtonStyles,
+    // ED-26266: Fixed the drag handle highlight when selecting multiple line in Firefox
+    // See https://product-fabric.atlassian.net/browse/ED-26266
+    browser.gecko && fg('platform_editor_dnd_handle_highlight_fix_firefox') && dragHandleMultiLineSelectionFixFirefox, editorExperiment('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
     ref: buttonRef
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,

package/dist/es2019/ui/drop-target-layout.js

@@ -14,7 +14,6 @@ import { B200 } from '@atlaskit/theme/colors';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 
 // 8px gap + 16px on left and right
@@ -127,7 +126,7 @@ export const DropTargetLayout = props => {
     ,
     css: [dropTargetLayoutStyle, dropTargetStackLayoutHintStyle],
     "data-testid": "block-ctrl-drop-indicator"
-  }, isDraggedOver || isBlocksDragTargetDebug() ? jsx(DropIndicator, {
+  }, isDraggedOver ? jsx(DropIndicator, {
     edge: "right",
     gap: `-${DROP_TARGET_LAYOUT_DROP_ZONE_WIDTH}px`
   }) : isActiveAnchor && jsx("div", {

package/dist/es2019/ui/drop-target.js

@@ -15,7 +15,6 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { shouldAllowInlineDropTarget } from '../pm-plugins/utils/inline-drop-target';
 import { getNestedNodeLeftPaddingMargin } from './consts';
 import { InlineDropTarget } from './inline-drop-target';
@@ -38,7 +37,11 @@ const styleDropIndicator = css({
   height: '100%',
   margin: '0 auto',
   position: 'relative',
-  width: `var(${EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH}, 100%)`
+  width: `var(${EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH}, 100%)`,
+  display: 'none'
+});
+const styleDropIndicatorVisible = css({
+  display: 'block'
 });
 const nestedDropIndicatorStyle = css({
   position: 'relative'
@@ -221,10 +224,8 @@ export const DropTarget = props => {
     ,
     style: dynamicStyle,
     "data-testid": "block-ctrl-drop-target"
-  },
-  // 4px gap to clear expand node border
-  (isDraggedOver || isBlocksDragTargetDebug()) && jsx("div", {
-    css: styleDropIndicator,
+  }, jsx("div", {
+    css: [styleDropIndicator, isDraggedOver && styleDropIndicatorVisible],
     "data-testid": "block-ctrl-drop-indicator"
   }, jsx(DropIndicator, {
     edge: "bottom"

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

@@ -16,7 +16,6 @@ import { B200 } from '@atlaskit/theme/colors';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 const HOVER_ZONE_WIDTH = '--editor-blocks-inline-hover-zone-width';
 const HOVER_ZONE_HEIGHT = '--editor-blocks-inline-hover-zone-height';
@@ -252,7 +251,7 @@ export const InlineDropTarget = ({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
     ,
     style: hoverZoneRectStyle
-  }, isDraggedOver || isBlocksDragTargetDebug() ? jsx(DropIndicator, {
+  }, isDraggedOver ? jsx(DropIndicator, {
     edge: dropIndicatorPos
   }) : isActiveAnchor && jsx("div", {
     "data-testid": "block-ctrl-drop-hint",

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

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNestedDepth, getNodeAnchor, TYPE_NODE_DEC } from './decorations-common';
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
@@ -10,7 +11,7 @@ export var shouldDescendIntoNode = function shouldDescendIntoNode(node) {
   // Optimisation to avoid drawing node decorations for empty table cells
   if (['tableCell', 'tableHeader'].includes(node.type.name)) {
     var _node$firstChild;
-    if (node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'paragraph') {
+    if (node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type.name) === 'paragraph' && (fg('platform_editor_element_dnd_nested_fix_patch_6') ? node.firstChild.childCount === 0 : true)) {
       return false;
     }
   }

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

@@ -13,7 +13,6 @@ import { DropTarget, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONT
 import { DropTargetLayout } from '../ui/drop-target-layout';
 import { getNestedDepth, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
 import { maxLayoutColumnSupported } from './utils/consts';
-import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
 import { canMoveNodeToIndex, isInSameLayout } from './utils/validation';
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
@@ -220,7 +219,7 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
       var canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
-      if (!canDrop && !isBlocksDragTargetDebug()) {
+      if (!canDrop) {
         pushNodeStack(node, depth);
         return false; //not valid pos, so nested not valid either
       }

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

@@ -20,7 +20,6 @@ import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
-import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
 import { getTrMetadata } from './utils/transactions';
 export var key = new PluginKey('blockControls');
 var EDITOR_BLOCKS_DRAG_INIT = 'Editor Blocks Drag Initialization Time';
@@ -212,14 +211,14 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
   var isDropTargetsMissing = ((_meta$isDragging = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging !== void 0 ? _meta$isDragging : isDragging) && maybeNodeCountChanged && !(meta !== null && meta !== void 0 && meta.nodeMoved);
 
   // Remove drop target decorations when dragging stops or they need to be redrawn
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     var dropTargetDecs = findDropTargetDecs(decorations);
     decorations = decorations.remove(dropTargetDecs);
   }
 
   // Add drop targets when dragging starts or some are missing
   if (api) {
-    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing) {
       var decs = dropTargetDecorations(newState, api, formatMessage, nodeViewPortalProviderAPI, latestActiveNode, anchorRectCache);
       decorations = decorations.add(newState.doc, decs);
     }
@@ -361,7 +360,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     var decs = dragHandleDecoration(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
     decorations = decorations.add(newState.doc, [decs]);
   }
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     // Remove drop target decoration when dragging stops
     var dropTargetDecs = decorations.find(undefined, undefined, function (spec) {
       return spec.type === 'drop-target-decoration';
@@ -379,7 +378,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
   if (api) {
     // Add drop targets when node is being dragged
     // if the transaction is only for analytics and user is dragging, continue to draw drop targets
-    if (shouldCreateDropTargets || isBlocksDragTargetDebug()) {
+    if (shouldCreateDropTargets) {
       var _meta$activeNode7;
       var _decs = dropTargetDecorations(newState, api, formatMessage, nodeViewPortalProviderAPI, isNestedEnabled ? (_meta$activeNode7 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode7 !== void 0 ? _meta$activeNode7 : mappedActiveNodePos : meta === null || meta === void 0 ? void 0 : meta.activeNode, anchorRectCache);
       decorations = decorations.add(newState.doc, _decs);

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

@@ -63,6 +63,11 @@ var dragHandleButtonStyles = css({
     outline: "2px solid ".concat("var(--ds-border-focused, #388BFF)")
   }
 });
+var dragHandleMultiLineSelectionFixFirefox = css({
+  '&::selection': {
+    backgroundColor: 'transparent'
+  }
+});
 var layoutColumnDragHandleStyles = css({
   transform: 'rotate(90deg)'
 });
@@ -421,7 +426,10 @@ export var DragHandle = function DragHandle(_ref) {
       // eslint-disable-next-line @atlaskit/design-system/no-html-button
       jsx("button", {
         type: "button",
-        css: [dragHandleButtonStyles, editorExperiment('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
+        css: [dragHandleButtonStyles,
+        // ED-26266: Fixed the drag handle highlight when selecting multiple line in Firefox
+        // See https://product-fabric.atlassian.net/browse/ED-26266
+        browser.gecko && fg('platform_editor_dnd_handle_highlight_fix_firefox') && dragHandleMultiLineSelectionFixFirefox, editorExperiment('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
         ref: buttonRef
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,

package/dist/esm/ui/drop-target-layout.js

@@ -16,7 +16,6 @@ import { B200 } from '@atlaskit/theme/colors';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 
 // 8px gap + 16px on left and right
@@ -124,7 +123,7 @@ export var DropTargetLayout = function DropTargetLayout(props) {
     ,
     css: [dropTargetLayoutStyle, dropTargetStackLayoutHintStyle],
     "data-testid": "block-ctrl-drop-indicator"
-  }, isDraggedOver || isBlocksDragTargetDebug() ? jsx(DropIndicator, {
+  }, isDraggedOver ? jsx(DropIndicator, {
     edge: "right",
     gap: "-".concat(DROP_TARGET_LAYOUT_DROP_ZONE_WIDTH, "px")
   }) : isActiveAnchor && jsx("div", {

package/dist/esm/ui/drop-target.js

@@ -17,7 +17,6 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { shouldAllowInlineDropTarget } from '../pm-plugins/utils/inline-drop-target';
 import { getNestedNodeLeftPaddingMargin } from './consts';
 import { InlineDropTarget } from './inline-drop-target';
@@ -40,7 +39,11 @@ var styleDropIndicator = css({
   height: '100%',
   margin: '0 auto',
   position: 'relative',
-  width: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, ", 100%)")
+  width: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, ", 100%)"),
+  display: 'none'
+});
+var styleDropIndicatorVisible = css({
+  display: 'block'
 });
 var nestedDropIndicatorStyle = css({
   position: 'relative'
@@ -224,10 +227,8 @@ export var DropTarget = function DropTarget(props) {
     ,
     style: dynamicStyle,
     "data-testid": "block-ctrl-drop-target"
-  },
-  // 4px gap to clear expand node border
-  (isDraggedOver || isBlocksDragTargetDebug()) && jsx("div", {
-    css: styleDropIndicator,
+  }, jsx("div", {
+    css: [styleDropIndicator, isDraggedOver && styleDropIndicatorVisible],
     "data-testid": "block-ctrl-drop-indicator"
   }, jsx(DropIndicator, {
     edge: "bottom"

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

@@ -18,7 +18,6 @@ import { B200 } from '@atlaskit/theme/colors';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 var HOVER_ZONE_WIDTH = '--editor-blocks-inline-hover-zone-width';
 var HOVER_ZONE_HEIGHT = '--editor-blocks-inline-hover-zone-height';
@@ -247,7 +246,7 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
     ,
     style: hoverZoneRectStyle
-  }, isDraggedOver || isBlocksDragTargetDebug() ? jsx(DropIndicator, {
+  }, isDraggedOver ? jsx(DropIndicator, {
     edge: dropIndicatorPos
   }) : isActiveAnchor && jsx("div", {
     "data-testid": "block-ctrl-drop-hint",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.21.3",
+	"version": "2.21.5",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.3.0",
+		"@atlaskit/editor-common": "^99.4.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.37.0",
+		"@atlaskit/tmp-editor-statsig": "^2.38.0",
 		"@atlaskit/tokens": "^3.1.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -115,9 +115,6 @@
 		"platform_editor_element_drag_and_drop_ed_24321": {
 			"type": "boolean"
 		},
-		"platform_editor_element_drag_and_drop_debug": {
-			"type": "boolean"
-		},
 		"platform_editor_element_dnd_nested_fix_patch_6": {
 			"type": "boolean"
 		},
@@ -147,6 +144,9 @@
 		},
 		"platform_editor_dnd_update_drag_start_target": {
 			"type": "boolean"
+		},
+		"platform_editor_dnd_handle_highlight_fix_firefox": {
+			"type": "boolean"
 		}
 	}
 }

package/dist/cjs/pm-plugins/utils/drag-target-debug.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isBlocksDragTargetDebug = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
-var isBlocksDragTargetDebug = exports.isBlocksDragTargetDebug = function isBlocksDragTargetDebug() {
-  return IS_GEMINI_TEST_ENV && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_debug');
-};

package/dist/es2019/pm-plugins/utils/drag-target-debug.js

@@ -1,5 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-const IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
-export const isBlocksDragTargetDebug = () => {
-  return IS_GEMINI_TEST_ENV && fg('platform_editor_element_drag_and_drop_debug');
-};

package/dist/esm/pm-plugins/utils/drag-target-debug.js

@@ -1,5 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-var IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
-export var isBlocksDragTargetDebug = function isBlocksDragTargetDebug() {
-  return IS_GEMINI_TEST_ENV && fg('platform_editor_element_drag_and_drop_debug');
-};

package/dist/types/pm-plugins/utils/drag-target-debug.d.ts

@@ -1 +0,0 @@
-export declare const isBlocksDragTargetDebug: () => boolean;

package/dist/types-ts4.5/pm-plugins/utils/drag-target-debug.d.ts

@@ -1 +0,0 @@
-export declare const isBlocksDragTargetDebug: () => boolean;