@atlaskit/editor-plugin-block-controls 1.12.6 → 1.12.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.12.7
+
+### Patch Changes
+
+- [#136078](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136078)
+  [`09414d7233497`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/09414d7233497) -
+  ED-24507 Switch nested dnd FG to experiment and include padding changes"
+
 ## 1.12.6
 
 ### Patch Changes

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

@@ -12,6 +12,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("../consts");
 var _main = require("../pm-plugins/main");
 var _utils2 = require("../utils");
@@ -132,7 +133,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
       var size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
       var end = start + size;
       var mappedTo;
-      if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+      if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
         var _transformSourceSlice;
         var nodeCopy = tr.doc.slice(start, end, false); // cut the content
         var $to = tr.doc.resolve(to);

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

@@ -14,7 +14,6 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _reactIntlNext = require("react-intl-next");
 var _uuid = _interopRequireDefault(require("uuid"));
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _dragHandle = require("../ui/drag-handle");
 var _dropTarget = require("../ui/drop-target");
@@ -24,7 +23,7 @@ var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'lis
 var IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
 var getNestedDepth = function getNestedDepth() {
-  return (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? 100 : 0;
+  return (0, _experiments.editorExperiment)('nested-dnd', true) ? 100 : 0;
 };
 var createDropTargetDecoration = function createDropTargetDecoration(pos, dropTargetDec) {
   return _view.Decoration.widget(pos, function () {
@@ -51,7 +50,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     var depth = 0;
     // drop target dco at the end position
     var endPosDeco = null;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+    if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       depth = newState.doc.resolve(pos).depth;
       if (node.isInline || !parent) {
         prevNode = node;
@@ -91,7 +90,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     }
     decs.push(createDropTargetDecoration(pos, /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, {
       api: api,
-      id: (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? pos : index,
+      id: (0, _experiments.editorExperiment)('nested-dnd', true) ? pos : index,
       formatMessage: formatMessage,
       prevNode: prevNode,
       nextNode: node,
@@ -117,7 +116,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
    *
    */
   var lastPos = newState.doc.content.size;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+  if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
     decorationState.push({
       id: lastPos,
       pos: lastPos
@@ -133,7 +132,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     element.setAttribute('data-blocks-drop-target-container', 'true');
     _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, {
       api: api,
-      id: (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? lastPos : decorationState.length,
+      id: (0, _experiments.editorExperiment)('nested-dnd', true) ? lastPos : decorationState.length,
       formatMessage: formatMessage
     }), element);
     return element;
@@ -181,11 +180,11 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
     var shouldDescend = !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
     if ((0, _experiments.editorExperiment)('dnd-input-performance-optimisation', true, {
       exposure: true
-    }) || (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+    }) || (0, _experiments.editorExperiment)('nested-dnd', true)) {
       var handleId = ObjHash.getForNode(node);
       anchorName = "--node-anchor-".concat(node.type.name, "-").concat(handleId);
     }
-    if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+    if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       var _anchorName;
       // Doesn't descend into a node
       if (node.isInline) {
@@ -219,7 +218,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     element.style.display = 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
     element.setAttribute('data-blocks-drag-handle-container', 'true');
-    if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+    if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       unbind = (0, _bindEventListener.bind)(element, {
         type: 'mouseover',
         listener: function listener(e) {
@@ -247,7 +246,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     side: -1,
     id: 'drag-handle',
     destroy: function destroy() {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+      if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
         unbind && unbind();
       }
     }

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleMouseOver = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -30,7 +31,9 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     }
     var pos = view.posAtDOM(rootElement, 0, -1);
     var rootPos;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+    if ((0, _experiments.editorExperiment)('nested-dnd', true, {
+      exposure: true
+    })) {
       var _$rootPos$parent, _$rootPos$parent2, _$rootPos$nodeAfter;
       var $rootPos = view.state.doc.resolve(pos);
       var depth = $rootPos.depth;

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

@@ -115,14 +115,14 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           childCount = currentState.childCount;
         var isPerformanceFix = (0, _experiments.editorExperiment)('dnd-input-performance-optimisation', true, {
           exposure: true
-        }) || (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested');
+        }) || (0, _experiments.editorExperiment)('nested-dnd', true);
         var activeNodeWithNewNodeType = null;
         var meta = tr.getMeta(key);
-        var newChildCount = tr.docChanged && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? getDocChildrenCount(newState) : childCount;
+        var newChildCount = tr.docChanged && (0, _experiments.editorExperiment)('nested-dnd', true) ? getDocChildrenCount(newState) : childCount;
         // If tables or media are being resized, we want to hide the drag handle
         var resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
-        var nodeCountChanged = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
+        var nodeCountChanged = (0, _experiments.editorExperiment)('nested-dnd', true) ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
         var shouldRemoveHandle = !tr.getMeta('isRemote');
 
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
@@ -142,7 +142,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           var spec = _ref6.spec;
           return spec.id === 'drag-handle';
         });
-        var decsLength = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? decorations.find().filter(function (_ref7) {
+        var decsLength = (0, _experiments.editorExperiment)('nested-dnd', true) ? decorations.find().filter(function (_ref7) {
           var spec = _ref7.spec;
           return spec.type === 'node-decoration';
         }).length : decorations.find().filter(function (_ref8) {
@@ -150,7 +150,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           return spec.id !== 'drag-handle';
         }).length;
         var newNodeDecs;
-        if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+        if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
           // naive solution while we work on performance optimised approach under ED-24503
           newNodeDecs = (0, _decorations.nodeDecorations)(newState);
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newNodeDecs.length;
@@ -162,7 +162,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         }).length;
         var _getIntl = getIntl(),
           formatMessage = _getIntl.formatMessage;
-        if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+        if ((0, _experiments.editorExperiment)('nested-dnd', false)) {
           isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
         }
 
@@ -250,7 +250,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         var shouldUpdateDropTargets = (meta === null || meta === void 0 ? void 0 : meta.isDragging) || isDropTargetsMissing;
         var shouldMapDropTargets = !shouldUpdateDropTargets && tr.docChanged && isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) === false && !(meta !== null && meta !== void 0 && meta.nodeMoved);
         if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
-          if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+          if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
             var remainingDecs = decorations.find(undefined, undefined, function (spec) {
               return spec.type !== 'drop-target-decoration';
             });
@@ -291,7 +291,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         if (shouldMapDropTargets || tr.docChanged && !redrawDecorations) {
           decorations = decorations.map(tr.mapping, tr.doc);
         }
-        var isEmptyDoc = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
+        var isEmptyDoc = (0, _experiments.editorExperiment)('nested-dnd', true) ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
         var hasNodeDecoration = decorations.find().some(function (_ref12) {
           var spec = _ref12.spec;
           return spec.type === 'node-decoration';

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

@@ -19,6 +19,7 @@ var _dragHandler = _interopRequireDefault(require("@atlaskit/icon/glyph/drag-han
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _main = require("../pm-plugins/main");
 var _utils = require("../utils");
@@ -254,7 +255,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
   var macroInteractionUpdates = featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates;
   var calculatePosition = (0, _react.useCallback)(function () {
     var parentNodeType;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+    if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       var pos = getPos();
       var $pos = pos && view.state.doc.resolve(pos);
       var parentPos = $pos && $pos.depth ? $pos.before() : undefined;

package/dist/cjs/ui/global-styles.js

@@ -8,6 +8,7 @@ exports.GlobalStylesWrapper = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("./consts");
 /**
  * @jsxRuntime classic
@@ -130,6 +131,6 @@ var getTextNodeStyle = function getTextNodeStyle() {
 };
 var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWrapper() {
   return (0, _react.jsx)(_react.Global, {
-    styles: [globalStyles, (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? extendedHoverZoneNested : extendedHoverZone, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
+    styles: [globalStyles, (0, _experiments.editorExperiment)('nested-dnd', true) ? extendedHoverZoneNested : extendedHoverZone, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
   });
 };

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

@@ -4,6 +4,7 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 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 { selectNode } from '../utils';
@@ -126,7 +127,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   const size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
   const end = start + size;
   let mappedTo;
-  if (fg('platform_editor_elements_dnd_nested')) {
+  if (editorExperiment('nested-dnd', true)) {
     var _transformSourceSlice;
     const nodeCopy = tr.doc.slice(start, end, false); // cut the content
     const $to = tr.doc.resolve(to);

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

@@ -5,7 +5,6 @@ import ReactDOM from 'react-dom';
 import { RawIntlProvider } from 'react-intl-next';
 import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle } from '../ui/drag-handle';
 import { DropTarget } from '../ui/drop-target';
@@ -14,7 +13,7 @@ import { canMoveNodeToIndex } from '../utils/validation';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
 const IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
 const PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
-const getNestedDepth = () => fg('platform_editor_elements_dnd_nested') ? 100 : 0;
+const getNestedDepth = () => editorExperiment('nested-dnd', true) ? 100 : 0;
 const createDropTargetDecoration = (pos, dropTargetDec) => {
   return Decoration.widget(pos, () => {
     const element = document.createElement('div');
@@ -40,7 +39,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, activeNode)
     let depth = 0;
     // drop target dco at the end position
     let endPosDeco = null;
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       depth = newState.doc.resolve(pos).depth;
       if (node.isInline || !parent) {
         prevNode = node;
@@ -80,7 +79,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, activeNode)
     }
     decs.push(createDropTargetDecoration(pos, /*#__PURE__*/createElement(DropTarget, {
       api,
-      id: fg('platform_editor_elements_dnd_nested') ? pos : index,
+      id: editorExperiment('nested-dnd', true) ? pos : index,
       formatMessage,
       prevNode,
       nextNode: node,
@@ -106,7 +105,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, activeNode)
    *
    */
   const lastPos = newState.doc.content.size;
-  if (fg('platform_editor_elements_dnd_nested')) {
+  if (editorExperiment('nested-dnd', true)) {
     decorationState.push({
       id: lastPos,
       pos: lastPos
@@ -122,7 +121,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, activeNode)
     element.setAttribute('data-blocks-drop-target-container', 'true');
     ReactDOM.render( /*#__PURE__*/createElement(DropTarget, {
       api,
-      id: fg('platform_editor_elements_dnd_nested') ? lastPos : decorationState.length,
+      id: editorExperiment('nested-dnd', true) ? lastPos : decorationState.length,
       formatMessage
     }), element);
     return element;
@@ -163,11 +162,11 @@ export const nodeDecorations = newState => {
     const shouldDescend = !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
     if (editorExperiment('dnd-input-performance-optimisation', true, {
       exposure: true
-    }) || fg('platform_editor_elements_dnd_nested')) {
+    }) || editorExperiment('nested-dnd', true)) {
       const handleId = ObjHash.getForNode(node);
       anchorName = `--node-anchor-${node.type.name}-${handleId}`;
     }
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       var _anchorName;
       // Doesn't descend into a node
       if (node.isInline) {
@@ -204,7 +203,7 @@ export const dragHandleDecoration = (api, getIntl, pos, anchorName, nodeType, ha
     element.style.display = 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
     element.setAttribute('data-blocks-drag-handle-container', 'true');
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       unbind = bind(element, {
         type: 'mouseover',
         listener: e => {
@@ -232,7 +231,7 @@ export const dragHandleDecoration = (api, getIntl, pos, anchorName, nodeType, ha
     side: -1,
     id: 'drag-handle',
     destroy: () => {
-      if (fg('platform_editor_elements_dnd_nested')) {
+      if (editorExperiment('nested-dnd', true)) {
         unbind && unbind();
       }
     }

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

@@ -1,4 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const handleMouseOver = (view, event, api) => {
   var _api$blockControls;
   const {
@@ -25,7 +26,9 @@ export const handleMouseOver = (view, event, api) => {
     }
     const pos = view.posAtDOM(rootElement, 0, -1);
     let rootPos;
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true, {
+      exposure: true
+    })) {
       var _$rootPos$parent, _$rootPos$parent2, _$rootPos$nodeAfter;
       const $rootPos = view.state.doc.resolve(pos);
       const depth = $rootPos.depth;

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

@@ -111,14 +111,14 @@ export const createPlugin = (api, getIntl) => {
         } = currentState;
         const isPerformanceFix = editorExperiment('dnd-input-performance-optimisation', true, {
           exposure: true
-        }) || fg('platform_editor_elements_dnd_nested');
+        }) || editorExperiment('nested-dnd', true);
         let activeNodeWithNewNodeType = null;
         const meta = tr.getMeta(key);
-        const newChildCount = tr.docChanged && fg('platform_editor_elements_dnd_nested') ? getDocChildrenCount(newState) : childCount;
+        const newChildCount = tr.docChanged && editorExperiment('nested-dnd', true) ? getDocChildrenCount(newState) : childCount;
         // If tables or media are being resized, we want to hide the drag handle
         const resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
-        const nodeCountChanged = fg('platform_editor_elements_dnd_nested') ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
+        const nodeCountChanged = editorExperiment('nested-dnd', true) ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
         const shouldRemoveHandle = !tr.getMeta('isRemote');
 
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
@@ -136,13 +136,13 @@ export const createPlugin = (api, getIntl) => {
         const isHandleMissing = !(meta !== null && meta !== void 0 && meta.activeNode) && !decorations.find().some(({
           spec
         }) => spec.id === 'drag-handle');
-        const decsLength = fg('platform_editor_elements_dnd_nested') ? decorations.find().filter(({
+        const decsLength = editorExperiment('nested-dnd', true) ? decorations.find().filter(({
           spec
         }) => spec.type === 'node-decoration').length : decorations.find().filter(({
           spec
         }) => spec.id !== 'drag-handle').length;
         let newNodeDecs;
-        if (fg('platform_editor_elements_dnd_nested')) {
+        if (editorExperiment('nested-dnd', true)) {
           // naive solution while we work on performance optimised approach under ED-24503
           newNodeDecs = nodeDecorations(newState);
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newNodeDecs.length;
@@ -153,7 +153,7 @@ export const createPlugin = (api, getIntl) => {
         const {
           formatMessage
         } = getIntl();
-        if (!fg('platform_editor_elements_dnd_nested')) {
+        if (editorExperiment('nested-dnd', false)) {
           isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
         }
 
@@ -231,7 +231,7 @@ export const createPlugin = (api, getIntl) => {
         const shouldUpdateDropTargets = (meta === null || meta === void 0 ? void 0 : meta.isDragging) || isDropTargetsMissing;
         const shouldMapDropTargets = !shouldUpdateDropTargets && tr.docChanged && isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) === false && !(meta !== null && meta !== void 0 && meta.nodeMoved);
         if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
-          if (fg('platform_editor_elements_dnd_nested')) {
+          if (editorExperiment('nested-dnd', true)) {
             const remainingDecs = decorations.find(undefined, undefined, spec => spec.type !== 'drop-target-decoration');
             decorations = DecorationSet.create(newState.doc, remainingDecs);
           } else {
@@ -270,7 +270,7 @@ export const createPlugin = (api, getIntl) => {
         if (shouldMapDropTargets || tr.docChanged && !redrawDecorations) {
           decorations = decorations.map(tr.mapping, tr.doc);
         }
-        const isEmptyDoc = fg('platform_editor_elements_dnd_nested') ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
+        const isEmptyDoc = editorExperiment('nested-dnd', true) ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
         const hasNodeDecoration = decorations.find().some(({
           spec
         }) => spec.type === 'node-decoration');

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

@@ -16,6 +16,7 @@ import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
 import { selectNode } from '../utils';
@@ -242,7 +243,7 @@ const DragHandleInternal = ({
   const macroInteractionUpdates = featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates;
   const calculatePosition = useCallback(() => {
     let parentNodeType;
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       const pos = getPos();
       const $pos = pos && view.state.doc.resolve(pos);
       const parentPos = $pos && $pos.depth ? $pos.before() : undefined;

package/dist/es2019/ui/global-styles.js

@@ -5,6 +5,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DRAG_HANDLE_MAX_WIDTH_PLUS_GAP } from './consts';
 const extendedHoverZone = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -134,6 +135,6 @@ const getTextNodeStyle = () => {
 };
 export const GlobalStylesWrapper = () => {
   return jsx(Global, {
-    styles: [globalStyles, fg('platform_editor_elements_dnd_nested') ? extendedHoverZoneNested : extendedHoverZone, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
+    styles: [globalStyles, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested : extendedHoverZone, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
   });
 };

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

@@ -7,6 +7,7 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 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 { selectNode } from '../utils';
@@ -126,7 +127,7 @@ export var moveNode = function moveNode(api) {
       var size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
       var end = start + size;
       var mappedTo;
-      if (fg('platform_editor_elements_dnd_nested')) {
+      if (editorExperiment('nested-dnd', true)) {
         var _transformSourceSlice;
         var nodeCopy = tr.doc.slice(start, end, false); // cut the content
         var $to = tr.doc.resolve(to);

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

@@ -7,7 +7,6 @@ import ReactDOM from 'react-dom';
 import { RawIntlProvider } from 'react-intl-next';
 import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle } from '../ui/drag-handle';
 import { DropTarget } from '../ui/drop-target';
@@ -17,7 +16,7 @@ var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'lis
 var IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
 var getNestedDepth = function getNestedDepth() {
-  return fg('platform_editor_elements_dnd_nested') ? 100 : 0;
+  return editorExperiment('nested-dnd', true) ? 100 : 0;
 };
 var createDropTargetDecoration = function createDropTargetDecoration(pos, dropTargetDec) {
   return Decoration.widget(pos, function () {
@@ -44,7 +43,7 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
     var depth = 0;
     // drop target dco at the end position
     var endPosDeco = null;
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       depth = newState.doc.resolve(pos).depth;
       if (node.isInline || !parent) {
         prevNode = node;
@@ -84,7 +83,7 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
     }
     decs.push(createDropTargetDecoration(pos, /*#__PURE__*/createElement(DropTarget, {
       api: api,
-      id: fg('platform_editor_elements_dnd_nested') ? pos : index,
+      id: editorExperiment('nested-dnd', true) ? pos : index,
       formatMessage: formatMessage,
       prevNode: prevNode,
       nextNode: node,
@@ -110,7 +109,7 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
    *
    */
   var lastPos = newState.doc.content.size;
-  if (fg('platform_editor_elements_dnd_nested')) {
+  if (editorExperiment('nested-dnd', true)) {
     decorationState.push({
       id: lastPos,
       pos: lastPos
@@ -126,7 +125,7 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
     element.setAttribute('data-blocks-drop-target-container', 'true');
     ReactDOM.render( /*#__PURE__*/createElement(DropTarget, {
       api: api,
-      id: fg('platform_editor_elements_dnd_nested') ? lastPos : decorationState.length,
+      id: editorExperiment('nested-dnd', true) ? lastPos : decorationState.length,
       formatMessage: formatMessage
     }), element);
     return element;
@@ -174,11 +173,11 @@ export var nodeDecorations = function nodeDecorations(newState) {
     var shouldDescend = !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
     if (editorExperiment('dnd-input-performance-optimisation', true, {
       exposure: true
-    }) || fg('platform_editor_elements_dnd_nested')) {
+    }) || editorExperiment('nested-dnd', true)) {
       var handleId = ObjHash.getForNode(node);
       anchorName = "--node-anchor-".concat(node.type.name, "-").concat(handleId);
     }
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       var _anchorName;
       // Doesn't descend into a node
       if (node.isInline) {
@@ -212,7 +211,7 @@ export var dragHandleDecoration = function dragHandleDecoration(api, getIntl, po
     element.style.display = 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
     element.setAttribute('data-blocks-drag-handle-container', 'true');
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       unbind = bind(element, {
         type: 'mouseover',
         listener: function listener(e) {
@@ -240,7 +239,7 @@ export var dragHandleDecoration = function dragHandleDecoration(api, getIntl, po
     side: -1,
     id: 'drag-handle',
     destroy: function destroy() {
-      if (fg('platform_editor_elements_dnd_nested')) {
+      if (editorExperiment('nested-dnd', true)) {
         unbind && unbind();
       }
     }

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

@@ -1,4 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -24,7 +25,9 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     }
     var pos = view.posAtDOM(rootElement, 0, -1);
     var rootPos;
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true, {
+      exposure: true
+    })) {
       var _$rootPos$parent, _$rootPos$parent2, _$rootPos$nodeAfter;
       var $rootPos = view.state.doc.resolve(pos);
       var depth = $rootPos.depth;

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

@@ -108,14 +108,14 @@ export var createPlugin = function createPlugin(api, getIntl) {
           childCount = currentState.childCount;
         var isPerformanceFix = editorExperiment('dnd-input-performance-optimisation', true, {
           exposure: true
-        }) || fg('platform_editor_elements_dnd_nested');
+        }) || editorExperiment('nested-dnd', true);
         var activeNodeWithNewNodeType = null;
         var meta = tr.getMeta(key);
-        var newChildCount = tr.docChanged && fg('platform_editor_elements_dnd_nested') ? getDocChildrenCount(newState) : childCount;
+        var newChildCount = tr.docChanged && editorExperiment('nested-dnd', true) ? getDocChildrenCount(newState) : childCount;
         // If tables or media are being resized, we want to hide the drag handle
         var resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
-        var nodeCountChanged = fg('platform_editor_elements_dnd_nested') ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
+        var nodeCountChanged = editorExperiment('nested-dnd', true) ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
         var shouldRemoveHandle = !tr.getMeta('isRemote');
 
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
@@ -135,7 +135,7 @@ export var createPlugin = function createPlugin(api, getIntl) {
           var spec = _ref6.spec;
           return spec.id === 'drag-handle';
         });
-        var decsLength = fg('platform_editor_elements_dnd_nested') ? decorations.find().filter(function (_ref7) {
+        var decsLength = editorExperiment('nested-dnd', true) ? decorations.find().filter(function (_ref7) {
           var spec = _ref7.spec;
           return spec.type === 'node-decoration';
         }).length : decorations.find().filter(function (_ref8) {
@@ -143,7 +143,7 @@ export var createPlugin = function createPlugin(api, getIntl) {
           return spec.id !== 'drag-handle';
         }).length;
         var newNodeDecs;
-        if (fg('platform_editor_elements_dnd_nested')) {
+        if (editorExperiment('nested-dnd', true)) {
           // naive solution while we work on performance optimised approach under ED-24503
           newNodeDecs = nodeDecorations(newState);
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newNodeDecs.length;
@@ -155,7 +155,7 @@ export var createPlugin = function createPlugin(api, getIntl) {
         }).length;
         var _getIntl = getIntl(),
           formatMessage = _getIntl.formatMessage;
-        if (!fg('platform_editor_elements_dnd_nested')) {
+        if (editorExperiment('nested-dnd', false)) {
           isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
         }
 
@@ -243,7 +243,7 @@ export var createPlugin = function createPlugin(api, getIntl) {
         var shouldUpdateDropTargets = (meta === null || meta === void 0 ? void 0 : meta.isDragging) || isDropTargetsMissing;
         var shouldMapDropTargets = !shouldUpdateDropTargets && tr.docChanged && isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) === false && !(meta !== null && meta !== void 0 && meta.nodeMoved);
         if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
-          if (fg('platform_editor_elements_dnd_nested')) {
+          if (editorExperiment('nested-dnd', true)) {
             var remainingDecs = decorations.find(undefined, undefined, function (spec) {
               return spec.type !== 'drop-target-decoration';
             });
@@ -284,7 +284,7 @@ export var createPlugin = function createPlugin(api, getIntl) {
         if (shouldMapDropTargets || tr.docChanged && !redrawDecorations) {
           decorations = decorations.map(tr.mapping, tr.doc);
         }
-        var isEmptyDoc = fg('platform_editor_elements_dnd_nested') ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
+        var isEmptyDoc = editorExperiment('nested-dnd', true) ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
         var hasNodeDecoration = decorations.find().some(function (_ref12) {
           var spec = _ref12.spec;
           return spec.type === 'node-decoration';

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

@@ -17,6 +17,7 @@ import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
 import { selectNode } from '../utils';
@@ -245,7 +246,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
   var macroInteractionUpdates = featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates;
   var calculatePosition = useCallback(function () {
     var parentNodeType;
-    if (fg('platform_editor_elements_dnd_nested')) {
+    if (editorExperiment('nested-dnd', true)) {
       var pos = getPos();
       var $pos = pos && view.state.doc.resolve(pos);
       var parentPos = $pos && $pos.depth ? $pos.before() : undefined;

package/dist/esm/ui/global-styles.js

@@ -6,6 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DRAG_HANDLE_MAX_WIDTH_PLUS_GAP } from './consts';
 var extendedHoverZone = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -122,6 +123,6 @@ var getTextNodeStyle = function getTextNodeStyle() {
 };
 export var GlobalStylesWrapper = function GlobalStylesWrapper() {
   return jsx(Global, {
-    styles: [globalStyles, fg('platform_editor_elements_dnd_nested') ? extendedHoverZoneNested : extendedHoverZone, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
+    styles: [globalStyles, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested : extendedHoverZone, getTextNodeStyle(), withDeleteLinesStyleFix, withMediaSingleStyleFix]
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "1.12.6",
+	"version": "1.12.7",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -8,9 +8,7 @@
 		"registry": "https://registry.npmjs.org/"
 	},
 	"atlassian": {
-		"team": "Editor: Jenga",
-		"inPublicMirror": false,
-		"releaseModel": "continuous"
+		"team": "Editor: Jenga"
 	},
 	"repository": "https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo",
 	"main": "dist/cjs/index.js",
@@ -31,7 +29,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^88.4.0",
+		"@atlaskit/editor-common": "^88.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -46,7 +44,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tmp-editor-statsig": "^1.3.0",
+		"@atlaskit/tmp-editor-statsig": "^1.4.0",
 		"@atlaskit/tokens": "^1.59.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
@@ -122,9 +120,6 @@
 		"platform_editor_element_drag_and_drop_ed_24227": {
 			"type": "boolean"
 		},
-		"platform_editor_elements_dnd_nested": {
-			"type": "boolean"
-		},
 		"platform_editor_element_drag_and_drop_ed_24304": {
 			"type": "boolean"
 		},