@atlaskit/editor-plugin-block-controls 2.13.28 → 2.13.30

package/dist/es2019/{commands → editor-commands}/move-node.js

@@ -9,12 +9,12 @@ import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { DIRECTION } from '../consts';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition, selectNode } from '../utils';
-import { setCursorPositionAtMovedNode } from '../utils/getSelection';
-import { removeFromSource } from '../utils/remove-from-source';
-import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../utils/validation';
+import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
+import { DIRECTION } from '../pm-plugins/utils/consts';
+import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
+import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
+import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
 
 /**
  * This function transforms the slice to move

package/dist/es2019/{commands → editor-commands}/move-to-layout.js

@@ -1,10 +1,10 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { maxLayoutColumnSupported } from '../consts';
+import { maxLayoutColumnSupported } from '../pm-plugins/utils/consts';
+import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
+import { updateColumnWidths } from '../pm-plugins/utils/update-column-widths';
+import { isInSameLayout } from '../pm-plugins/utils/validation';
 import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../ui/consts';
-import { removeFromSource } from '../utils/remove-from-source';
-import { updateColumnWidths } from '../utils/update-column-widths';
-import { isInSameLayout } from '../utils/validation';
 const createNewLayout = (schema, layoutContents) => {
   if (layoutContents.length === 0 || layoutContents.length > maxLayoutColumnSupported()) {
     return null;

package/dist/es2019/{commands → editor-commands}/show-drag-handle.js

@@ -2,7 +2,7 @@ import { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition } from '../utils';
+import { getNestedNodePosition } from '../pm-plugins/utils';
 export const showDragHandleAtSelection = (api, shouldFocusParentNode) => (state, _, view) => {
   const {
     $from

package/dist/es2019/index.js

@@ -1 +1 @@
-export { blockControlsPlugin } from './plugin';
+export { blockControlsPlugin } from './blockControlsPlugin';

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

@@ -1,7 +1,6 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { isPreRelease1, isPreRelease2 } from '../utils/advanced-layouts-flags';
 import { getNestedDepth, getNodeAnchor, TYPE_NODE_DEC } from './decorations-common';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
 const IGNORE_NODES_NEXT = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption'];
@@ -15,7 +14,7 @@ export const shouldDescendIntoNode = node => {
       return false;
     }
   }
-  if (isPreRelease1()) {
+  if (editorExperiment('advanced_layouts', true)) {
     return !IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT.includes(node.type.name);
   }
   return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
@@ -25,7 +24,7 @@ const shouldIgnoreNode = (node, ignore_nodes, depth, parent) => {
 
   // TODO use isWrappedMedia when clean up the feature flag
   const isMediaSingle = 'mediaSingle' === node.type.name && fg('platform_editor_element_dnd_nested_fix_patch_1');
-  const isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && isPreRelease1();
+  const isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && editorExperiment('advanced_layouts', true);
   if (isFirstTableRow) {
     return false;
   }
@@ -63,7 +62,7 @@ export const nodeDecorations = (newState, from, to) => {
   const decs = [];
   const docFrom = from === undefined || from < 0 ? 0 : from;
   const docTo = to === undefined || to > newState.doc.nodeSize - 2 ? newState.doc.nodeSize - 2 : to;
-  const ignore_nodes = isPreRelease2() ? IGNORE_NODES_NEXT : IGNORE_NODES;
+  const ignore_nodes = editorExperiment('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
   newState.doc.nodesBetween(docFrom, docTo, (node, pos, parent, index) => {
     let depth = 0;
     let anchorName;

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

@@ -5,15 +5,14 @@ import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { maxLayoutColumnSupported } from '../consts';
 import { nodeMargins } from '../ui/consts';
 import { DropTarget } from '../ui/drop-target';
 import { DropTargetLayout } from '../ui/drop-target-layout';
 import { DropTargetV2, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET } from '../ui/drop-target-v2';
-import { isPreRelease2 } from '../utils/advanced-layouts-flags';
-import { isBlocksDragTargetDebug } from '../utils/drag-target-debug';
-import { canMoveNodeToIndex, isInSameLayout } from '../utils/validation';
 import { getNestedDepth, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
+import { maxLayoutColumnSupported } from './utils/consts';
+import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
+import { canMoveNodeToIndex, isInSameLayout } from './utils/validation';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
 const PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
 const DISABLE_CHILD_DROP_TARGET = ['orderedList', 'bulletList'];
@@ -175,7 +174,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
     popNodeStack(depth);
     prevNodeStack.push(node);
   };
-  const isAdvancedLayoutsPreRelease2 = isPreRelease2();
+  const isAdvancedLayoutsPreRelease2 = editorExperiment('advanced_layouts', true);
   newState.doc.nodesBetween(docFrom, docTo, (node, pos, parent, index) => {
     let depth = 0;
     // drop target deco at the end position

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

@@ -1,6 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { isPreRelease1, isPreRelease2 } from '../utils/advanced-layouts-flags';
 const isEmptyNestedParagraphOrHeading = target => {
   if (target instanceof HTMLHeadingElement || target instanceof HTMLParagraphElement) {
     var _target$parentElement;
@@ -51,7 +50,7 @@ export const handleMouseOver = (view, event, api) => {
     if (editorExperiment('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
     }
-    if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && isPreRelease1()) {
+    if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && editorExperiment('advanced_layouts', true)) {
       rootElement = rootElement.closest('[data-drag-handler-anchor-name][data-drag-handler-node-type="mediaSingle"]');
       if (!rootElement) {
         return false;
@@ -95,7 +94,7 @@ export const handleMouseOver = (view, event, api) => {
       pos = view.posAtDOM(rootElement, 0);
     }
     const node = view.state.doc.nodeAt(pos);
-    if (isPreRelease2() && node && isLayoutColumnWithoutContent(node)) {
+    if (editorExperiment('advanced_layouts', true) && node && isLayoutColumnWithoutContent(node)) {
       // Don't show drag handle when there is no content/only placeholder in layout column
       return false;
     }

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

@@ -2,9 +2,9 @@ import { bindKeymapWithCommand, dragToMoveDown, dragToMoveLeft, dragToMoveRight,
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { moveNodeViaShortcut } from '../commands/move-node';
-import { showDragHandleAtSelection } from '../commands/show-drag-handle';
-import { DIRECTION } from '../consts';
+import { moveNodeViaShortcut } from '../editor-commands/move-node';
+import { showDragHandleAtSelection } from '../editor-commands/show-drag-handle';
+import { DIRECTION } from './utils/consts';
 function keymapList(api, formatMessage) {
   let keymapList = {};
   if (api && fg('platform_editor_element_drag_and_drop_ed_23873')) {

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

@@ -11,16 +11,15 @@ import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-sc
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { defaultActiveAnchorTracker } from '../utils/active-anchor-tracker';
-import { isPreRelease2 } from '../utils/advanced-layouts-flags';
-import { AnchorRectCache, isAnchorSupported } from '../utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../utils/drag-target-debug';
-import { getTrMetadata } from '../utils/transactions';
 import { findNodeDecs, nodeDecorations } from './decorations-anchor';
 import { dragHandleDecoration, emptyParagraphNodeDecorations, findHandleDec } from './decorations-drag-handle';
 import { dropTargetDecorations, findDropTargetDecs } from './decorations-drop-target';
 import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
+import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
+import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
+import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
+import { getTrMetadata } from './utils/transactions';
 export const key = new PluginKey('blockControls');
 const isHTMLElement = element => {
   return element instanceof HTMLElement;
@@ -479,7 +478,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           return false;
         },
         dragenter(_view, event) {
-          if (isPreRelease2()) {
+          if (editorExperiment('advanced_layouts', true)) {
             if (isHTMLElement(event.target)) {
               const closestParentElement = event.target.closest('[data-drag-handler-anchor-depth="0"]');
               if (closestParentElement) {
@@ -493,7 +492,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
         },
         dragstart(view) {
           var _anchorRectCache;
-          if (isPreRelease2()) {
+          if (editorExperiment('advanced_layouts', true)) {
             defaultActiveAnchorTracker.reset();
           }
           (_anchorRectCache = anchorRectCache) === null || _anchorRectCache === void 0 ? void 0 : _anchorRectCache.setEditorView(view);

package/dist/es2019/{utils → pm-plugins/utils}/active-anchor-tracker.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { EventEmitter } from 'events';
 import { useCallback, useEffect, useState } from 'react';
-import { isPreRelease2 } from './advanced-layouts-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export class ActiveAnchorTracker {
   constructor() {
     _defineProperty(this, "lastActiveAnchor", '');
@@ -44,7 +44,7 @@ export const useActiveAnchorTracker = (anchorName, activeAnchorTracker = default
     setIsActive(eventIsActive);
   };
   useEffect(() => {
-    if (activeAnchorTracker && anchorName && isPreRelease2()) {
+    if (activeAnchorTracker && anchorName && editorExperiment('advanced_layouts', true)) {
       activeAnchorTracker.subscribe(anchorName, onActive);
       const unsubscribe = () => {
         activeAnchorTracker.unsubscribe(anchorName, onActive);

package/dist/es2019/{consts.js → pm-plugins/utils/consts.js}

@@ -1,4 +1,4 @@
-import { isPreRelease2 } from './utils/advanced-layouts-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export let DIRECTION = /*#__PURE__*/function (DIRECTION) {
   DIRECTION["UP"] = "up";
   DIRECTION["DOWN"] = "down";
@@ -7,6 +7,6 @@ export let DIRECTION = /*#__PURE__*/function (DIRECTION) {
   return DIRECTION;
 }({});
 export const maxLayoutColumnSupported = () => {
-  return isPreRelease2() ? 5 : 3;
+  return editorExperiment('advanced_layouts', true) ? 5 : 3;
 };
 export const MIN_LAYOUT_COLUMN = 2;

package/dist/es2019/{utils → pm-plugins/utils}/drag-handle-positions.js

@@ -1,4 +1,4 @@
-import { DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, DRAG_HANDLE_H3_TOP_ADJUSTMENT, DRAG_HANDLE_H4_TOP_ADJUSTMENT, DRAG_HANDLE_H5_TOP_ADJUSTMENT, DRAG_HANDLE_H6_TOP_ADJUSTMENT, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, dragHandleGap } from '../ui/consts';
+import { DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, DRAG_HANDLE_H3_TOP_ADJUSTMENT, DRAG_HANDLE_H4_TOP_ADJUSTMENT, DRAG_HANDLE_H5_TOP_ADJUSTMENT, DRAG_HANDLE_H6_TOP_ADJUSTMENT, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, dragHandleGap } from '../../ui/consts';
 export const getTopPosition = (dom, type) => {
   if (!dom) {
     return 'auto';

package/dist/es2019/{utils → pm-plugins/utils}/inline-drop-target.js

@@ -1,23 +1,23 @@
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
-import { maxLayoutColumnSupported } from '../consts';
-import { isPreRelease1, isPreRelease2 } from './advanced-layouts-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isWrappedMedia } from './check-media-layout';
+import { maxLayoutColumnSupported } from './consts';
 export const shouldAllowInlineDropTarget = (isNested, node,
 /**
  * Is the active node in the same layout as the target node
  */
 isSameLayout = false, activeNode) => {
-  if (!isPreRelease1() || isNested) {
+  if (editorExperiment('advanced_layouts', false) || isNested) {
     return false;
   }
   if (isWrappedMedia(node)) {
     return false;
   }
-  if (isPreRelease2() && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
     return false;
   }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
-    return node.childCount < maxLayoutColumnSupported() || isPreRelease2() && isSameLayout;
+    return node.childCount < maxLayoutColumnSupported() || isSameLayout;
   }
   return !isEmptyParagraph(node);
 };

package/dist/es2019/{utils → pm-plugins/utils}/remove-from-source.js

@@ -1,4 +1,4 @@
-import { MIN_LAYOUT_COLUMN } from '../consts';
+import { MIN_LAYOUT_COLUMN } from './consts';
 import { updateColumnWidths } from './update-column-widths';
 export const removeFromSource = (tr, $from) => {
   const sourceNode = $from.nodeAfter;

package/dist/es2019/{utils → pm-plugins/utils}/update-column-widths.js

@@ -1,4 +1,4 @@
-import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../ui/consts';
+import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../../ui/consts';
 export const updateColumnWidths = (tr, layoutNode, layoutNodePos, childCount) => {
   const newColumnWidth = DEFAULT_COLUMN_DISTRIBUTIONS[childCount];
   if (newColumnWidth) {

package/dist/es2019/{utils → pm-plugins/utils}/validation.js

@@ -1,7 +1,6 @@
 import memoizeOne from 'memoize-one';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { isPreRelease2 } from '../utils/advanced-layouts-flags';
 export const isInsideTable = nodeType => {
   const {
     tableCell,
@@ -75,7 +74,7 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNod
   let srcNodeType = srcNode.type;
   const parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
   const activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
-  if (isPreRelease2() && activeNodeType === 'layoutColumn') {
+  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') {
       return true;

package/dist/es2019/ui/consts.js

@@ -1,5 +1,5 @@
 import { akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const DRAG_HANDLE_HEIGHT = 24;
 export const DRAG_HANDLE_WIDTH = 12;
 export const DRAG_HANDLE_BORDER_RADIUS = 4;
@@ -18,7 +18,7 @@ export const dragHandleGap = (nodeType, parentNodeType) => {
   if (parentNodeType && parentNodeType !== 'doc') {
     return DRAG_HANDLE_NARROW_GAP;
   }
-  if (nodeType === 'layoutSection' && fg('platform_editor_advanced_layouts_breakout_resizing')) {
+  if (nodeType === 'layoutSection' && editorExperiment('advanced_layouts', true)) {
     return DRAG_HANDLE_MAX_GAP + 12;
   }
   if (nodeTypeExcludeList.includes(nodeType)) {
@@ -46,7 +46,7 @@ export const getNestedNodeLeftPaddingMargin = nodeType => {
   }
 };
 export const topPositionAdjustment = nodeType => {
-  if (fg('platform_editor_advanced_layouts_breakout_resizing')) {
+  if (editorExperiment('advanced_layouts', true)) {
     switch (nodeType) {
       case 'rule':
         return -DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT;

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

@@ -18,9 +18,8 @@ import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/el
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition, selectNode } from '../utils';
-import { isPreRelease2 } from '../utils/advanced-layouts-flags';
-import { getLeftPosition, getTopPosition } from '../utils/drag-handle-positions';
+import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
+import { getLeftPosition, getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
 import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
 const dragHandleButtonStyles = css({
@@ -130,7 +129,7 @@ export const DragHandle = ({
   // but ensures the preview is generated correctly.
   const handleMouseDown = useCallback(() => {
     var _api$core3;
-    if (!(isLayoutColumn && isPreRelease2()) && fg('platform_editor_element_drag_and_drop_ed_24885')) {
+    if (!(isLayoutColumn && editorExperiment('advanced_layouts', true)) && fg('platform_editor_element_drag_and_drop_ed_24885')) {
       return undefined;
     }
     api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
@@ -145,7 +144,7 @@ export const DragHandle = ({
         return tr;
       }
       let selection;
-      if (isLayoutColumn && isPreRelease2()) {
+      if (isLayoutColumn && editorExperiment('advanced_layouts', true)) {
         selection = new NodeSelection(tr.doc.resolve(startPos));
       } else {
         const $startPos = tr.doc.resolve(startPos + node.nodeSize);
@@ -278,8 +277,8 @@ export const DragHandle = ({
     const isEdgeCase = (hasResizer || isExtension || isEmbedCard || isBlockCard) && innerContainer;
     if (supportsAnchor) {
       return {
-        left: isEdgeCase ? `calc(anchor(${anchorName} start) + ${getLeftPosition(dom, nodeType, innerContainer, isMacroInteractionUpdates, parentNodeType)})` : isPreRelease2() && 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: isPreRelease2() && isLayoutColumn ? `calc(anchor(${anchorName} top) - ${DRAG_HANDLE_WIDTH}px)` : fg('platform_editor_elements_dnd_ed_23674') ? `calc(anchor(${anchorName} start) + ${topPositionAdjustment(nodeType)}px)` : anchorName.includes('table') ? `calc(anchor(${anchorName} start) + ${DRAG_HANDLE_HEIGHT}px)` : `anchor(${anchorName} start)`
+        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)` : fg('platform_editor_elements_dnd_ed_23674') ? `calc(anchor(${anchorName} start) + ${topPositionAdjustment(nodeType)}px)` : anchorName.includes('table') ? `calc(anchor(${anchorName} start) + ${DRAG_HANDLE_HEIGHT}px)` : `anchor(${anchorName} start)`
       };
     }
     return {
@@ -398,7 +397,7 @@ export const DragHandle = ({
   // eslint-disable-next-line @atlaskit/design-system/no-html-button
   jsx("button", {
     type: "button",
-    css: [dragHandleButtonStyles, isPreRelease2() && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
+    css: [dragHandleButtonStyles, editorExperiment('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && selectedStyles],
     ref: buttonRef
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,

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

@@ -11,9 +11,9 @@ import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indi
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
-import { useActiveAnchorTracker } from '../utils/active-anchor-tracker';
-import { isAnchorSupported } from '../utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../utils/drag-target-debug';
+import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
+import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
+import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 
 // 8px gap + 16px on left and right
 const DROP_TARGET_LAYOUT_DROP_ZONE_WIDTH = 40;

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

@@ -13,11 +13,10 @@ import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element
 import { layers } from '@atlaskit/theme/constants';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
-import { useActiveAnchorTracker } from '../utils/active-anchor-tracker';
-import { isPreRelease2 } from '../utils/advanced-layouts-flags';
-import { isAnchorSupported } from '../utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../utils/drag-target-debug';
-import { shouldAllowInlineDropTarget } from '../utils/inline-drop-target';
+import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
+import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
+import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
+import { shouldAllowInlineDropTarget } from '../pm-plugins/utils/inline-drop-target';
 import { getNestedNodeLeftPaddingMargin } from './consts';
 import { InlineDropTarget } from './inline-drop-target';
 const DEFAULT_DROP_INDICATOR_WIDTH = 760;
@@ -85,7 +84,7 @@ const HoverZone = ({
       return dropTargetForElements({
         element: ref.current,
         onDragEnter: () => {
-          if (!isNestedDropTarget && isPreRelease2()) {
+          if (!isNestedDropTarget && editorExperiment('advanced_layouts', true)) {
             setActiveAnchor();
           }
           onDragEnter();

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

@@ -12,7 +12,7 @@ import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indi
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { layers } from '@atlaskit/theme/constants';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { isBlocksDragTargetDebug } from '../utils/drag-target-debug';
+import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { dropTargetMarginMap, getNestedNodeLeftPaddingMargin, nodeMargins, spaceLookupMap } from './consts';
 const DEFAULT_DROP_INDICATOR_WIDTH = 760;
 const EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH = '--editor-block-controls-drop-indicator-width';
@@ -103,7 +103,7 @@ export const DropTarget = ({
       return;
     }
 
-    // This should be moved to platform/packages/editor/editor-plugin-block-controls/src/utils/validation.ts
+    // This should be moved to platform/packages/editor/editor-plugin-block-controls/src/pm-plugins/utils/validation.ts
     // Since we are moved to drop-target-v2
     // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
     if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {

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

@@ -12,11 +12,11 @@ import { akEditorBreakoutPadding } from '@atlaskit/editor-shared-styles';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
-import { useActiveAnchorTracker } from '../utils/active-anchor-tracker';
-import { showResponsiveLayout } from '../utils/advanced-layouts-flags';
-import { isAnchorSupported } from '../utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../utils/drag-target-debug';
+import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
+import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
+import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 const hoverZoneCommonStyle = css({
   position: 'absolute',
   // above the top and bottom drop zone as block hover zone
@@ -72,7 +72,6 @@ export const InlineDropTarget = ({
   }, [nextNode]);
   const [isActiveAnchor] = useActiveAnchorTracker(anchorName);
   const isLeftPosition = position === 'left';
-  const shouldShowResponsiveLayout = showResponsiveLayout();
   const nodeDimension = useMemo(() => {
     if (!nextNode) {
       return defaultNodeDimension;
@@ -113,7 +112,7 @@ export const InlineDropTarget = ({
 
     // Set the height target anchor name to the first or last column of the layout section so that it also works for stacked layout
     let heightTargetAnchorName = targetAnchorName;
-    if (shouldShowResponsiveLayout && nextNode.type.name === 'layoutSection' && nextNode.firstChild && nextNode.lastChild) {
+    if (editorExperiment('advanced_layouts', true) && nextNode.type.name === 'layoutSection' && nextNode.firstChild && nextNode.lastChild) {
       heightTargetAnchorName = isLeftPosition ? getNodeAnchor(nextNode.firstChild) : getNodeAnchor(nextNode.lastChild);
     }
     if (isAnchorSupported()) {
@@ -146,7 +145,7 @@ export const InlineDropTarget = ({
       };
     }
     return defaultNodeDimension;
-  }, [anchorName, anchorRectCache, nextNode, position, isLeftPosition, shouldShowResponsiveLayout]);
+  }, [anchorName, anchorRectCache, nextNode, position, isLeftPosition]);
   const onDrop = useCallback(() => {
     var _api$blockControls;
     const {
@@ -167,8 +166,8 @@ export const InlineDropTarget = ({
     }
   }, [api, getPos, position]);
   const inlineHoverZoneRectStyle = useMemo(() => {
-    const isLayoutNode = (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'layoutSection';
-    const layoutAdjustment = isLayoutNode && shouldShowResponsiveLayout ? {
+    const isLayoutNode = editorExperiment('advanced_layouts', true) && (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'layoutSection';
+    const layoutAdjustment = isLayoutNode ? {
       width: 11,
       height: 4,
       top: 6,
@@ -182,11 +181,11 @@ export const InlineDropTarget = ({
       top: `calc(anchor(top))`,
       width: nodeDimension.widthOffset ? `calc((100% - ${nodeDimension.width})/2 - ${GAP}px + ${nodeDimension.widthOffset} - ${(layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0}px)` : `calc((100% - ${nodeDimension.width})/2 - ${GAP}px - ${(layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0}px)`,
       height: `calc(${nodeDimension.height} + ${(layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0}px)`
-    }, isLayoutNode && shouldShowResponsiveLayout && {
+    }, isLayoutNode && {
       top: isLeftPosition ? `calc(${nodeDimension.top} + ${(layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0}px)` : 'unset',
       bottom: isLeftPosition ? 'unset' : `calc(${nodeDimension.bottom} - ${(layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0}px)`
     });
-  }, [anchorName, isLeftPosition, nodeDimension, nextNode, shouldShowResponsiveLayout]);
+  }, [nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name, anchorName, isLeftPosition, nodeDimension]);
   const dropIndicatorPos = useMemo(() => {
     return isLeftPosition ? 'right' : 'left';
   }, [isLeftPosition]);

package/dist/esm/{plugin.js → blockControlsPlugin.js}

@@ -1,11 +1,11 @@
 import React from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { moveNode } from './commands/move-node';
-import { moveToLayout } from './commands/move-to-layout';
+import { moveNode } from './editor-commands/move-node';
+import { moveToLayout } from './editor-commands/move-to-layout';
 import { createPlugin, key } from './pm-plugins/main';
+import { selectNode } from './pm-plugins/utils';
 import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
-import { selectNode } from './utils';
 export var blockControlsPlugin = function blockControlsPlugin(_ref) {
   var api = _ref.api;
   return {

package/dist/esm/{commands → editor-commands}/move-node.js

@@ -12,12 +12,12 @@ import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { DIRECTION } from '../consts';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition, selectNode } from '../utils';
-import { setCursorPositionAtMovedNode } from '../utils/getSelection';
-import { removeFromSource } from '../utils/remove-from-source';
-import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../utils/validation';
+import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
+import { DIRECTION } from '../pm-plugins/utils/consts';
+import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
+import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
+import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
 
 /**
  * This function transforms the slice to move

package/dist/esm/{commands → editor-commands}/move-to-layout.js

@@ -1,10 +1,10 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { maxLayoutColumnSupported } from '../consts';
+import { maxLayoutColumnSupported } from '../pm-plugins/utils/consts';
+import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
+import { updateColumnWidths } from '../pm-plugins/utils/update-column-widths';
+import { isInSameLayout } from '../pm-plugins/utils/validation';
 import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../ui/consts';
-import { removeFromSource } from '../utils/remove-from-source';
-import { updateColumnWidths } from '../utils/update-column-widths';
-import { isInSameLayout } from '../utils/validation';
 var createNewLayout = function createNewLayout(schema, layoutContents) {
   if (layoutContents.length === 0 || layoutContents.length > maxLayoutColumnSupported()) {
     return null;

package/dist/esm/{commands → editor-commands}/show-drag-handle.js

@@ -2,7 +2,7 @@ import { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition } from '../utils';
+import { getNestedNodePosition } from '../pm-plugins/utils';
 export var showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
   return function (state, _, view) {
     var $from = state.selection.$from;

package/dist/esm/index.js

@@ -1 +1 @@
-export { blockControlsPlugin } from './plugin';
+export { blockControlsPlugin } from './blockControlsPlugin';

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

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { isPreRelease1, isPreRelease2 } from '../utils/advanced-layouts-flags';
 import { getNestedDepth, getNodeAnchor, TYPE_NODE_DEC } from './decorations-common';
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
 var IGNORE_NODES_NEXT = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption'];
@@ -16,7 +15,7 @@ export var shouldDescendIntoNode = function shouldDescendIntoNode(node) {
       return false;
     }
   }
-  if (isPreRelease1()) {
+  if (editorExperiment('advanced_layouts', true)) {
     return !IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT.includes(node.type.name);
   }
   return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
@@ -26,7 +25,7 @@ var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, pare
 
   // TODO use isWrappedMedia when clean up the feature flag
   var isMediaSingle = 'mediaSingle' === node.type.name && fg('platform_editor_element_dnd_nested_fix_patch_1');
-  var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && isPreRelease1();
+  var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && editorExperiment('advanced_layouts', true);
   if (isFirstTableRow) {
     return false;
   }
@@ -66,7 +65,7 @@ export var nodeDecorations = function nodeDecorations(newState, from, to) {
   var decs = [];
   var docFrom = from === undefined || from < 0 ? 0 : from;
   var docTo = to === undefined || to > newState.doc.nodeSize - 2 ? newState.doc.nodeSize - 2 : to;
-  var ignore_nodes = isPreRelease2() ? IGNORE_NODES_NEXT : IGNORE_NODES;
+  var ignore_nodes = editorExperiment('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
   newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
     var _Decoration$node;
     var depth = 0;