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

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

@@ -31,6 +31,7 @@ import { isHandleCorrelatedToSelection, selectNode } from '../pm-plugins/utils/g
 import { alignAnchorHeadInDirectionOfPos, expandSelectionHeadToNodeAtPos } from '../pm-plugins/utils/selection';
 import { BLOCK_MENU_ENABLED, DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, nodeMargins, spacingBetweenNodesForPreview, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
+import { refreshAnchorName } from './utils/anchor-name';
 const iconWrapperStyles = xcss({
   display: 'flex',
   justifyContent: 'center',
@@ -122,8 +123,9 @@ const dragHandleContainerStyles = xcss({
   boxSizing: 'border-box',
   zIndex: 'card'
 });
-const controlContainerStyles = xcss({
-  top: '0',
+const tooltipContainerStyles = xcss({
+  top: '8px',
+  bottom: '-8px',
   position: 'sticky',
   zIndex: 'card'
 });
@@ -507,7 +509,12 @@ export const DragHandle = ({
       parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     }
     const supportsAnchor = CSS.supports('top', `anchor(${anchorName} start)`) && CSS.supports('left', `anchor(${anchorName} start)`);
-    const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${anchorName}"]`);
+    const safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+      getPos,
+      view,
+      anchorName
+    }) : anchorName;
+    const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${safeAnchorName}"]`);
     const hasResizer = nodeType === 'table' || nodeType === 'mediaSingle';
     const isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension' || nodeType === 'multiBodiedExtension' && fg('platform_editor_multi_body_extension_extensibility');
     const isBlockCard = nodeType === 'blockCard' && !!blockCardWidth;
@@ -529,20 +536,20 @@ export const DragHandle = ({
     const isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     const isSticky = shouldBeSticky(nodeType);
     if (supportsAnchor) {
-      const bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(anchorName, isSticky, isTopLevelNode, isLayoutColumn) : {};
+      const bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(safeAnchorName, isSticky, isTopLevelNode, isLayoutColumn) : {};
       return {
-        left: isEdgeCase ? `calc(anchor(${anchorName} start) + ${getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType)})` : editorExperiment('advanced_layouts', true) && isLayoutColumn ? `calc((anchor(${anchorName} right) + anchor(${anchorName} left))/2 - ${DRAG_HANDLE_HEIGHT / 2}px)` : `calc(anchor(${anchorName} start) - ${DRAG_HANDLE_WIDTH}px - ${dragHandleGap(nodeType, parentNodeType)}px)`,
-        top: editorExperiment('advanced_layouts', true) && isLayoutColumn ? `calc(anchor(${anchorName} top) - ${DRAG_HANDLE_WIDTH}px)` : `calc(anchor(${anchorName} start) + ${topPositionAdjustment(nodeType)}px)`,
+        left: isEdgeCase ? `calc(anchor(${safeAnchorName} start) + ${getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType)})` : editorExperiment('advanced_layouts', true) && isLayoutColumn ? `calc((anchor(${safeAnchorName} right) + anchor(${safeAnchorName} left))/2 - ${DRAG_HANDLE_HEIGHT / 2}px)` : `calc(anchor(${safeAnchorName} start) - ${DRAG_HANDLE_WIDTH}px - ${dragHandleGap(nodeType, parentNodeType)}px)`,
+        top: editorExperiment('advanced_layouts', true) && isLayoutColumn ? `calc(anchor(${safeAnchorName} top) - ${DRAG_HANDLE_WIDTH}px)` : `calc(anchor(${safeAnchorName} start) + ${topPositionAdjustment(nodeType)}px)`,
         ...bottom
       };
     }
-    const height = fg('platform_editor_controls_sticky_controls') ? getControlHeightCSSValue(getNodeHeight(dom, anchorName, anchorRectCache) || 0, isSticky, isTopLevelNode, `${DRAG_HANDLE_HEIGHT}`, isLayoutColumn) : {};
+    const height = fg('platform_editor_controls_sticky_controls') ? getControlHeightCSSValue(getNodeHeight(dom, safeAnchorName, anchorRectCache) || 0, isSticky, isTopLevelNode, `${DRAG_HANDLE_HEIGHT}`, isLayoutColumn) : {};
     return {
       left: isEdgeCase ? `calc(${(dom === null || dom === void 0 ? void 0 : dom.offsetLeft) || 0}px + ${getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType)})` : getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType),
       top: 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]);
   const [positionStyles, setPositionStyles] = useState({
     display: 'none'
   });
@@ -712,7 +719,7 @@ export const DragHandle = ({
     as: "span",
     testId: "block-ctrl-drag-handle-container"
   }, jsx(Box, {
-    xcss: [controlContainerStyles],
+    xcss: [tooltipContainerStyles],
     as: "span"
   }, jsx(Tooltip, {
     content: jsx(TooltipContentWithMultipleShortcuts, {
@@ -735,7 +742,7 @@ export const DragHandle = ({
     as: "span",
     testId: "block-ctrl-drag-handle-container"
   }, jsx(Box, {
-    xcss: [controlContainerStyles],
+    xcss: [tooltipContainerStyles],
     as: "span"
   }, renderButton()));
   const buttonWithTooltip = () => jsx(Tooltip, {

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

@@ -12,6 +12,7 @@ import Tooltip from '@atlaskit/tooltip';
 import { getControlBottomCSSValue, getControlHeightCSSValue, getNodeHeight, getTopPosition, shouldBeSticky } from '../pm-plugins/utils/drag-handle-positions';
 import { getLeftPositionForRootElement } from '../pm-plugins/utils/widget-positions';
 import { rootElementGap, topPositionAdjustment, QUICK_INSERT_DIMENSIONS, QUICK_INSERT_LEFT_OFFSET } from './consts';
+import { refreshAnchorName } from './utils/anchor-name';
 import { isInTextSelection, isNestedNodeSelected, isNonEditableBlock, isSelectionInNode } from './utils/document-checks';
 import { createNewLine } from './utils/editor-commands';
 const TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
@@ -80,7 +81,8 @@ const disabledContainerStyles = xcss({
   cursor: 'not-allowed'
 });
 const tooltipContainerStyles = xcss({
-  top: '0',
+  top: '8px',
+  bottom: '-8px',
   position: 'sticky',
   zIndex: 'card'
 });
@@ -111,7 +113,12 @@ export const TypeAheadControl = ({
   // CHANGES - `removed editorExperiment('advanced_layouts', true) && isLayoutColumn` checks as quick insert button will not be positioned for layout column
   const calculatePosition = useCallback(() => {
     const supportsAnchor = CSS.supports('top', `anchor(${rootAnchorName} start)`) && CSS.supports('left', `anchor(${rootAnchorName} start)`);
-    const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${rootAnchorName}"]`);
+    const safeAnchorName = fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+      getPos,
+      view,
+      anchorName: rootAnchorName
+    }) : rootAnchorName;
+    const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${safeAnchorName}"]`);
     const hasResizer = rootNodeType === 'table' || rootNodeType === 'mediaSingle';
     const isExtension = rootNodeType === 'extension' || rootNodeType === 'bodiedExtension';
     const isBlockCard = rootNodeType === 'blockCard';
@@ -132,11 +139,11 @@ export const TypeAheadControl = ({
     }
     const isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     const isSticky = shouldBeSticky(rootNodeType);
-    const bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(rootAnchorName || anchorName, isSticky, true) : {};
+    const bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(safeAnchorName || anchorName, isSticky, true) : {};
     if (supportsAnchor) {
       return {
-        left: isEdgeCase ? `calc(anchor(${rootAnchorName} start) + ${getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates)} + -${QUICK_INSERT_LEFT_OFFSET}px)` : `calc(anchor(${rootAnchorName} start) - ${QUICK_INSERT_DIMENSIONS.width}px - ${rootElementGap(rootNodeType)}px + -${QUICK_INSERT_LEFT_OFFSET}px)`,
-        top: `calc(anchor(${rootAnchorName} start) + ${topPositionAdjustment(rootNodeType)}px)`,
+        left: isEdgeCase ? `calc(anchor(${safeAnchorName} start) + ${getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates)} + -${QUICK_INSERT_LEFT_OFFSET}px)` : `calc(anchor(${safeAnchorName} start) - ${QUICK_INSERT_DIMENSIONS.width}px - ${rootElementGap(rootNodeType)}px + -${QUICK_INSERT_LEFT_OFFSET}px)`,
+        top: `calc(anchor(${safeAnchorName} start) + ${topPositionAdjustment(rootNodeType)}px)`,
         ...bottom
       };
     }
@@ -144,14 +151,14 @@ export const TypeAheadControl = ({
     // expensive, calls offsetHeight, guard behind FG
     const nodeHeight =
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform_editor_controls_sticky_controls') && getNodeHeight(dom, rootAnchorName || anchorName, anchorRectCache) || 0;
+    fg('platform_editor_controls_sticky_controls') && getNodeHeight(dom, safeAnchorName || anchorName, anchorRectCache) || 0;
     const height = fg('platform_editor_controls_sticky_controls') ? getControlHeightCSSValue(nodeHeight, isSticky, true, "var(--ds-space-300, 24px)") : {};
     return {
       left: isEdgeCase ? `calc(${(dom === null || dom === void 0 ? void 0 : dom.offsetLeft) || 0}px + ${getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates)} + -${QUICK_INSERT_LEFT_OFFSET}px)` : `calc(${getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates)} + -${QUICK_INSERT_LEFT_OFFSET}px)`,
       top: getTopPosition(dom, rootNodeType),
       ...height
     };
-  }, [rootAnchorName, view.dom, rootNodeType, macroInteractionUpdates, anchorName, anchorRectCache]);
+  }, [rootAnchorName, getPos, view, rootNodeType, macroInteractionUpdates, anchorName, anchorRectCache]);
   useEffect(() => {
     let cleanUpTransitionListener;
     if (rootNodeType === 'extension' || rootNodeType === 'embedCard') {
@@ -225,7 +232,7 @@ export const TypeAheadControl = ({
         }
       }
     }
-    (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 ? void 0 : _api$quickInsert.actions.openTypeAhead('blockControl');
+    (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 ? void 0 : _api$quickInsert.actions.openTypeAhead('blockControl', true);
   }, [api, getPos, view]);
   const handleMouseDown = useCallback(() => {
     var _api$typeAhead;

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

@@ -0,0 +1,29 @@
+import { findNodeDecs } from '../../pm-plugins/decorations-anchor';
+import { key } from '../../pm-plugins/main';
+/**
+ * Checks for plugin state for latest anchorName based on the position, returns
+ * provided anchorName if available
+ */
+export const refreshAnchorName = ({
+  getPos,
+  view,
+  anchorName
+}) => {
+  let newAnchorName = anchorName || '';
+  const pos = getPos();
+  if (anchorName || pos === undefined) {
+    return newAnchorName;
+  }
+  const node = view.state.doc.nodeAt(pos);
+  const state = key.getState(view.state);
+  if (state !== null && state !== void 0 && state.decorations) {
+    var _node$nodeSize;
+    const nodeDecs = findNodeDecs(state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
+    const nodeDec = nodeDecs.at(0);
+    if (!nodeDec) {
+      return newAnchorName;
+    }
+    newAnchorName = nodeDec.spec.anchorName;
+  }
+  return newAnchorName;
+};

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

@@ -86,6 +86,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';
+};
 
 /**
  *
@@ -381,11 +385,13 @@ export var 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/esm/pm-plugins/handle-mouse-down.js

@@ -0,0 +1,19 @@
+export var 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/esm/pm-plugins/main.js

@@ -21,6 +21,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';
@@ -721,6 +722,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           handleMouseOver(view, event, api);
           return false;
         },
+        mousedown: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? handleMouseDown(api) : undefined,
         keydown: function keydown(view, event) {
           if (isMultiSelectEnabled) {
             if (event.shiftKey && event.ctrlKey) {

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

@@ -78,69 +78,75 @@ export var memoizedTransformExpandToNestedExpand = memoizeOne(function (node) {
     return null;
   }
 });
+export var canCreateNodeWithContentInsideAnotherNode = function canCreateNodeWithContentInsideAnotherNode(nodeTypesToCreate, nodeWithTargetFragment) {
+  try {
+    return !!nodeTypesToCreate.every(function (nodeType) {
+      return nodeType.createChecked({}, nodeWithTargetFragment);
+    });
+  } catch (e) {
+    return false;
+  }
+};
 export 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 = fg('platform_editor_use_nested_table_pm_nodes') && 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' && 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')) {
-      var maybeExpandNodesArray = findChildrenByType(srcNode, expandNodeType);
-      var layoutColumnContainExpand = maybeExpandNodesArray.length > 0;
-      var 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) {
-        var nestingDepth = getParentOfTypeCount(tableNodeType)($destNodePos);
-        return isNestingTablesSupported && nestingDepth <= 1;
+    if (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 = 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 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 (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 = getParentOfTypeCount(tableNodeType)($destNodePos);
-    if (!isNestingTablesSupported || isNestingTablesSupported && _nestingDepth > 1) {
+  if ((destParentNodeType === 'tableCell' || destParentNodeType === 'tableHeader') && activeNodeType === 'table') {
+    var nestingDepth = 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/esm/ui/drag-handle.js

@@ -36,6 +36,7 @@ import { isHandleCorrelatedToSelection, selectNode } from '../pm-plugins/utils/g
 import { alignAnchorHeadInDirectionOfPos, expandSelectionHeadToNodeAtPos } from '../pm-plugins/utils/selection';
 import { BLOCK_MENU_ENABLED, DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, nodeMargins, spacingBetweenNodesForPreview, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
+import { refreshAnchorName } from './utils/anchor-name';
 var iconWrapperStyles = xcss({
   display: 'flex',
   justifyContent: 'center',
@@ -127,8 +128,9 @@ var dragHandleContainerStyles = xcss({
   boxSizing: 'border-box',
   zIndex: 'card'
 });
-var controlContainerStyles = xcss({
-  top: '0',
+var tooltipContainerStyles = xcss({
+  top: '8px',
+  bottom: '-8px',
   position: 'sticky',
   zIndex: 'card'
 });
@@ -515,7 +517,12 @@ export var 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 = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? 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' && fg('platform_editor_multi_body_extension_extensibility');
     var isBlockCard = nodeType === 'blockCard' && !!blockCardWidth;
@@ -537,18 +544,18 @@ export var DragHandle = function DragHandle(_ref) {
     var isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     var isSticky = shouldBeSticky(nodeType);
     if (supportsAnchor) {
-      var bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(anchorName, isSticky, isTopLevelNode, isLayoutColumn) : {};
+      var bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(safeAnchorName, isSticky, isTopLevelNode, isLayoutColumn) : {};
       return _objectSpread({
-        left: isEdgeCase ? "calc(anchor(".concat(anchorName, " start) + ").concat(getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : editorExperiment('advanced_layouts', true) && isLayoutColumn ? "calc((anchor(".concat(anchorName, " right) + anchor(").concat(anchorName, " left))/2 - ").concat(DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(anchorName, " start) - ").concat(DRAG_HANDLE_WIDTH, "px - ").concat(dragHandleGap(nodeType, parentNodeType), "px)"),
-        top: editorExperiment('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(anchorName, " top) - ").concat(DRAG_HANDLE_WIDTH, "px)") : "calc(anchor(".concat(anchorName, " start) + ").concat(topPositionAdjustment(nodeType), "px)")
+        left: isEdgeCase ? "calc(anchor(".concat(safeAnchorName, " start) + ").concat(getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : editorExperiment('advanced_layouts', true) && isLayoutColumn ? "calc((anchor(".concat(safeAnchorName, " right) + anchor(").concat(safeAnchorName, " left))/2 - ").concat(DRAG_HANDLE_HEIGHT / 2, "px)") : "calc(anchor(".concat(safeAnchorName, " start) - ").concat(DRAG_HANDLE_WIDTH, "px - ").concat(dragHandleGap(nodeType, parentNodeType), "px)"),
+        top: editorExperiment('advanced_layouts', true) && isLayoutColumn ? "calc(anchor(".concat(safeAnchorName, " top) - ").concat(DRAG_HANDLE_WIDTH, "px)") : "calc(anchor(".concat(safeAnchorName, " start) + ").concat(topPositionAdjustment(nodeType), "px)")
       }, bottom);
     }
-    var height = fg('platform_editor_controls_sticky_controls') ? getControlHeightCSSValue(getNodeHeight(dom, anchorName, anchorRectCache) || 0, isSticky, isTopLevelNode, "".concat(DRAG_HANDLE_HEIGHT), isLayoutColumn) : {};
+    var height = fg('platform_editor_controls_sticky_controls') ? getControlHeightCSSValue(getNodeHeight(dom, safeAnchorName, anchorRectCache) || 0, isSticky, isTopLevelNode, "".concat(DRAG_HANDLE_HEIGHT), isLayoutColumn) : {};
     return _objectSpread({
       left: isEdgeCase ? "calc(".concat((dom === null || dom === void 0 ? void 0 : dom.offsetLeft) || 0, "px + ").concat(getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType), ")") : getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType),
       top: 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 = useState({
       display: 'none'
     }),
@@ -725,7 +732,7 @@ export var DragHandle = function DragHandle(_ref) {
       as: "span",
       testId: "block-ctrl-drag-handle-container"
     }, jsx(Box, {
-      xcss: [controlContainerStyles],
+      xcss: [tooltipContainerStyles],
       as: "span"
     }, jsx(Tooltip, {
       content: jsx(TooltipContentWithMultipleShortcuts, {
@@ -750,7 +757,7 @@ export var DragHandle = function DragHandle(_ref) {
       as: "span",
       testId: "block-ctrl-drag-handle-container"
     }, jsx(Box, {
-      xcss: [controlContainerStyles],
+      xcss: [tooltipContainerStyles],
       as: "span"
     }, renderButton()));
   };

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

@@ -16,6 +16,7 @@ import Tooltip from '@atlaskit/tooltip';
 import { getControlBottomCSSValue, getControlHeightCSSValue, getNodeHeight, getTopPosition, shouldBeSticky } from '../pm-plugins/utils/drag-handle-positions';
 import { getLeftPositionForRootElement } from '../pm-plugins/utils/widget-positions';
 import { rootElementGap, topPositionAdjustment, QUICK_INSERT_DIMENSIONS, QUICK_INSERT_LEFT_OFFSET } from './consts';
+import { refreshAnchorName } from './utils/anchor-name';
 import { isInTextSelection, isNestedNodeSelected, isNonEditableBlock, isSelectionInNode } from './utils/document-checks';
 import { createNewLine } from './utils/editor-commands';
 var TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
@@ -84,7 +85,8 @@ var disabledContainerStyles = xcss({
   cursor: 'not-allowed'
 });
 var tooltipContainerStyles = xcss({
-  top: '0',
+  top: '8px',
+  bottom: '-8px',
   position: 'sticky',
   zIndex: 'card'
 });
@@ -117,7 +119,12 @@ export var 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 = 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 = fg('platform_editor_controls_patch_2') ? 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';
@@ -138,24 +145,24 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
     }
     var isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     var isSticky = shouldBeSticky(rootNodeType);
-    var bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(rootAnchorName || anchorName, isSticky, true) : {};
+    var bottom = fg('platform_editor_controls_sticky_controls') ? getControlBottomCSSValue(safeAnchorName || anchorName, isSticky, true) : {};
     if (supportsAnchor) {
       return _objectSpread({
-        left: isEdgeCase ? "calc(anchor(".concat(rootAnchorName, " start) + ").concat(getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(QUICK_INSERT_LEFT_OFFSET, "px)") : "calc(anchor(".concat(rootAnchorName, " start) - ").concat(QUICK_INSERT_DIMENSIONS.width, "px - ").concat(rootElementGap(rootNodeType), "px + -").concat(QUICK_INSERT_LEFT_OFFSET, "px)"),
-        top: "calc(anchor(".concat(rootAnchorName, " start) + ").concat(topPositionAdjustment(rootNodeType), "px)")
+        left: isEdgeCase ? "calc(anchor(".concat(safeAnchorName, " start) + ").concat(getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(QUICK_INSERT_LEFT_OFFSET, "px)") : "calc(anchor(".concat(safeAnchorName, " start) - ").concat(QUICK_INSERT_DIMENSIONS.width, "px - ").concat(rootElementGap(rootNodeType), "px + -").concat(QUICK_INSERT_LEFT_OFFSET, "px)"),
+        top: "calc(anchor(".concat(safeAnchorName, " start) + ").concat(topPositionAdjustment(rootNodeType), "px)")
       }, bottom);
     }
 
     // expensive, calls offsetHeight, guard behind FG
     var nodeHeight =
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform_editor_controls_sticky_controls') && getNodeHeight(dom, rootAnchorName || anchorName, anchorRectCache) || 0;
+    fg('platform_editor_controls_sticky_controls') && getNodeHeight(dom, safeAnchorName || anchorName, anchorRectCache) || 0;
     var height = fg('platform_editor_controls_sticky_controls') ? 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(getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(QUICK_INSERT_LEFT_OFFSET, "px)") : "calc(".concat(getLeftPositionForRootElement(dom, rootNodeType, QUICK_INSERT_DIMENSIONS, innerContainer, isMacroInteractionUpdates), " + -").concat(QUICK_INSERT_LEFT_OFFSET, "px)"),
       top: getTopPosition(dom, rootNodeType)
     }, height);
-  }, [rootAnchorName, view.dom, rootNodeType, macroInteractionUpdates, anchorName, anchorRectCache]);
+  }, [rootAnchorName, getPos, view, rootNodeType, macroInteractionUpdates, anchorName, anchorRectCache]);
   useEffect(function () {
     var cleanUpTransitionListener;
     if (rootNodeType === 'extension' || rootNodeType === 'embedCard') {
@@ -229,7 +236,7 @@ export var 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 = useCallback(function () {
     var _api$typeAhead;

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

@@ -0,0 +1,28 @@
+import { findNodeDecs } from '../../pm-plugins/decorations-anchor';
+import { key } from '../../pm-plugins/main';
+/**
+ * Checks for plugin state for latest anchorName based on the position, returns
+ * provided anchorName if available
+ */
+export var 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 = key.getState(view.state);
+  if (state !== null && state !== void 0 && state.decorations) {
+    var _node$nodeSize;
+    var nodeDecs = 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/types/pm-plugins/handle-mouse-down.d.ts

@@ -0,0 +1,4 @@
+import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { BlockControlsPlugin } from '../blockControlsPluginType';
+export declare const handleMouseDown: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (view: EditorView, event: MouseEvent) => boolean;

package/dist/types/pm-plugins/utils/validation.d.ts

@@ -17,5 +17,6 @@ export declare const transformExpandToNestedExpand: (expandNode: PMNode) => PMNo
 export declare const transformFragmentExpandToNestedExpand: (fragment: Fragment) => Fragment | null;
 export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;
 export declare const memoizedTransformExpandToNestedExpand: import("memoize-one").MemoizedFn<(node: PMNode) => PMNode | null>;
+export declare const canCreateNodeWithContentInsideAnotherNode: (nodeTypesToCreate: NodeType[], nodeWithTargetFragment: Fragment) => boolean;
 export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;
 export declare function canMoveSliceToIndex(slice: Slice, sliceFromPos: number, sliceToPos: number, destParent: PMNode, indexIntoParent: number, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;

package/dist/types/ui/utils/anchor-name.d.ts

@@ -0,0 +1,12 @@
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
+type RefreshAnchorNameParams = {
+    getPos: () => number | undefined;
+    view: EditorView;
+    anchorName?: string;
+};
+/**
+ * Checks for plugin state for latest anchorName based on the position, returns
+ * provided anchorName if available
+ */
+export declare const refreshAnchorName: ({ getPos, view, anchorName }: RefreshAnchorNameParams) => string;
+export {};

package/dist/types-ts4.5/pm-plugins/handle-mouse-down.d.ts

@@ -0,0 +1,4 @@
+import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { BlockControlsPlugin } from '../blockControlsPluginType';
+export declare const handleMouseDown: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (view: EditorView, event: MouseEvent) => boolean;

package/dist/types-ts4.5/pm-plugins/utils/validation.d.ts

@@ -17,5 +17,6 @@ export declare const transformExpandToNestedExpand: (expandNode: PMNode) => PMNo
 export declare const transformFragmentExpandToNestedExpand: (fragment: Fragment) => Fragment | null;
 export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;
 export declare const memoizedTransformExpandToNestedExpand: import("memoize-one").MemoizedFn<(node: PMNode) => PMNode | null>;
+export declare const canCreateNodeWithContentInsideAnotherNode: (nodeTypesToCreate: NodeType[], nodeWithTargetFragment: Fragment) => boolean;
 export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;
 export declare function canMoveSliceToIndex(slice: Slice, sliceFromPos: number, sliceToPos: number, destParent: PMNode, indexIntoParent: number, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;

package/dist/types-ts4.5/ui/utils/anchor-name.d.ts

@@ -0,0 +1,12 @@
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
+type RefreshAnchorNameParams = {
+    getPos: () => number | undefined;
+    view: EditorView;
+    anchorName?: string;
+};
+/**
+ * Checks for plugin state for latest anchorName based on the position, returns
+ * provided anchorName if available
+ */
+export declare const refreshAnchorName: ({ getPos, view, anchorName }: RefreshAnchorNameParams) => string;
+export {};