@atlaskit/editor-plugin-block-controls 7.2.12 → 7.4.0

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.4.0
+
+### Minor Changes
+
+- [`4f5569bde5e64`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4f5569bde5e64) -
+  Add new 'dragHandleSelected' user intent, use this to control table toolbar when drag handle is
+  selected
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.3.0
+
+### Minor Changes
+
+- [`5167552fe1a93`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5167552fe1a93) -
+  [EDITOR-2339] Bump @atlaskit/adf-schema to 51.3.0
+
+### Patch Changes
+
+- [`cebe32372285d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cebe32372285d) -
+  Tidy up feature gate
+- [`8062900ea5010`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8062900ea5010) -
+  [ux] ED-29550 Fix drop targets not showing for layouts as first node
+- [`0b0ef25b2f529`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b0ef25b2f529) -
+  Cleanup various feature gates and align them to aifc_create_enabled
+- [`3feef799ad0a5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3feef799ad0a5) -
+  [ED-29333] Fix 2 issues when platform_editor_native_anchor_support is enabled
+  1. Drag handle is rendered for media node
+  2. When advanced_layouts experiment is off, quick insert button is rendered based on child node
+     inside layout column (as opposed to layout section node )
+
+- [`e108f7cc7cedf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e108f7cc7cedf) -
+  [ux] Drag handle and quick insert button in dense mode
+- Updated dependencies
+
 ## 7.2.12
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -125,18 +125,26 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
             toggleMenu: toggleMenuMeta
           }));
           if ((menuTriggerBy === undefined || !!menuTriggerBy && menuTriggerBy === (options === null || options === void 0 ? void 0 : options.anchorName)) && currentUserIntent === 'blockMenuOpen') {
-            var _api$userIntent4;
-            // Toggled from drag handle
-            api === null || api === void 0 || (_api$userIntent4 = api.userIntent) === null || _api$userIntent4 === void 0 || _api$userIntent4.commands.setCurrentUserIntent('default')({
-              tr: tr
-            });
+            var state = api === null || api === void 0 ? void 0 : api.blockControls.sharedState.currentState();
+            if (state !== null && state !== void 0 && state.isSelectedViaDragHandle && (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_user_intent_fix')) {
+              var _api$userIntent4;
+              api === null || api === void 0 || (_api$userIntent4 = api.userIntent) === null || _api$userIntent4 === void 0 || _api$userIntent4.commands.setCurrentUserIntent('dragHandleSelected')({
+                tr: tr
+              });
+            } else {
+              var _api$userIntent5;
+              // Toggled from drag handle
+              api === null || api === void 0 || (_api$userIntent5 = api.userIntent) === null || _api$userIntent5 === void 0 || _api$userIntent5.commands.setCurrentUserIntent('default')({
+                tr: tr
+              });
+            }
           }
           return tr;
         };
       },
       setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
         return function (_ref5) {
-          var _api$userIntent5;
+          var _api$userIntent6;
           var tr = _ref5.tr;
           var pos = getPos();
           if (pos === undefined) {
@@ -160,7 +168,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
               tr: tr
             });
           }
-          api === null || api === void 0 || (_api$userIntent5 = api.userIntent) === null || _api$userIntent5 === void 0 || _api$userIntent5.commands.setCurrentUserIntent('dragging')({
+          api === null || api === void 0 || (_api$userIntent6 = api.userIntent) === null || _api$userIntent6 === void 0 || _api$userIntent6.commands.setCurrentUserIntent('dragging')({
             tr: tr
           });
           return tr;

package/dist/cjs/editor-commands/move-node.js

@@ -40,50 +40,37 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function transformSourceSlice(nodeCopy, destType) {
   var srcNode = nodeCopy.content.firstChild;
   var schema = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.schema;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
-    if (!schema) {
-      return nodeCopy;
-    }
-    var _schema$nodes = schema.nodes,
-      doc = _schema$nodes.doc,
-      layoutColumn = _schema$nodes.layoutColumn;
-    var destTypeInTable = (0, _validation.isInsideTable)(destType);
-    var destTypeInDocOrLayoutCol = [doc, layoutColumn].includes(destType);
+  if (!schema) {
+    return nodeCopy;
+  }
+  var _schema$nodes = schema.nodes,
+    doc = _schema$nodes.doc,
+    layoutColumn = _schema$nodes.layoutColumn;
+  var destTypeInTable = (0, _validation.isInsideTable)(destType);
+  var destTypeInDocOrLayoutCol = [doc, layoutColumn].includes(destType);
 
-    // No need to loop over slice content if destination requires no transformations
-    if (!destTypeInTable && !destTypeInDocOrLayoutCol) {
-      return nodeCopy;
-    }
-    var containsExpand = false;
-    var containsNestedExpand = false;
-    for (var i = 0; i < nodeCopy.content.childCount; i++) {
-      var node = nodeCopy.content.child(i);
-      if (node.type === schema.nodes.expand) {
-        containsExpand = true;
-      } else if (node.type === schema.nodes.nestedExpand) {
-        containsNestedExpand = true;
-      }
-      if (containsExpand && containsNestedExpand) {
-        break;
-      }
-    }
-    if (containsExpand && destTypeInTable) {
-      return (0, _validation.transformSliceExpandToNestedExpand)(nodeCopy);
-    } else if (containsNestedExpand && destTypeInDocOrLayoutCol) {
-      return (0, _transforms.transformSliceNestedExpandToExpand)(nodeCopy, schema);
+  // No need to loop over slice content if destination requires no transformations
+  if (!destTypeInTable && !destTypeInDocOrLayoutCol) {
+    return nodeCopy;
+  }
+  var containsExpand = false;
+  var containsNestedExpand = false;
+  for (var i = 0; i < nodeCopy.content.childCount; i++) {
+    var node = nodeCopy.content.child(i);
+    if (node.type === schema.nodes.expand) {
+      containsExpand = true;
+    } else if (node.type === schema.nodes.nestedExpand) {
+      containsNestedExpand = true;
     }
-  } else {
-    if (srcNode && schema) {
-      var _schema$nodes2 = schema.nodes,
-        _doc = _schema$nodes2.doc,
-        _layoutColumn = _schema$nodes2.layoutColumn;
-      if (srcNode.type === schema.nodes.nestedExpand && [_doc, _layoutColumn].includes(destType)) {
-        return (0, _transforms.transformSliceNestedExpandToExpand)(nodeCopy, schema);
-      } else if (srcNode.type === schema.nodes.expand && (0, _validation.isInsideTable)(destType)) {
-        return (0, _validation.transformSliceExpandToNestedExpand)(nodeCopy);
-      }
+    if (containsExpand && containsNestedExpand) {
+      break;
     }
   }
+  if (containsExpand && destTypeInTable) {
+    return (0, _validation.transformSliceExpandToNestedExpand)(nodeCopy);
+  } else if (containsNestedExpand && destTypeInDocOrLayoutCol) {
+    return (0, _transforms.transformSliceNestedExpandToExpand)(nodeCopy, schema);
+  }
   return nodeCopy;
 }
 var nodesSupportDragLayoutColumnInto = ['tableCell', 'tableHeader', 'panel', 'expand', 'nestedExpand'];
@@ -146,7 +133,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
     var hoistedPos;
     var from = Math.min(expandedAnchor, expandedHead);
     // Nodes like lists nest within themselves, we need to find the top most position
-    if (isParentNodeOfTypeLayout && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
+    if (isParentNodeOfTypeLayout) {
       var LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
@@ -288,15 +275,9 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         var _api$core7;
         api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref4) {
           var tr = _ref4.tr;
-          if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
-            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
-              tr: tr
-            });
-          } else {
-            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
-              tr: tr
-            });
-          }
+          api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
+            tr: tr
+          });
           moveNode(api)(currentNodePos, moveToPos, _analytics.INPUT_METHOD.SHORTCUT, formatMessage)({
             tr: tr
           });
@@ -318,15 +299,9 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         var _api$core9;
         api === null || api === void 0 || (_api$core9 = api.core) === null || _api$core9 === void 0 || _api$core9.actions.execute(function (_ref6) {
           var tr = _ref6.tr;
-          if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
-            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
-              tr: tr
-            });
-          } else {
-            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
-              tr: tr
-            });
-          }
+          api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
+            tr: tr
+          });
           tr.scrollIntoView();
           return tr;
         });

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleMouseDown = void 0;
 var _styles = require("@atlaskit/editor-common/styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
@@ -35,7 +36,33 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
       }
     } else {
       var isDragHandle = event.target.closest((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? _styles.DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle]') !== null;
-      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
+      api === null || api === void 0 || api.core.actions.execute(function (_ref) {
+        var tr = _ref.tr;
+        api === null || api === void 0 || api.blockControls.commands.setSelectedViaDragHandle(isDragHandle)({
+          tr: tr
+        });
+        /**
+         * When block menu is enabled, reset intent back to 'default' as editor-plugin-block-menu sets the user intent to 'blockMenuOpen', and setting here
+         * causes flickering as this runs before editor-plugin-block-menu.
+         */
+        if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_user_intent_fix')) {
+          if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+            // if target is drag handle, block menu will be opened
+            if (!isDragHandle) {
+              var _api$userIntent;
+              api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('default')({
+                tr: tr
+              });
+            }
+          } else {
+            var _api$userIntent2;
+            (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent(isDragHandle ? 'dragHandleSelected' : 'default')({
+              tr: tr
+            });
+          }
+        }
+        return tr;
+      });
     }
     return false;
   };

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

@@ -36,7 +36,7 @@ var getNodeSelector = function getNodeSelector(ignoreNodes, ignoreNodeDescendant
 };
 var getDefaultNodeSelector = (0, _memoizeOne.default)(function () {
   // we don't show handler for node nested in table
-  return getNodeSelector((0, _toConsumableArray2.default)(_decorationsAnchor.IGNORE_NODES_NEXT), [].concat((0, _toConsumableArray2.default)(_decorationsAnchor.IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT), ['table']));
+  return getNodeSelector([].concat((0, _toConsumableArray2.default)(_decorationsAnchor.IGNORE_NODES_NEXT), ['media']), [].concat((0, _toConsumableArray2.default)(_decorationsAnchor.IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT), ['table']));
 });
 var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls, _api$editorDisabled, _target$classList;
@@ -51,7 +51,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     editorDisabled = _ref2.editorDisabled;
 
   // We shouldn't be firing mouse over transactions when the editor is disabled
-  if (editorDisabled && (0, _platformFeatureFlags.fg)('platform_editor_ai_rovo_free_gen')) {
+  if (editorDisabled && (0, _platformFeatureFlags.fg)('aifc_create_enabled')) {
     return false;
   }
 
@@ -64,24 +64,25 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
   // Ignored via go/ees005
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   var target = event.target;
+  var isNativeAnchorSupported = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true);
   if (target !== null && target !== void 0 && (_target$classList = target.classList) !== null && _target$classList !== void 0 && _target$classList.contains('ProseMirror')) {
     return false;
   }
-  var rootElement = target === null || target === void 0 ? void 0 : target.closest((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? getDefaultNodeSelector() : "[data-drag-handler-anchor-name]");
+  var rootElement = target === null || target === void 0 ? void 0 : target.closest(isNativeAnchorSupported ? getDefaultNodeSelector() : "[data-drag-handler-anchor-name]");
   if (rootElement) {
     var _rootElement$parentEl;
     // We want to exlude handles from showing for empty paragraph and heading nodes
     if (isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
     }
-    if (rootElement.getAttribute((0, _domAttrName.getTypeNameAttrName)()) === 'media' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
+    if (rootElement.getAttribute((0, _domAttrName.getTypeNameAttrName)()) === 'media' && (0, _experiments.editorExperiment)('advanced_layouts', true) && !isNativeAnchorSupported) {
       rootElement = rootElement.closest("[".concat((0, _domAttrName.getAnchorAttrName)(), "][").concat((0, _domAttrName.getTypeNameAttrName)(), "=\"mediaSingle\"]"));
       if (!rootElement) {
         return false;
       }
     }
     var parentElement = (_rootElement$parentEl = rootElement.parentElement) === null || _rootElement$parentEl === void 0 ? void 0 : _rootElement$parentEl.closest("[".concat((0, _domAttrName.getAnchorAttrName)(), "]"));
-    var parentElementType = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? (0, _domAttrName.getTypeNameFromDom)(parentElement) : parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
+    var parentElementType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(parentElement) : parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
     if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
       if (parentElement && parentElementType === 'table') {
@@ -89,7 +90,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
       } else if (parentElement && parentElementType === 'tableRow') {
         var _parentElement$parent;
         var grandparentElement = parentElement === null || parentElement === void 0 || (_parentElement$parent = parentElement.parentElement) === null || _parentElement$parent === void 0 ? void 0 : _parentElement$parent.closest("[".concat((0, _domAttrName.getAnchorAttrName)(), "]"));
-        var grandparentElementType = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? (0, _domAttrName.getTypeNameFromDom)(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
+        var grandparentElementType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
         if (grandparentElement && grandparentElementType === 'table') {
           rootElement = grandparentElement;
         }
@@ -156,11 +157,11 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
         if (rootDOM instanceof HTMLElement) {
           var _rootDOM$getAttribute;
           rootAnchorName = (_rootDOM$getAttribute = rootDOM.getAttribute((0, _domAttrName.getAnchorAttrName)())) !== null && _rootDOM$getAttribute !== void 0 ? _rootDOM$getAttribute : undefined;
-          rootNodeType = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? (0, _domAttrName.getTypeNameFromDom)(rootDOM) : rootDOM.getAttribute('data-drag-handler-node-type');
+          rootNodeType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(rootDOM) : rootDOM.getAttribute('data-drag-handler-node-type');
         }
       }
     }
-    var nodeType = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? (0, _domAttrName.getTypeNameFromDom)(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
+    var nodeType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(rootElement) : rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
       if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
         var _api$core, _api$blockControls2;

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

@@ -8,7 +8,6 @@ var _selection2 = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
@@ -73,7 +72,7 @@ var oldGetSelection = function oldGetSelection(tr, start) {
   // we need a quick way to make all child media nodes appear as selected without the need for a custom selection
   nodeName === 'mediaGroup') {
     return new _state.NodeSelection($startPos);
-  } else if (nodeName === 'taskList' && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
+  } else if (nodeName === 'taskList') {
     return _state.TextSelection.create(tr.doc, start, start + nodeSize);
   } else {
     var _getInlineNodePos = getInlineNodePos(tr, start, nodeSize),
@@ -114,7 +113,7 @@ var newGetSelection = function newGetSelection(tr, start) {
     var $mediaStartPos = tr.doc.resolve(start + 1);
     return new _state.NodeSelection($mediaStartPos);
   }
-  if (nodeName === 'taskList' && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
+  if (nodeName === 'taskList' && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
     return _state.TextSelection.create(tr.doc, start, start + nodeSize);
   }
   var _getInlineNodePos2 = getInlineNodePos(tr, start, nodeSize),
@@ -179,40 +178,22 @@ var isHandleCorrelatedToSelection = exports.isHandleCorrelatedToSelection = func
   }
   var nodeStart;
   var $selectionFrom = selection.$from;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
-    nodeStart = $selectionFrom.before($selectionFrom.sharedDepth(selection.to) + 1);
-    if (nodeStart === $selectionFrom.pos) {
-      nodeStart = $selectionFrom.depth ? $selectionFrom.before() : $selectionFrom.pos;
-    }
-    var $resolvedNodePos = state.doc.resolve(nodeStart);
-    if (['tableRow', 'tableCell', 'tableHeader'].includes($resolvedNodePos.node().type.name)) {
-      var parentNodeFindRes = (0, _utils.findParentNodeOfType)(state.schema.nodes['table'])(selection);
-      var tablePos = parentNodeFindRes === null || parentNodeFindRes === void 0 ? void 0 : parentNodeFindRes.pos;
-      nodeStart = typeof tablePos === 'undefined' ? nodeStart : tablePos;
-    } else if (['listItem'].includes($resolvedNodePos.node().type.name)) {
-      nodeStart = $resolvedNodePos.before(rootListDepth($resolvedNodePos));
-    } else if (['taskList'].includes($resolvedNodePos.node().type.name)) {
-      var listdepth = rootTaskListDepth($resolvedNodePos);
-      nodeStart = $resolvedNodePos.before(listdepth);
-    } else if (['blockquote'].includes($resolvedNodePos.node().type.name)) {
-      nodeStart = $resolvedNodePos.before();
-    }
-  } else {
-    var selectionFrom = $selectionFrom.pos;
-    nodeStart = $selectionFrom.depth ? $selectionFrom.before() : selectionFrom;
-    var _$resolvedNodePos = state.doc.resolve(nodeStart);
-    if (['tableRow', 'tableCell', 'tableHeader'].includes(_$resolvedNodePos.node().type.name)) {
-      var _parentNodeFindRes = (0, _utils.findParentNodeOfType)(state.schema.nodes['table'])(selection);
-      var _tablePos = _parentNodeFindRes === null || _parentNodeFindRes === void 0 ? void 0 : _parentNodeFindRes.pos;
-      nodeStart = typeof _tablePos === 'undefined' ? nodeStart : _tablePos;
-    } else if (['listItem'].includes(_$resolvedNodePos.node().type.name)) {
-      nodeStart = _$resolvedNodePos.before(rootListDepth(_$resolvedNodePos));
-    } else if (['taskList'].includes(_$resolvedNodePos.node().type.name)) {
-      var _listdepth = rootTaskListDepth(_$resolvedNodePos);
-      nodeStart = _$resolvedNodePos.before(_listdepth);
-    } else if (['blockquote'].includes(_$resolvedNodePos.node().type.name)) {
-      nodeStart = _$resolvedNodePos.before();
-    }
+  nodeStart = $selectionFrom.before($selectionFrom.sharedDepth(selection.to) + 1);
+  if (nodeStart === $selectionFrom.pos) {
+    nodeStart = $selectionFrom.depth ? $selectionFrom.before() : $selectionFrom.pos;
+  }
+  var $resolvedNodePos = state.doc.resolve(nodeStart);
+  if (['tableRow', 'tableCell', 'tableHeader'].includes($resolvedNodePos.node().type.name)) {
+    var parentNodeFindRes = (0, _utils.findParentNodeOfType)(state.schema.nodes['table'])(selection);
+    var tablePos = parentNodeFindRes === null || parentNodeFindRes === void 0 ? void 0 : parentNodeFindRes.pos;
+    nodeStart = typeof tablePos === 'undefined' ? nodeStart : tablePos;
+  } else if (['listItem'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before(rootListDepth($resolvedNodePos));
+  } else if (['taskList'].includes($resolvedNodePos.node().type.name)) {
+    var listdepth = rootTaskListDepth($resolvedNodePos);
+    nodeStart = $resolvedNodePos.before(listdepth);
+  } else if (['blockquote'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before();
   }
   return Boolean(handlePos < selection.$to.pos && handlePos >= nodeStart);
 };

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

@@ -173,7 +173,7 @@ function canMoveSliceToIndex(slice, sliceFromPos, sliceToPos, destParent, indexI
   }
 
   // Multiple layout columns do not drop correctly.
-  if (((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type.name) === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
+  if (((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type.name) === 'layoutColumn') {
     return false;
   }
   for (var i = 0; i < slice.content.childCount; i++) {

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

@@ -135,6 +135,16 @@ var dragHandleButtonStyles = (0, _react2.css)({
     backgroundColor: "var(--ds-background-disabled, transparent)"
   }
 });
+
+// Calculate scaled dimensions based on the base font size using CSS calc()
+// Default font size is 16px, scale proportionally
+// Standard: 16px -> 24h x 12w, Dense: 13px -> 18h x 9w
+var dragHandleButtonDenseModeStyles = (0, _react2.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+  height: "calc(".concat(_consts2.DRAG_HANDLE_HEIGHT, "px * var(--ak-editor-base-font-size) / ").concat(_consts.akEditorFullPageDefaultFontSize, "px)"),
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+  width: "calc(".concat(_styles.DRAG_HANDLE_WIDTH, "px * var(--ak-editor-base-font-size) / ").concat(_consts.akEditorFullPageDefaultFontSize, "px)")
+});
 var dragHandleButtonSmallScreenStyles = (0, _react2.css)((0, _defineProperty2.default)({}, "@container editor-area (max-width: ".concat(_consts.akEditorFullPageNarrowBreakout, "px)"), {
   opacity: 0,
   visibility: 'hidden'
@@ -538,9 +548,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
             if (typeof handlePos !== 'number') {
               return tr;
             }
-            var oldHandlePosCheck = handlePos >= tr.selection.$from.start() - 1 && handlePos <= tr.selection.to;
             var newHandlePosCheck = (0, _getSelection.isHandleCorrelatedToSelection)(view.state, tr.selection, handlePos);
-            if (!tr.selection.empty && ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1') ? newHandlePosCheck : oldHandlePosCheck)) {
+            if (!tr.selection.empty && newHandlePosCheck) {
               var _api$blockControls7;
               api === null || api === void 0 || (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 || _api$blockControls7.commands.setMultiSelectPositions()({
                 tr: tr
@@ -732,7 +741,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       var bottom = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _dragHandlePositions.getControlBottomCSSValue)(safeAnchorName, isSticky, isTopLevelNode, isLayoutColumn) : {};
       return _objectSpread({
         left: isEdgeCase ? "calc(anchor(".concat(safeAnchorName, " start) + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc((anchor(".concat(safeAnchorName, " right) + anchor(").concat(safeAnchorName, " left))/2 - ").concat(_consts2.DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(safeAnchorName, " start) - ").concat(_styles.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts2.dragHandleGap)(nodeType, parentNodeType), "px)"),
-        top: (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(safeAnchorName, " top) - ").concat(_styles.DRAG_HANDLE_WIDTH, "px)") : "calc(anchor(".concat(safeAnchorName, " start) + ").concat((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? $pos && $pos.nodeAfter && (0, _decorationsCommon.getNodeTypeWithLevel)($pos.nodeAfter) || nodeType : nodeType, "px)")
+        top: (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(safeAnchorName, " top) - ").concat(_styles.DRAG_HANDLE_WIDTH, "px)") : "calc(anchor(".concat(safeAnchorName, " start)+ ").concat((0, _consts2.topPositionAdjustment)((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? $pos && $pos.nodeAfter && (0, _decorationsCommon.getNodeTypeWithLevel)($pos.nodeAfter) || nodeType : nodeType), "px)")
       }, bottom);
     }
     var height = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _dragHandlePositions.getControlHeightCSSValue)((0, _dragHandlePositions.getNodeHeight)(dom, safeAnchorName, anchorRectCache) || 0, isSticky, isTopLevelNode, "".concat(_consts2.DRAG_HANDLE_HEIGHT), isLayoutColumn) : {};
@@ -957,7 +966,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         css: [(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? dragHandleButtonStyles : dragHandleButtonStylesOld, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && dragHandleColor,
         // ED-26266: Fixed the drag handle highlight when selecting multiple line in Firefox
         // See https://product-fabric.atlassian.net/browse/ED-26266
-        browser.gecko && dragHandleMultiLineSelectionFixFirefox, (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && hasHadInteraction && selectedStyles, (0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true) && (0, _experiments.editorExperiment)('platform_editor_controls', 'control') && dragHandleButtonSmallScreenStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) && isFocused && keyboardFocusedDragHandleStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? focusedStyles : focusedStylesOld],
+        browser.gecko && dragHandleMultiLineSelectionFixFirefox, (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && hasHadInteraction && selectedStyles, (0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true) && (0, _experiments.editorExperiment)('platform_editor_controls', 'control') && dragHandleButtonSmallScreenStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) && isFocused && keyboardFocusedDragHandleStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? focusedStyles : focusedStylesOld, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') && dragHandleButtonDenseModeStyles],
         ref: buttonRef
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,

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

@@ -102,7 +102,8 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
     setIsDraggedOver = _useState2[1];
   var anchorName = (0, _react.useMemo)(function () {
     if ((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true)) {
-      return nextNode ? (api === null || api === void 0 ? void 0 : api.core.actions.getAnchorIdForNode(nextNode, getPos() || -1)) || '' : '';
+      var _getPos;
+      return nextNode ? (api === null || api === void 0 ? void 0 : api.core.actions.getAnchorIdForNode(nextNode, (_getPos = getPos()) !== null && _getPos !== void 0 ? _getPos : -1)) || '' : '';
     }
     return nextNode ? (0, _decorationsCommon.getNodeAnchor)(nextNode) : '';
   }, [api, getPos, nextNode]);

package/dist/cjs/ui/quick-insert-button.js

@@ -17,9 +17,12 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _add = _interopRequireDefault(require("@atlaskit/icon/core/add"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
 var _widgetPositions = require("../pm-plugins/utils/widget-positions");
@@ -62,6 +65,16 @@ var stickyButtonStyles = (0, _primitives.xcss)({
     outline: "var(--ds-border-width-focused, 2px)".concat(" solid ", "var(--ds-border-focused, #388BFF)")
   }
 });
+
+// Calculate scaled dimensions based on the base font size using CSS calc()
+// Default font size is 16px, scale proportionally
+// Standard: 16px -> 24px x 24px, Dense: 13px -> ~18.5px x ~18.5px
+var stickyButtonDenseModeStyles = (0, _primitives.xcss)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+  height: "calc(".concat(_consts.QUICK_INSERT_HEIGHT, "px * var(--ak-editor-base-font-size) / ").concat(_editorSharedStyles.akEditorFullPageDefaultFontSize, "px)"),
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+  width: "calc(".concat(_consts.QUICK_INSERT_WIDTH, "px * var(--ak-editor-base-font-size) / ").concat(_editorSharedStyles.akEditorFullPageDefaultFontSize, "px)")
+});
 var containerStaticStyles = (0, _primitives.xcss)({
   position: 'absolute',
   zIndex: 'card'
@@ -278,7 +291,7 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
       testId: "editor-quick-insert-button",
       type: "button",
       "aria-label": formatMessage(_messages.blockControlsMessages.insert),
-      xcss: [stickyButtonStyles],
+      xcss: [stickyButtonStyles, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') && stickyButtonDenseModeStyles],
       onClick: handleQuickInsert,
       onMouseDown: handleMouseDown
     }, (0, _react2.jsx)(_add.default, {

package/dist/es2019/blockControlsPlugin.js

@@ -119,18 +119,26 @@ export const blockControlsPlugin = ({
         toggleMenu: toggleMenuMeta
       });
       if ((menuTriggerBy === undefined || !!menuTriggerBy && menuTriggerBy === (options === null || options === void 0 ? void 0 : options.anchorName)) && currentUserIntent === 'blockMenuOpen') {
-        var _api$userIntent4;
-        // Toggled from drag handle
-        api === null || api === void 0 ? void 0 : (_api$userIntent4 = api.userIntent) === null || _api$userIntent4 === void 0 ? void 0 : _api$userIntent4.commands.setCurrentUserIntent('default')({
-          tr
-        });
+        const state = api === null || api === void 0 ? void 0 : api.blockControls.sharedState.currentState();
+        if (state !== null && state !== void 0 && state.isSelectedViaDragHandle && fg('platform_editor_toolbar_aifc_user_intent_fix')) {
+          var _api$userIntent4;
+          api === null || api === void 0 ? void 0 : (_api$userIntent4 = api.userIntent) === null || _api$userIntent4 === void 0 ? void 0 : _api$userIntent4.commands.setCurrentUserIntent('dragHandleSelected')({
+            tr
+          });
+        } else {
+          var _api$userIntent5;
+          // Toggled from drag handle
+          api === null || api === void 0 ? void 0 : (_api$userIntent5 = api.userIntent) === null || _api$userIntent5 === void 0 ? void 0 : _api$userIntent5.commands.setCurrentUserIntent('default')({
+            tr
+          });
+        }
       }
       return tr;
     },
     setNodeDragged: (getPos, anchorName, nodeType) => ({
       tr
     }) => {
-      var _api$userIntent5;
+      var _api$userIntent6;
       const pos = getPos();
       if (pos === undefined) {
         return tr;
@@ -154,7 +162,7 @@ export const blockControlsPlugin = ({
           tr
         });
       }
-      api === null || api === void 0 ? void 0 : (_api$userIntent5 = api.userIntent) === null || _api$userIntent5 === void 0 ? void 0 : _api$userIntent5.commands.setCurrentUserIntent('dragging')({
+      api === null || api === void 0 ? void 0 : (_api$userIntent6 = api.userIntent) === null || _api$userIntent6 === void 0 ? void 0 : _api$userIntent6.commands.setCurrentUserIntent('dragging')({
         tr
       });
       return tr;