@atlaskit/editor-plugin-block-controls 3.8.0 → 3.8.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.8.2
+
+### Patch Changes
+
+- [#135614](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/135614)
+  [`ed711343dbd01`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ed711343dbd01) -
+  ED-27111: Dnd layout column into panel
+- Updated dependencies
+
+## 3.8.1
+
+### Patch Changes
+
+- [#135962](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/135962)
+  [`b7caf17e63935`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b7caf17e63935) -
+  Add refreshAnchorName function to fetch new anchor name if current anchor name isnt provided,
+  which is possible as a new mouseDown event listener has been added to fetch position even if
+  editor isnt ready
+
 ## 3.8.0
 
 ### Minor Changes

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

@@ -92,6 +92,10 @@ var isDragLayoutColumnIntoTable = function isDragLayoutColumnIntoTable($from, $t
   var _$from$nodeAfter2;
   return ((_$from$nodeAfter2 = $from.nodeAfter) === null || _$from$nodeAfter2 === void 0 ? void 0 : _$from$nodeAfter2.type.name) === 'layoutColumn' && $from.parent.type.name === 'layoutSection' && ($to.parent.type.name === 'tableCell' || $to.parent.type.name === 'tableHeader');
 };
+var isDragLayoutColumnIntoPanel = function isDragLayoutColumnIntoPanel($from, $to) {
+  var _$from$nodeAfter3;
+  return ((_$from$nodeAfter3 = $from.nodeAfter) === null || _$from$nodeAfter3 === void 0 ? void 0 : _$from$nodeAfter3.type.name) === 'layoutColumn' && $from.parent.type.name === 'layoutSection' && $to.parent.type.name === 'panel';
+};
 
 /**
  *
@@ -387,11 +391,13 @@ var moveNode = exports.moveNode = function moveNode(api) {
         var sourceNode = $handlePos.nodeAfter;
         var dragLayoutColumnToTopLevel = isDragLayoutColumnToTopLevel($handlePos, $to);
         var dragLayoutColumnIntoTable = isDragLayoutColumnIntoTable($handlePos, $to);
+        var dragLayoutColumnIntoPanel = isDragLayoutColumnIntoPanel($handlePos, $to);
 
         //TODO: ED-26959 - Does this need to be updated with new selection logic above? ^
         // Move a layout column to top level
         // Move a layout column into a table cell, only moves the content into the cell
-        if (sourceNode && (dragLayoutColumnToTopLevel || dragLayoutColumnIntoTable)) {
+        // Move a layout column into a panel, only moves the content into the panel
+        if (sourceNode && (dragLayoutColumnToTopLevel || dragLayoutColumnIntoTable || dragLayoutColumnIntoPanel)) {
           // need update after we support single column layout.
           var layoutColumnContent = sourceNode.content;
           var fragment;

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

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleMouseDown = void 0;
+var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
+  return function (view, event) {
+    if (view.editable) {
+      return false;
+    }
+    if (event.target instanceof HTMLElement) {
+      var _rootNode$type$name, _rootNode$type$name2;
+      var targetPos = view.posAtDOM(event.target, 0);
+      // always fetch top level position for mouseDown to avoid drag handle positions being incorrect
+      var rootPos = view.state.doc.resolve(targetPos).before(1);
+      var rootNode = view.state.doc.nodeAt(rootPos);
+      if (!rootNode) {
+        return false;
+      }
+      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+    }
+    return false;
+  };
+};

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

@@ -26,6 +26,7 @@ var _decorationsAnchor = require("./decorations-anchor");
 var _decorationsDragHandle = require("./decorations-drag-handle");
 var _decorationsDropTarget = require("./decorations-drop-target");
 var _decorationsQuickInsertButton = require("./decorations-quick-insert-button");
+var _handleMouseDown = require("./handle-mouse-down");
 var _handleMouseOver = require("./handle-mouse-over");
 var _keymap = require("./keymap");
 var _activeAnchorTracker = require("./utils/active-anchor-tracker");
@@ -728,6 +729,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           (0, _handleMouseOver.handleMouseOver)(view, event, api);
           return false;
         },
+        mousedown: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? (0, _handleMouseDown.handleMouseDown)(api) : undefined,
         keydown: function keydown(view, event) {
           if (isMultiSelectEnabled) {
             if (event.shiftKey && event.ctrlKey) {

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.canCreateNodeWithContentInsideAnotherNode = void 0;
 exports.canMoveNodeToIndex = canMoveNodeToIndex;
 exports.canMoveSliceToIndex = canMoveSliceToIndex;
 exports.transformSliceExpandToNestedExpand = exports.transformFragmentExpandToNestedExpand = exports.transformExpandToNestedExpand = exports.memoizedTransformExpandToNestedExpand = exports.isNestedExpand = exports.isLayoutColumn = exports.isInsideTable = exports.isInSameLayout = exports.isExpand = exports.isDoc = void 0;
@@ -87,69 +88,75 @@ var memoizedTransformExpandToNestedExpand = exports.memoizedTransformExpandToNes
     return null;
   }
 });
+var canCreateNodeWithContentInsideAnotherNode = exports.canCreateNodeWithContentInsideAnotherNode = function canCreateNodeWithContentInsideAnotherNode(nodeTypesToCreate, nodeWithTargetFragment) {
+  try {
+    return !!nodeTypesToCreate.every(function (nodeType) {
+      return nodeType.createChecked({}, nodeWithTargetFragment);
+    });
+  } catch (e) {
+    return false;
+  }
+};
 function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos, destNode) {
   var srcNodeType = srcNode.type;
-  var parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
+  var schema = srcNodeType.schema;
+  var destParentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
   var activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
+  var layoutColumnContent = srcNode.content;
   var isNestingTablesSupported = (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes') && (0, _experiments.editorExperiment)('nested-tables-in-tables', true, {
     exposure: true
   });
-  var tableNodeType = srcNode.type.schema.nodes.table;
-  var expandNodeType = srcNode.type.schema.nodes.expand;
+  var tableNodeType = schema.nodes.table;
   if (activeNodeType === 'layoutColumn' && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
     // Allow drag layout column and drop into layout section
-    if ((destNode === null || destNode === void 0 ? void 0 : destNode.type.name) === 'layoutSection' || parentNodeType === 'doc') {
+    if ((destNode === null || destNode === void 0 ? void 0 : destNode.type.name) === 'layoutSection' || destParentNodeType === 'doc') {
       return true;
     }
-    if ((parentNodeType === 'tableCell' || parentNodeType === 'tableHeader') && (0, _platformFeatureFlags.fg)('platform_editor_drag_layout_column_into_nodes')) {
-      var maybeExpandNodesArray = (0, _utils.findChildrenByType)(srcNode, expandNodeType);
-      var layoutColumnContainExpand = maybeExpandNodesArray.length > 0;
-      var layoutColumnContainTable = (0, _utils.findChildrenByType)(srcNode, tableNodeType).length > 0;
-
-      // when layout column content does not contain table, allow to drop into table cell
-      if (!layoutColumnContainTable) {
-        return true;
-      }
-
-      // when layout column content contains table, but does not contain expand, allow drop into table cell if nesting tables is supported, and the nesting depth does not exceed 1
-      if (layoutColumnContainTable && !layoutColumnContainExpand) {
-        var nestingDepth = (0, _nesting.getParentOfTypeCount)(tableNodeType)($destNodePos);
-        return isNestingTablesSupported && nestingDepth <= 1;
+    if ((0, _platformFeatureFlags.fg)('platform_editor_drag_layout_column_into_nodes')) {
+      if (destParentNodeType === 'tableCell' || destParentNodeType === 'tableHeader') {
+        var _schema$nodes = schema.nodes,
+          tableCell = _schema$nodes.tableCell,
+          tableHeader = _schema$nodes.tableHeader,
+          expand = _schema$nodes.expand;
+        var contentContainsExpand = (0, _utils.findChildrenByType)(srcNode, expand).length > 0;
+        //convert expand to nestedExpand if there are expands inside the layout column
+        // otherwise, the createChecked will fail as expand is not a valid child of tableCell/tableHeader, but nestedExpand is
+        var convertedFragment = contentContainsExpand ? transformFragmentExpandToNestedExpand(layoutColumnContent) : layoutColumnContent;
+        if (!convertedFragment) {
+          return false;
+        }
+        return canCreateNodeWithContentInsideAnotherNode([tableCell, tableHeader], convertedFragment);
       }
-
-      // when layout column content contains an expand, and there is a table inside the expand, should not allow to drop into table cell
-      if (layoutColumnContainTable && layoutColumnContainExpand) {
-        var isAnyTableNestedInExpand = maybeExpandNodesArray.some(function (result) {
-          return (0, _utils.findChildrenByType)(result.node, tableNodeType).length > 0;
-        });
-        return !isAnyTableNestedInExpand;
+      if (destParentNodeType === 'panel') {
+        var panel = schema.nodes.panel;
+        return canCreateNodeWithContentInsideAnotherNode([panel], layoutColumnContent);
       }
     }
   }
 
   // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
   if ((0, _experiments.editorExperiment)('nested-expand-in-expand', false)) {
-    if (parentNodeType === 'expand' && (activeNodeType === 'expand' || activeNodeType === 'nestedExpand')) {
+    if (destParentNodeType === 'expand' && (activeNodeType === 'expand' || activeNodeType === 'nestedExpand')) {
       return false;
     }
   }
 
   // NOTE: this will block drop targets from showing for dragging a table into another table
   // unless nested tables are supported and the nesting depth does not exceed 1
-  if ((parentNodeType === 'tableCell' || parentNodeType === 'tableHeader') && activeNodeType === 'table') {
-    var _nestingDepth = (0, _nesting.getParentOfTypeCount)(tableNodeType)($destNodePos);
-    if (!isNestingTablesSupported || isNestingTablesSupported && _nestingDepth > 1) {
+  if ((destParentNodeType === 'tableCell' || destParentNodeType === 'tableHeader') && activeNodeType === 'table') {
+    var nestingDepth = (0, _nesting.getParentOfTypeCount)(tableNodeType)($destNodePos);
+    if (!isNestingTablesSupported || isNestingTablesSupported && nestingDepth > 1) {
       return false;
     }
   }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
-      srcNodeType = srcNodeType.schema.nodes.nestedExpand;
+      srcNodeType = schema.nodes.nestedExpand;
     } else {
       return false;
     }
   } else if ((isDoc(destParent.type) || isLayoutColumn(destParent.type)) && isNestedExpand(srcNodeType)) {
-    srcNodeType = srcNodeType.schema.nodes.expand;
+    srcNodeType = schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);
 }

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

@@ -34,6 +34,7 @@ var _getSelection = require("../pm-plugins/utils/getSelection");
 var _selection = require("../pm-plugins/utils/selection");
 var _consts = require("./consts");
 var _dragPreview = require("./drag-preview");
+var _anchorName = require("./utils/anchor-name");
 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; } /**
  * @jsxRuntime classic
@@ -130,8 +131,9 @@ var dragHandleContainerStyles = (0, _primitives.xcss)({
   boxSizing: 'border-box',
   zIndex: 'card'
 });
-var controlContainerStyles = (0, _primitives.xcss)({
-  top: '0',
+var tooltipContainerStyles = (0, _primitives.xcss)({
+  top: '8px',
+  bottom: '-8px',
   position: 'sticky',
   zIndex: 'card'
 });
@@ -518,7 +520,12 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     }
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
-    var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
+    var safeAnchorName = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? (0, _anchorName.refreshAnchorName)({
+      getPos: getPos,
+      view: view,
+      anchorName: anchorName
+    }) : anchorName;
+    var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(safeAnchorName, "\"]"));
     var hasResizer = nodeType === 'table' || nodeType === 'mediaSingle';
     var isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension' || nodeType === 'multiBodiedExtension' && (0, _platformFeatureFlags.fg)('platform_editor_multi_body_extension_extensibility');
     var isBlockCard = nodeType === 'blockCard' && !!blockCardWidth;
@@ -540,18 +547,18 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     var isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     var isSticky = (0, _dragHandlePositions.shouldBeSticky)(nodeType);
     if (supportsAnchor) {
-      var bottom = (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') ? (0, _dragHandlePositions.getControlBottomCSSValue)(anchorName, isSticky, isTopLevelNode, isLayoutColumn) : {};
+      var bottom = (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') ? (0, _dragHandlePositions.getControlBottomCSSValue)(safeAnchorName, isSticky, isTopLevelNode, isLayoutColumn) : {};
       return _objectSpread({
-        left: isEdgeCase ? "calc(anchor(".concat(anchorName, " start) + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc((anchor(".concat(anchorName, " right) + anchor(").concat(anchorName, " left))/2 - ").concat(_consts.DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(anchorName, " start) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts.dragHandleGap)(nodeType, parentNodeType), "px)"),
-        top: (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(anchorName, " top) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px)") : "calc(anchor(".concat(anchorName, " start) + ").concat((0, _consts.topPositionAdjustment)(nodeType), "px)")
+        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(_consts.DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(safeAnchorName, " start) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px - ").concat((0, _consts.dragHandleGap)(nodeType, parentNodeType), "px)"),
+        top: (0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(safeAnchorName, " top) - ").concat(_consts.DRAG_HANDLE_WIDTH, "px)") : "calc(anchor(".concat(safeAnchorName, " start) + ").concat((0, _consts.topPositionAdjustment)(nodeType), "px)")
       }, bottom);
     }
-    var height = (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') ? (0, _dragHandlePositions.getControlHeightCSSValue)((0, _dragHandlePositions.getNodeHeight)(dom, anchorName, anchorRectCache) || 0, isSticky, isTopLevelNode, "".concat(_consts.DRAG_HANDLE_HEIGHT), isLayoutColumn) : {};
+    var height = (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') ? (0, _dragHandlePositions.getControlHeightCSSValue)((0, _dragHandlePositions.getNodeHeight)(dom, safeAnchorName, anchorRectCache) || 0, isSticky, isTopLevelNode, "".concat(_consts.DRAG_HANDLE_HEIGHT), isLayoutColumn) : {};
     return _objectSpread({
       left: isEdgeCase ? "calc(".concat((dom === null || dom === void 0 ? void 0 : dom.offsetLeft) || 0, "px + ").concat((0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : (0, _dragHandlePositions.getLeftPosition)(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType),
       top: (0, _dragHandlePositions.getTopPosition)(dom, nodeType)
     }, height);
-  }, [anchorName, view.dom, view.state.doc, nodeType, blockCardWidth, macroInteractionUpdates, isTopLevelNode, isLayoutColumn, getPos, anchorRectCache]);
+  }, [anchorName, getPos, view, nodeType, blockCardWidth, macroInteractionUpdates, anchorRectCache, isTopLevelNode, isLayoutColumn]);
   var _useState7 = (0, _react.useState)({
       display: 'none'
     }),
@@ -728,7 +735,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       as: "span",
       testId: "block-ctrl-drag-handle-container"
     }, (0, _react2.jsx)(_primitives.Box, {
-      xcss: [controlContainerStyles],
+      xcss: [tooltipContainerStyles],
       as: "span"
     }, (0, _react2.jsx)(_tooltip.default, {
       content: (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
@@ -753,7 +760,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       as: "span",
       testId: "block-ctrl-drag-handle-container"
     }, (0, _react2.jsx)(_primitives.Box, {
-      xcss: [controlContainerStyles],
+      xcss: [tooltipContainerStyles],
       as: "span"
     }, renderButton()));
   };

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

@@ -22,6 +22,7 @@ var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
 var _widgetPositions = require("../pm-plugins/utils/widget-positions");
 var _consts = require("./consts");
+var _anchorName = require("./utils/anchor-name");
 var _documentChecks = require("./utils/document-checks");
 var _editorCommands = require("./utils/editor-commands");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -94,7 +95,8 @@ var disabledContainerStyles = (0, _primitives.xcss)({
   cursor: 'not-allowed'
 });
 var tooltipContainerStyles = (0, _primitives.xcss)({
-  top: '0',
+  top: '8px',
+  bottom: '-8px',
   position: 'sticky',
   zIndex: 'card'
 });
@@ -127,7 +129,12 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
   // CHANGES - `removed editorExperiment('advanced_layouts', true) && isLayoutColumn` checks as quick insert button will not be positioned for layout column
   var calculatePosition = (0, _react.useCallback)(function () {
     var supportsAnchor = CSS.supports('top', "anchor(".concat(rootAnchorName, " start)")) && CSS.supports('left', "anchor(".concat(rootAnchorName, " start)"));
-    var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(rootAnchorName, "\"]"));
+    var safeAnchorName = (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? (0, _anchorName.refreshAnchorName)({
+      getPos: getPos,
+      view: view,
+      anchorName: rootAnchorName
+    }) : rootAnchorName;
+    var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(safeAnchorName, "\"]"));
     var hasResizer = rootNodeType === 'table' || rootNodeType === 'mediaSingle';
     var isExtension = rootNodeType === 'extension' || rootNodeType === 'bodiedExtension';
     var isBlockCard = rootNodeType === 'blockCard';
@@ -148,24 +155,24 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
     }
     var isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     var isSticky = (0, _dragHandlePositions.shouldBeSticky)(rootNodeType);
-    var bottom = (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') ? (0, _dragHandlePositions.getControlBottomCSSValue)(rootAnchorName || anchorName, isSticky, true) : {};
+    var bottom = (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') ? (0, _dragHandlePositions.getControlBottomCSSValue)(safeAnchorName || anchorName, isSticky, true) : {};
     if (supportsAnchor) {
       return _objectSpread({
-        left: isEdgeCase ? "calc(anchor(".concat(rootAnchorName, " start) + ").concat((0, _widgetPositions.getLeftPositionForRootElement)(dom, rootNodeType, _consts.QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(_consts.QUICK_INSERT_LEFT_OFFSET, "px)") : "calc(anchor(".concat(rootAnchorName, " start) - ").concat(_consts.QUICK_INSERT_DIMENSIONS.width, "px - ").concat((0, _consts.rootElementGap)(rootNodeType), "px + -").concat(_consts.QUICK_INSERT_LEFT_OFFSET, "px)"),
-        top: "calc(anchor(".concat(rootAnchorName, " start) + ").concat((0, _consts.topPositionAdjustment)(rootNodeType), "px)")
+        left: isEdgeCase ? "calc(anchor(".concat(safeAnchorName, " start) + ").concat((0, _widgetPositions.getLeftPositionForRootElement)(dom, rootNodeType, _consts.QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(_consts.QUICK_INSERT_LEFT_OFFSET, "px)") : "calc(anchor(".concat(safeAnchorName, " start) - ").concat(_consts.QUICK_INSERT_DIMENSIONS.width, "px - ").concat((0, _consts.rootElementGap)(rootNodeType), "px + -").concat(_consts.QUICK_INSERT_LEFT_OFFSET, "px)"),
+        top: "calc(anchor(".concat(safeAnchorName, " start) + ").concat((0, _consts.topPositionAdjustment)(rootNodeType), "px)")
       }, bottom);
     }
 
     // expensive, calls offsetHeight, guard behind FG
     var nodeHeight =
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') && (0, _dragHandlePositions.getNodeHeight)(dom, rootAnchorName || anchorName, anchorRectCache) || 0;
+    (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') && (0, _dragHandlePositions.getNodeHeight)(dom, safeAnchorName || anchorName, anchorRectCache) || 0;
     var height = (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_controls') ? (0, _dragHandlePositions.getControlHeightCSSValue)(nodeHeight, isSticky, true, "var(--ds-space-300, 24px)") : {};
     return _objectSpread({
       left: isEdgeCase ? "calc(".concat((dom === null || dom === void 0 ? void 0 : dom.offsetLeft) || 0, "px + ").concat((0, _widgetPositions.getLeftPositionForRootElement)(dom, rootNodeType, _consts.QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(_consts.QUICK_INSERT_LEFT_OFFSET, "px)") : "calc(".concat((0, _widgetPositions.getLeftPositionForRootElement)(dom, rootNodeType, _consts.QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(_consts.QUICK_INSERT_LEFT_OFFSET, "px)"),
       top: (0, _dragHandlePositions.getTopPosition)(dom, rootNodeType)
     }, height);
-  }, [rootAnchorName, view.dom, rootNodeType, macroInteractionUpdates, anchorName, anchorRectCache]);
+  }, [rootAnchorName, getPos, view, rootNodeType, macroInteractionUpdates, anchorName, anchorRectCache]);
   (0, _react.useEffect)(function () {
     var cleanUpTransitionListener;
     if (rootNodeType === 'extension' || rootNodeType === 'embedCard') {
@@ -239,7 +246,7 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
         }
       }
     }
-    (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 || _api$quickInsert.actions.openTypeAhead('blockControl');
+    (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 || _api$quickInsert.actions.openTypeAhead('blockControl', true);
   }, [api, getPos, view]);
   var handleMouseDown = (0, _react.useCallback)(function () {
     var _api$typeAhead;

package/dist/cjs/ui/utils/anchor-name.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.refreshAnchorName = void 0;
+var _decorationsAnchor = require("../../pm-plugins/decorations-anchor");
+var _main = require("../../pm-plugins/main");
+/**
+ * Checks for plugin state for latest anchorName based on the position, returns
+ * provided anchorName if available
+ */
+var refreshAnchorName = exports.refreshAnchorName = function refreshAnchorName(_ref) {
+  var getPos = _ref.getPos,
+    view = _ref.view,
+    anchorName = _ref.anchorName;
+  var newAnchorName = anchorName || '';
+  var pos = getPos();
+  if (anchorName || pos === undefined) {
+    return newAnchorName;
+  }
+  var node = view.state.doc.nodeAt(pos);
+  var state = _main.key.getState(view.state);
+  if (state !== null && state !== void 0 && state.decorations) {
+    var _node$nodeSize;
+    var nodeDecs = (0, _decorationsAnchor.findNodeDecs)(state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
+    var nodeDec = nodeDecs.at(0);
+    if (!nodeDec) {
+      return newAnchorName;
+    }
+    newAnchorName = nodeDec.spec.anchorName;
+  }
+  return newAnchorName;
+};

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

@@ -85,6 +85,10 @@ const isDragLayoutColumnIntoTable = ($from, $to) => {
   var _$from$nodeAfter2;
   return ((_$from$nodeAfter2 = $from.nodeAfter) === null || _$from$nodeAfter2 === void 0 ? void 0 : _$from$nodeAfter2.type.name) === 'layoutColumn' && $from.parent.type.name === 'layoutSection' && ($to.parent.type.name === 'tableCell' || $to.parent.type.name === 'tableHeader');
 };
+const isDragLayoutColumnIntoPanel = ($from, $to) => {
+  var _$from$nodeAfter3;
+  return ((_$from$nodeAfter3 = $from.nodeAfter) === null || _$from$nodeAfter3 === void 0 ? void 0 : _$from$nodeAfter3.type.name) === 'layoutColumn' && $from.parent.type.name === 'layoutSection' && $to.parent.type.name === 'panel';
+};
 
 /**
  *
@@ -390,11 +394,13 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     const sourceNode = $handlePos.nodeAfter;
     const dragLayoutColumnToTopLevel = isDragLayoutColumnToTopLevel($handlePos, $to);
     const dragLayoutColumnIntoTable = isDragLayoutColumnIntoTable($handlePos, $to);
+    const dragLayoutColumnIntoPanel = isDragLayoutColumnIntoPanel($handlePos, $to);
 
     //TODO: ED-26959 - Does this need to be updated with new selection logic above? ^
     // Move a layout column to top level
     // Move a layout column into a table cell, only moves the content into the cell
-    if (sourceNode && (dragLayoutColumnToTopLevel || dragLayoutColumnIntoTable)) {
+    // Move a layout column into a panel, only moves the content into the panel
+    if (sourceNode && (dragLayoutColumnToTopLevel || dragLayoutColumnIntoTable || dragLayoutColumnIntoPanel)) {
       // need update after we support single column layout.
       const layoutColumnContent = sourceNode.content;
       let fragment;

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

@@ -0,0 +1,17 @@
+export const handleMouseDown = api => (view, event) => {
+  if (view.editable) {
+    return false;
+  }
+  if (event.target instanceof HTMLElement) {
+    var _rootNode$type$name, _rootNode$type$name2;
+    const targetPos = view.posAtDOM(event.target, 0);
+    // always fetch top level position for mouseDown to avoid drag handle positions being incorrect
+    const rootPos = view.state.doc.resolve(targetPos).before(1);
+    const rootNode = view.state.doc.nodeAt(rootPos);
+    if (!rootNode) {
+      return false;
+    }
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
+  }
+  return false;
+};

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

@@ -17,6 +17,7 @@ import { findNodeDecs, nodeDecorations } from './decorations-anchor';
 import { dragHandleDecoration, emptyParagraphNodeDecorations, findHandleDec } from './decorations-drag-handle';
 import { dropTargetDecorations, findDropTargetDecs } from './decorations-drop-target';
 import { findQuickInsertInsertButtonDecoration, quickInsertButtonDecoration } from './decorations-quick-insert-button';
+import { handleMouseDown } from './handle-mouse-down';
 import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
@@ -714,6 +715,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           handleMouseOver(view, event, api);
           return false;
         },
+        mousedown: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? handleMouseDown(api) : undefined,
         keydown(view, event) {
           if (isMultiSelectEnabled) {
             if (event.shiftKey && event.ctrlKey) {

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

@@ -80,54 +80,63 @@ export const memoizedTransformExpandToNestedExpand = memoizeOne(node => {
     return null;
   }
 });
+export const canCreateNodeWithContentInsideAnotherNode = (nodeTypesToCreate, nodeWithTargetFragment) => {
+  try {
+    return !!nodeTypesToCreate.every(nodeType => nodeType.createChecked({}, nodeWithTargetFragment));
+  } catch (e) {
+    return false;
+  }
+};
 export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos, destNode) {
   let srcNodeType = srcNode.type;
-  const parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
+  const schema = srcNodeType.schema;
+  const destParentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
   const activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
+  const layoutColumnContent = srcNode.content;
   const isNestingTablesSupported = fg('platform_editor_use_nested_table_pm_nodes') && editorExperiment('nested-tables-in-tables', true, {
     exposure: true
   });
-  const tableNodeType = srcNode.type.schema.nodes.table;
-  const expandNodeType = srcNode.type.schema.nodes.expand;
+  const tableNodeType = schema.nodes.table;
   if (activeNodeType === 'layoutColumn' && editorExperiment('advanced_layouts', true)) {
     // Allow drag layout column and drop into layout section
-    if ((destNode === null || destNode === void 0 ? void 0 : destNode.type.name) === 'layoutSection' || parentNodeType === 'doc') {
+    if ((destNode === null || destNode === void 0 ? void 0 : destNode.type.name) === 'layoutSection' || destParentNodeType === 'doc') {
       return true;
     }
-    if ((parentNodeType === 'tableCell' || parentNodeType === 'tableHeader') && fg('platform_editor_drag_layout_column_into_nodes')) {
-      const maybeExpandNodesArray = findChildrenByType(srcNode, expandNodeType);
-      const layoutColumnContainExpand = maybeExpandNodesArray.length > 0;
-      const layoutColumnContainTable = findChildrenByType(srcNode, tableNodeType).length > 0;
-
-      // when layout column content does not contain table, allow to drop into table cell
-      if (!layoutColumnContainTable) {
-        return true;
-      }
-
-      // when layout column content contains table, but does not contain expand, allow drop into table cell if nesting tables is supported, and the nesting depth does not exceed 1
-      if (layoutColumnContainTable && !layoutColumnContainExpand) {
-        const nestingDepth = getParentOfTypeCount(tableNodeType)($destNodePos);
-        return isNestingTablesSupported && nestingDepth <= 1;
+    if (fg('platform_editor_drag_layout_column_into_nodes')) {
+      if (destParentNodeType === 'tableCell' || destParentNodeType === 'tableHeader') {
+        const {
+          tableCell,
+          tableHeader,
+          expand
+        } = schema.nodes;
+        const contentContainsExpand = findChildrenByType(srcNode, expand).length > 0;
+        //convert expand to nestedExpand if there are expands inside the layout column
+        // otherwise, the createChecked will fail as expand is not a valid child of tableCell/tableHeader, but nestedExpand is
+        const convertedFragment = contentContainsExpand ? transformFragmentExpandToNestedExpand(layoutColumnContent) : layoutColumnContent;
+        if (!convertedFragment) {
+          return false;
+        }
+        return canCreateNodeWithContentInsideAnotherNode([tableCell, tableHeader], convertedFragment);
       }
-
-      // when layout column content contains an expand, and there is a table inside the expand, should not allow to drop into table cell
-      if (layoutColumnContainTable && layoutColumnContainExpand) {
-        const isAnyTableNestedInExpand = maybeExpandNodesArray.some(result => findChildrenByType(result.node, tableNodeType).length > 0);
-        return !isAnyTableNestedInExpand;
+      if (destParentNodeType === 'panel') {
+        const {
+          panel
+        } = schema.nodes;
+        return canCreateNodeWithContentInsideAnotherNode([panel], layoutColumnContent);
       }
     }
   }
 
   // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
   if (editorExperiment('nested-expand-in-expand', false)) {
-    if (parentNodeType === 'expand' && (activeNodeType === 'expand' || activeNodeType === 'nestedExpand')) {
+    if (destParentNodeType === 'expand' && (activeNodeType === 'expand' || activeNodeType === 'nestedExpand')) {
       return false;
     }
   }
 
   // NOTE: this will block drop targets from showing for dragging a table into another table
   // unless nested tables are supported and the nesting depth does not exceed 1
-  if ((parentNodeType === 'tableCell' || parentNodeType === 'tableHeader') && activeNodeType === 'table') {
+  if ((destParentNodeType === 'tableCell' || destParentNodeType === 'tableHeader') && activeNodeType === 'table') {
     const nestingDepth = getParentOfTypeCount(tableNodeType)($destNodePos);
     if (!isNestingTablesSupported || isNestingTablesSupported && nestingDepth > 1) {
       return false;
@@ -135,12 +144,12 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNo
   }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
-      srcNodeType = srcNodeType.schema.nodes.nestedExpand;
+      srcNodeType = schema.nodes.nestedExpand;
     } else {
       return false;
     }
   } else if ((isDoc(destParent.type) || isLayoutColumn(destParent.type)) && isNestedExpand(srcNodeType)) {
-    srcNodeType = srcNodeType.schema.nodes.expand;
+    srcNodeType = schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);
 }