@atlaskit/editor-plugin-block-controls 25.0.2 → 25.0.4

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 25.0.4
+
+### Patch Changes
+
+- [`0a81f6fa7cbf8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0a81f6fa7cbf8) -
+  Clean up experiment `platform_editor_breakout_resizing`. Behind the
+  `platform_editor_list_join_strip_breakout` experiment, strip the breakout mark from a code block
+  before nesting it into a list item when joining from a gap cursor. Behind the
+  `platform_editor_resizer_selector_jsdom_fix` experiment, make the panel and rule breakout resizer
+  selectors parseable by jsdom (`> *[data-prosemirror-node-name=…]`).
+- Updated dependencies
+
+## 25.0.3
+
+### Patch Changes
+
+- [`797af912eda84`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/797af912eda84) -
+  When experiment platform_editor_remove_legacy_perf_events is enabled, skip block drag and drop
+  perf measurements so blocksDragInit and the drag ended duration analytics events are no longer
+  fired
+- Updated dependencies
+
 ## 25.0.2
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-to-layout.js

@@ -10,7 +10,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _analytics2 = require("../pm-plugins/utils/analytics");
 var _checkFragment = require("../pm-plugins/utils/check-fragment");
 var _collapsedHeading = require("../pm-plugins/utils/collapsed-heading");
@@ -166,10 +165,8 @@ var removeBreakoutMarks = function removeBreakoutMarks(tr, $from, to) {
     breakout = _ref4.breakout;
   tr.doc.nodesBetween($from.pos, to, function (node, pos, parent) {
     // should never remove breakout from previous layoutSection
-    if ((0, _expValEquals.expValEquals)('platform_editor_breakout_resizing', 'isEnabled', true)) {
-      if (node.type.name === 'layoutSection') {
-        return false;
-      }
+    if (node.type.name === 'layoutSection') {
+      return false;
     }
 
     // breakout doesn't exist on nested nodes
@@ -186,28 +183,6 @@ var removeBreakoutMarks = function removeBreakoutMarks(tr, $from, to) {
   fromContentWithoutBreakout = tr.doc.slice($from.pos, to).content;
   return fromContentWithoutBreakout;
 };
-var getBreakoutMode = function getBreakoutMode(content, breakout) {
-  if (content instanceof _model.Node) {
-    var _content$marks$find;
-    return (_content$marks$find = content.marks.find(function (m) {
-      return m.type === breakout;
-    })) === null || _content$marks$find === void 0 ? void 0 : _content$marks$find.attrs.mode;
-  } else if (content instanceof _model.Fragment) {
-    // Find the first breakout mode in the fragment
-    var firstBreakoutMode;
-    for (var i = 0; i < content.childCount; i++) {
-      var child = content.child(i);
-      var breakoutMark = child.marks.find(function (m) {
-        return m.type === breakout;
-      });
-      if (breakoutMark) {
-        firstBreakoutMode = breakoutMark.attrs.mode;
-        break;
-      }
-    }
-    return firstBreakoutMode;
-  }
-};
 var getBreakoutModeAndWidth = function getBreakoutModeAndWidth(content, breakout) {
   var findBreakoutMark = function findBreakoutMark(node) {
     return node.marks.find(function (m) {
@@ -264,15 +239,9 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
 
       // get breakout mode from destination node,
       // if not found, get from source node,
-      var breakoutMode;
-      var breakoutWidth;
-      if ((0, _expValEquals.expValEquals)('platform_editor_breakout_resizing', 'isEnabled', true)) {
-        var _ref8 = getBreakoutModeAndWidth(toNode, breakout) || getBreakoutModeAndWidth(sourceContent, breakout) || {};
-        breakoutMode = _ref8.breakoutMode;
+      var _ref8 = getBreakoutModeAndWidth(toNode, breakout) || getBreakoutModeAndWidth(sourceContent, breakout) || {},
+        breakoutMode = _ref8.breakoutMode,
         breakoutWidth = _ref8.breakoutWidth;
-      } else {
-        breakoutMode = getBreakoutMode(toNode, breakout) || getBreakoutMode(sourceContent, breakout);
-      }
 
       // we don't want to remove marks when moving/re-ordering layoutSection
       var shouldRemoveMarks = $sourceFrom.node().type !== layoutSection;
@@ -320,16 +289,10 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           tr = (0, _removeFromSource.removeFromSource)(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
-          if ((0, _expValEquals.expValEquals)('platform_editor_breakout_resizing', 'isEnabled', true)) {
-            breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
-              mode: breakoutMode,
-              width: breakoutWidth
-            })]);
-          } else {
-            breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
-              mode: breakoutMode
-            })]);
-          }
+          breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
+            mode: breakoutMode,
+            width: breakoutWidth
+          })]);
           if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
             // layout created via drag and drop will always be 2 columns
             (0, _analytics2.fireInsertLayoutAnalytics)(tr, api, sourceNodeTypes, hasSelectedMultipleNodes, 2);

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

@@ -62,7 +62,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
   (0, _decorationsCommon.unmountDecorations)(nodeViewPortalProviderAPI, 'data-blocks-drag-handle-container', 'data-blocks-drag-handle-key');
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var key = (0, _uuid.v4)();
-  var widgetSpec = (0, _editorExperiment.editorExperiment)('platform_editor_breakout_resizing', true) ? {
+  var widgetSpec = {
     side: -1,
     type: _decorationsCommon.TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
@@ -73,12 +73,6 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
     marks: (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize])
-  } : {
-    side: -1,
-    type: _decorationsCommon.TYPE_HANDLE_DEC,
-    // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-    testid: "".concat(_decorationsCommon.TYPE_HANDLE_DEC, "-").concat((0, _uuid.v4)()),
-    marks: (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize])
   };
   return _view.Decoration.widget(pos, function (view, getPosUnsafe) {
     var element = document.createElement('span');

package/dist/cjs/pm-plugins/decorations-quick-insert-button.js

@@ -10,7 +10,6 @@ var _react = require("react");
 var _uuid = require("uuid");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _consts = require("../ui/consts");
 var _quickInsertButton = require("../ui/quick-insert-button");
 var _marks = require("./utils/marks");
@@ -52,7 +51,7 @@ var quickInsertButtonDecoration = exports.quickInsertButtonDecoration = function
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var key = (0, _uuid.v4)();
   var cleanupCallbacks = [];
-  var widgetSpec = (0, _editorExperiment.editorExperiment)('platform_editor_breakout_resizing', true) ? {
+  var widgetSpec = {
     side: -2,
     type: TYPE_QUICK_INSERT,
     /**
@@ -68,15 +67,6 @@ var quickInsertButtonDecoration = exports.quickInsertButtonDecoration = function
         cb();
       });
     }
-  } : {
-    side: -2,
-    type: TYPE_QUICK_INSERT,
-    destroy: function destroy(_) {
-      nodeViewPortalProviderAPI.remove(key);
-      cleanupCallbacks.forEach(function (cb) {
-        cb();
-      });
-    }
   };
   return _view.Decoration.widget(rootPos, function (view, getPos) {
     var element = document.createElement('span');

package/dist/cjs/pm-plugins/first-node-dec-plugin.js

@@ -8,18 +8,15 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var firstNodeDecPluginKey = exports.firstNodeDecPluginKey = new _state.PluginKey('firstNodeDec');
 var createFirstNodeDecSet = function createFirstNodeDecSet(state) {
   var firstNode = state.doc.firstChild;
   if (!firstNode) {
     return _view.DecorationSet.empty;
   }
-  var firstNodeDecoration = (0, _expValEquals.expValEquals)('platform_editor_breakout_resizing', 'isEnabled', true) ? _view.Decoration.node(0, firstNode.nodeSize, {
+  var firstNodeDecoration = _view.Decoration.node(0, firstNode.nodeSize, {
     style: 'margin-top: 0;',
     class: 'first-node-in-document'
-  }) : _view.Decoration.node(0, firstNode.nodeSize, {
-    style: 'margin-top: 0'
   });
   return _view.DecorationSet.create(state.doc, [firstNodeDecoration]);
 };

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

@@ -112,7 +112,8 @@ var destroyFn = function destroyFn(api, editorView) {
       if (isHTMLElement(scrollable)) {
         scrollable.style.setProperty('scroll-behavior', null);
       }
-      if ((0, _fg.fg)('platform_editor_drag_and_drop_perf_analytics')) {
+      var shouldMeasureDrop = (0, _fg.fg)('platform_editor_drag_and_drop_perf_analytics') && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_legacy_perf_events');
+      if (shouldMeasureDrop) {
         (0, _performanceMeasures.startMeasure)(EDITOR_BLOCKS_DROP_INIT);
       }
       if (!api) {
@@ -179,7 +180,7 @@ var destroyFn = function destroyFn(api, editorView) {
           lastDragCancelled: lastDragCancelled
         }));
       });
-      if ((0, _fg.fg)('platform_editor_drag_and_drop_perf_analytics')) {
+      if (shouldMeasureDrop) {
         // wait for the idle callback to ensure that the drag operation has completed
         scheduleCallback(function () {
           if ((0, _performanceMeasures.isMeasuring)(EDITOR_BLOCKS_DROP_INIT)) {
@@ -449,7 +450,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
 
   // Re-create node decorations
   var isDecSetEmpty = decorations === _view.DecorationSet.empty;
-  var isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged || (0, _editorExperiment.editorExperiment)('platform_editor_breakout_resizing', true) && hasJustFinishedResizing;
+  var isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged || hasJustFinishedResizing;
   var shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging)) &&
   // Skip expensive anchor node decoration recalculations when native anchor support is enabled
   !((0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_migration'));
@@ -1128,7 +1129,9 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           if (api !== null && api !== void 0 && (_api$limitedMode5 = api.limitedMode) !== null && _api$limitedMode5 !== void 0 && (_api$limitedMode5 = _api$limitedMode5.sharedState.currentState()) !== null && _api$limitedMode5 !== void 0 && _api$limitedMode5.enabled) {
             return;
           }
-          (0, _performanceMeasures.startMeasure)(EDITOR_BLOCKS_DRAG_INIT);
+          if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_legacy_perf_events')) {
+            (0, _performanceMeasures.startMeasure)(EDITOR_BLOCKS_DRAG_INIT);
+          }
           if (isAdvancedLayoutEnabled) {
             _activeAnchorTracker.defaultActiveAnchorTracker.reset();
           }

package/dist/cjs/ui/consts.js

@@ -70,7 +70,7 @@ var dragHandleGap = exports.dragHandleGap = function dragHandleGap(nodeType, par
   } else {
     breakoutResizableNodesList = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_resize_dividers_panels', 'isEnabled', true) ? [].concat((0, _toConsumableArray2.default)(_utils.breakoutResizableNodes), ['rule', 'panel']) : _utils.breakoutResizableNodes;
   }
-  if ((0, _editorExperiment.editorExperiment)('platform_editor_breakout_resizing', true) && breakoutResizableNodesList.includes(nodeType)) {
+  if (breakoutResizableNodesList.includes(nodeType)) {
     if (nodeType === 'layoutSection') {
       return DRAG_HANDLE_MAX_GAP + 20;
     } else {
@@ -94,7 +94,7 @@ var rootElementGap = exports.rootElementGap = function rootElementGap(nodeType)
   } else {
     breakoutResizableNodesList = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_resize_dividers_panels', 'isEnabled', true) ? [].concat((0, _toConsumableArray2.default)(_utils.breakoutResizableNodes), ['rule', 'panel']) : _utils.breakoutResizableNodes;
   }
-  if (nodeTypeExcludeList.includes(nodeType) || (0, _editorExperiment.editorExperiment)('platform_editor_breakout_resizing', true) && breakoutResizableNodesList.includes(nodeType)) {
+  if (nodeTypeExcludeList.includes(nodeType) || breakoutResizableNodesList.includes(nodeType)) {
     if (nodeType === 'layoutSection') {
       return DRAG_HANDLE_MAX_GAP + 20;
     } else {

package/dist/cjs/ui/use-block-controls-surface-drag-source.js

@@ -148,7 +148,9 @@ var useBlockControlsSurfaceDragSource = exports.useBlockControlsSurfaceDragSourc
         }
 
         // This handle is outside ProseMirror, so it owns the side effects normally started by PM.
-        (0, _performanceMeasures.startMeasure)(EDITOR_BLOCKS_DRAG_INIT);
+        if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_legacy_perf_events')) {
+          (0, _performanceMeasures.startMeasure)(EDITOR_BLOCKS_DRAG_INIT);
+        }
         _activeAnchorTracker.defaultActiveAnchorTracker.reset();
         api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref5) {
           var _api$blockControls$sh2, _resolvedMovingNode$n, _api$blockControls2, _api$analytics;

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

@@ -4,7 +4,6 @@ import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { attachMoveNodeAnalytics, fireInsertLayoutAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { containsNodeOfType, isFragmentOfType } from '../pm-plugins/utils/check-fragment';
 import { isCollapsedHeading } from '../pm-plugins/utils/collapsed-heading';
@@ -167,10 +166,8 @@ const removeBreakoutMarks = (tr, $from, to) => {
   } = tr.doc.type.schema.marks || {};
   tr.doc.nodesBetween($from.pos, to, (node, pos, parent) => {
     // should never remove breakout from previous layoutSection
-    if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
-      if (node.type.name === 'layoutSection') {
-        return false;
-      }
+    if (node.type.name === 'layoutSection') {
+      return false;
     }
 
     // breakout doesn't exist on nested nodes
@@ -185,24 +182,6 @@ const removeBreakoutMarks = (tr, $from, to) => {
   fromContentWithoutBreakout = tr.doc.slice($from.pos, to).content;
   return fromContentWithoutBreakout;
 };
-const getBreakoutMode = (content, breakout) => {
-  if (content instanceof PMNode) {
-    var _content$marks$find;
-    return (_content$marks$find = content.marks.find(m => m.type === breakout)) === null || _content$marks$find === void 0 ? void 0 : _content$marks$find.attrs.mode;
-  } else if (content instanceof Fragment) {
-    // Find the first breakout mode in the fragment
-    let firstBreakoutMode;
-    for (let i = 0; i < content.childCount; i++) {
-      const child = content.child(i);
-      const breakoutMark = child.marks.find(m => m.type === breakout);
-      if (breakoutMark) {
-        firstBreakoutMode = breakoutMark.attrs.mode;
-        break;
-      }
-    }
-    return firstBreakoutMode;
-  }
-};
 const getBreakoutModeAndWidth = (content, breakout) => {
   const findBreakoutMark = node => node.marks.find(m => m.type === breakout);
   const extractBreakoutAttributes = mark => mark ? {
@@ -256,16 +235,10 @@ export const moveToLayout = api => (from, to, options) => ({
 
   // get breakout mode from destination node,
   // if not found, get from source node,
-  let breakoutMode;
-  let breakoutWidth;
-  if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
-    ({
-      breakoutMode,
-      breakoutWidth
-    } = getBreakoutModeAndWidth(toNode, breakout) || getBreakoutModeAndWidth(sourceContent, breakout) || {});
-  } else {
-    breakoutMode = getBreakoutMode(toNode, breakout) || getBreakoutMode(sourceContent, breakout);
-  }
+  const {
+    breakoutMode,
+    breakoutWidth
+  } = getBreakoutModeAndWidth(toNode, breakout) || getBreakoutModeAndWidth(sourceContent, breakout) || {};
 
   // we don't want to remove marks when moving/re-ordering layoutSection
   const shouldRemoveMarks = $sourceFrom.node().type !== layoutSection;
@@ -313,16 +286,10 @@ export const moveToLayout = api => (from, to, options) => ({
       tr = removeFromSource(tr, $sourceFrom, sourceTo);
       const mappedTo = tr.mapping.map(to);
       tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
-      if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
-        breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
-          mode: breakoutMode,
-          width: breakoutWidth
-        })]);
-      } else {
-        breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
-          mode: breakoutMode
-        })]);
-      }
+      breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
+        mode: breakoutMode,
+        width: breakoutWidth
+      })]);
       if (fg('platform_editor_column_count_analytics')) {
         // layout created via drag and drop will always be 2 columns
         fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes, 2);

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

@@ -49,7 +49,7 @@ export const dragHandleDecoration = ({
   unmountDecorations(nodeViewPortalProviderAPI, 'data-blocks-drag-handle-container', 'data-blocks-drag-handle-key');
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   const key = uuid();
-  const widgetSpec = editorExperiment('platform_editor_breakout_resizing', true) ? {
+  const widgetSpec = {
     side: -1,
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
@@ -60,12 +60,6 @@ export const dragHandleDecoration = ({
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
     marks: getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize])
-  } : {
-    side: -1,
-    type: TYPE_HANDLE_DEC,
-    // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-    testid: `${TYPE_HANDLE_DEC}-${uuid()}`,
-    marks: getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize])
   };
   return Decoration.widget(pos, (view, getPosUnsafe) => {
     const element = document.createElement('span');

package/dist/es2019/pm-plugins/decorations-quick-insert-button.js

@@ -3,7 +3,6 @@ import { createElement } from 'react';
 import { v4 as uuid } from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { ACTIVE_QUICK_INSERT_ATTR } from '../ui/consts';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
 import { getMatchingBlockMarks } from './utils/marks';
@@ -38,7 +37,7 @@ export const quickInsertButtonDecoration = ({
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   const key = uuid();
   const cleanupCallbacks = [];
-  const widgetSpec = editorExperiment('platform_editor_breakout_resizing', true) ? {
+  const widgetSpec = {
     side: -2,
     type: TYPE_QUICK_INSERT,
     /**
@@ -54,15 +53,6 @@ export const quickInsertButtonDecoration = ({
         cb();
       });
     }
-  } : {
-    side: -2,
-    type: TYPE_QUICK_INSERT,
-    destroy: _ => {
-      nodeViewPortalProviderAPI.remove(key);
-      cleanupCallbacks.forEach(cb => {
-        cb();
-      });
-    }
   };
   return Decoration.widget(rootPos, (view, getPos) => {
     const element = document.createElement('span');

package/dist/es2019/pm-plugins/first-node-dec-plugin.js

@@ -2,18 +2,15 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const firstNodeDecPluginKey = new PluginKey('firstNodeDec');
 const createFirstNodeDecSet = state => {
   const firstNode = state.doc.firstChild;
   if (!firstNode) {
     return DecorationSet.empty;
   }
-  const firstNodeDecoration = expValEquals('platform_editor_breakout_resizing', 'isEnabled', true) ? Decoration.node(0, firstNode.nodeSize, {
+  const firstNodeDecoration = Decoration.node(0, firstNode.nodeSize, {
     style: 'margin-top: 0;',
     class: 'first-node-in-document'
-  }) : Decoration.node(0, firstNode.nodeSize, {
-    style: 'margin-top: 0'
   });
   return DecorationSet.create(state.doc, [firstNodeDecoration]);
 };

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

@@ -100,7 +100,8 @@ const destroyFn = (api, editorView) => {
       if (isHTMLElement(scrollable)) {
         scrollable.style.setProperty('scroll-behavior', null);
       }
-      if (fg('platform_editor_drag_and_drop_perf_analytics')) {
+      const shouldMeasureDrop = fg('platform_editor_drag_and_drop_perf_analytics') && !isExperimentEnabled('platform_editor_remove_legacy_perf_events');
+      if (shouldMeasureDrop) {
         startMeasure(EDITOR_BLOCKS_DROP_INIT);
       }
       if (!api) {
@@ -173,7 +174,7 @@ const destroyFn = (api, editorView) => {
           lastDragCancelled
         });
       });
-      if (fg('platform_editor_drag_and_drop_perf_analytics')) {
+      if (shouldMeasureDrop) {
         // wait for the idle callback to ensure that the drag operation has completed
         scheduleCallback(() => {
           if (isMeasuring(EDITOR_BLOCKS_DROP_INIT)) {
@@ -443,7 +444,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
 
   // Re-create node decorations
   const isDecSetEmpty = decorations === DecorationSet.empty;
-  const isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged || editorExperiment('platform_editor_breakout_resizing', true) && hasJustFinishedResizing;
+  const isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged || hasJustFinishedResizing;
   const shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging)) &&
   // Skip expensive anchor node decoration recalculations when native anchor support is enabled
   !(expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) || isExperimentEnabled('platform_editor_block_control_migration'));
@@ -1032,7 +1033,9 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
           if (api !== null && api !== void 0 && (_api$limitedMode5 = api.limitedMode) !== null && _api$limitedMode5 !== void 0 && (_api$limitedMode5$sha = _api$limitedMode5.sharedState.currentState()) !== null && _api$limitedMode5$sha !== void 0 && _api$limitedMode5$sha.enabled) {
             return;
           }
-          startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+          if (!isExperimentEnabled('platform_editor_remove_legacy_perf_events')) {
+            startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+          }
           if (isAdvancedLayoutEnabled) {
             defaultActiveAnchorTracker.reset();
           }

package/dist/es2019/ui/consts.js

@@ -58,7 +58,7 @@ export const dragHandleGap = (nodeType, parentNodeType) => {
   } else {
     breakoutResizableNodesList = expValEqualsNoExposure('platform_editor_lovability_resize_dividers_panels', 'isEnabled', true) ? [...breakoutResizableNodesNew, 'rule', 'panel'] : breakoutResizableNodesNew;
   }
-  if (editorExperiment('platform_editor_breakout_resizing', true) && breakoutResizableNodesList.includes(nodeType)) {
+  if (breakoutResizableNodesList.includes(nodeType)) {
     if (nodeType === 'layoutSection') {
       return DRAG_HANDLE_MAX_GAP + 20;
     } else {
@@ -82,7 +82,7 @@ export const rootElementGap = nodeType => {
   } else {
     breakoutResizableNodesList = expValEqualsNoExposure('platform_editor_lovability_resize_dividers_panels', 'isEnabled', true) ? [...breakoutResizableNodesNew, 'rule', 'panel'] : breakoutResizableNodesNew;
   }
-  if (nodeTypeExcludeList.includes(nodeType) || editorExperiment('platform_editor_breakout_resizing', true) && breakoutResizableNodesList.includes(nodeType)) {
+  if (nodeTypeExcludeList.includes(nodeType) || breakoutResizableNodesList.includes(nodeType)) {
     if (nodeType === 'layoutSection') {
       return DRAG_HANDLE_MAX_GAP + 20;
     } else {

package/dist/es2019/ui/use-block-controls-surface-drag-source.js

@@ -145,7 +145,9 @@ export const useBlockControlsSurfaceDragSource = ({
         }
 
         // This handle is outside ProseMirror, so it owns the side effects normally started by PM.
-        startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+        if (!isExperimentEnabled('platform_editor_remove_legacy_perf_events')) {
+          startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+        }
         defaultActiveAnchorTracker.reset();
         api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
           tr

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

@@ -4,7 +4,6 @@ import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { attachMoveNodeAnalytics, fireInsertLayoutAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { containsNodeOfType, isFragmentOfType } from '../pm-plugins/utils/check-fragment';
 import { isCollapsedHeading } from '../pm-plugins/utils/collapsed-heading';
@@ -160,10 +159,8 @@ var removeBreakoutMarks = function removeBreakoutMarks(tr, $from, to) {
     breakout = _ref4.breakout;
   tr.doc.nodesBetween($from.pos, to, function (node, pos, parent) {
     // should never remove breakout from previous layoutSection
-    if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
-      if (node.type.name === 'layoutSection') {
-        return false;
-      }
+    if (node.type.name === 'layoutSection') {
+      return false;
     }
 
     // breakout doesn't exist on nested nodes
@@ -180,28 +177,6 @@ var removeBreakoutMarks = function removeBreakoutMarks(tr, $from, to) {
   fromContentWithoutBreakout = tr.doc.slice($from.pos, to).content;
   return fromContentWithoutBreakout;
 };
-var getBreakoutMode = function getBreakoutMode(content, breakout) {
-  if (content instanceof PMNode) {
-    var _content$marks$find;
-    return (_content$marks$find = content.marks.find(function (m) {
-      return m.type === breakout;
-    })) === null || _content$marks$find === void 0 ? void 0 : _content$marks$find.attrs.mode;
-  } else if (content instanceof Fragment) {
-    // Find the first breakout mode in the fragment
-    var firstBreakoutMode;
-    for (var i = 0; i < content.childCount; i++) {
-      var child = content.child(i);
-      var breakoutMark = child.marks.find(function (m) {
-        return m.type === breakout;
-      });
-      if (breakoutMark) {
-        firstBreakoutMode = breakoutMark.attrs.mode;
-        break;
-      }
-    }
-    return firstBreakoutMode;
-  }
-};
 var getBreakoutModeAndWidth = function getBreakoutModeAndWidth(content, breakout) {
   var findBreakoutMark = function findBreakoutMark(node) {
     return node.marks.find(function (m) {
@@ -258,15 +233,9 @@ export var moveToLayout = function moveToLayout(api) {
 
       // get breakout mode from destination node,
       // if not found, get from source node,
-      var breakoutMode;
-      var breakoutWidth;
-      if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
-        var _ref8 = getBreakoutModeAndWidth(toNode, breakout) || getBreakoutModeAndWidth(sourceContent, breakout) || {};
-        breakoutMode = _ref8.breakoutMode;
+      var _ref8 = getBreakoutModeAndWidth(toNode, breakout) || getBreakoutModeAndWidth(sourceContent, breakout) || {},
+        breakoutMode = _ref8.breakoutMode,
         breakoutWidth = _ref8.breakoutWidth;
-      } else {
-        breakoutMode = getBreakoutMode(toNode, breakout) || getBreakoutMode(sourceContent, breakout);
-      }
 
       // we don't want to remove marks when moving/re-ordering layoutSection
       var shouldRemoveMarks = $sourceFrom.node().type !== layoutSection;
@@ -314,16 +283,10 @@ export var moveToLayout = function moveToLayout(api) {
           tr = removeFromSource(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
-          if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
-            breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
-              mode: breakoutMode,
-              width: breakoutWidth
-            })]);
-          } else {
-            breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
-              mode: breakoutMode
-            })]);
-          }
+          breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
+            mode: breakoutMode,
+            width: breakoutWidth
+          })]);
           if (fg('platform_editor_column_count_analytics')) {
             // layout created via drag and drop will always be 2 columns
             fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes, 2);

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

@@ -54,7 +54,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
   unmountDecorations(nodeViewPortalProviderAPI, 'data-blocks-drag-handle-container', 'data-blocks-drag-handle-key');
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var key = uuid();
-  var widgetSpec = editorExperiment('platform_editor_breakout_resizing', true) ? {
+  var widgetSpec = {
     side: -1,
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
@@ -65,12 +65,6 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
     marks: getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize])
-  } : {
-    side: -1,
-    type: TYPE_HANDLE_DEC,
-    // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-    testid: "".concat(TYPE_HANDLE_DEC, "-").concat(uuid()),
-    marks: getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize])
   };
   return Decoration.widget(pos, function (view, getPosUnsafe) {
     var element = document.createElement('span');

package/dist/esm/pm-plugins/decorations-quick-insert-button.js

@@ -4,7 +4,6 @@ import { createElement } from 'react';
 import { v4 as uuid } from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { ACTIVE_QUICK_INSERT_ATTR } from '../ui/consts';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
 import { getMatchingBlockMarks } from './utils/marks';
@@ -44,7 +43,7 @@ export var quickInsertButtonDecoration = function quickInsertButtonDecoration(_r
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var key = uuid();
   var cleanupCallbacks = [];
-  var widgetSpec = editorExperiment('platform_editor_breakout_resizing', true) ? {
+  var widgetSpec = {
     side: -2,
     type: TYPE_QUICK_INSERT,
     /**
@@ -60,15 +59,6 @@ export var quickInsertButtonDecoration = function quickInsertButtonDecoration(_r
         cb();
       });
     }
-  } : {
-    side: -2,
-    type: TYPE_QUICK_INSERT,
-    destroy: function destroy(_) {
-      nodeViewPortalProviderAPI.remove(key);
-      cleanupCallbacks.forEach(function (cb) {
-        cb();
-      });
-    }
   };
   return Decoration.widget(rootPos, function (view, getPos) {
     var element = document.createElement('span');

package/dist/esm/pm-plugins/first-node-dec-plugin.js

@@ -2,18 +2,15 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var firstNodeDecPluginKey = new PluginKey('firstNodeDec');
 var createFirstNodeDecSet = function createFirstNodeDecSet(state) {
   var firstNode = state.doc.firstChild;
   if (!firstNode) {
     return DecorationSet.empty;
   }
-  var firstNodeDecoration = expValEquals('platform_editor_breakout_resizing', 'isEnabled', true) ? Decoration.node(0, firstNode.nodeSize, {
+  var firstNodeDecoration = Decoration.node(0, firstNode.nodeSize, {
     style: 'margin-top: 0;',
     class: 'first-node-in-document'
-  }) : Decoration.node(0, firstNode.nodeSize, {
-    style: 'margin-top: 0'
   });
   return DecorationSet.create(state.doc, [firstNodeDecoration]);
 };

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

@@ -105,7 +105,8 @@ var destroyFn = function destroyFn(api, editorView) {
       if (isHTMLElement(scrollable)) {
         scrollable.style.setProperty('scroll-behavior', null);
       }
-      if (fg('platform_editor_drag_and_drop_perf_analytics')) {
+      var shouldMeasureDrop = fg('platform_editor_drag_and_drop_perf_analytics') && !isExperimentEnabled('platform_editor_remove_legacy_perf_events');
+      if (shouldMeasureDrop) {
         startMeasure(EDITOR_BLOCKS_DROP_INIT);
       }
       if (!api) {
@@ -172,7 +173,7 @@ var destroyFn = function destroyFn(api, editorView) {
           lastDragCancelled: lastDragCancelled
         }));
       });
-      if (fg('platform_editor_drag_and_drop_perf_analytics')) {
+      if (shouldMeasureDrop) {
         // wait for the idle callback to ensure that the drag operation has completed
         scheduleCallback(function () {
           if (isMeasuring(EDITOR_BLOCKS_DROP_INIT)) {
@@ -442,7 +443,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
 
   // Re-create node decorations
   var isDecSetEmpty = decorations === DecorationSet.empty;
-  var isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged || editorExperiment('platform_editor_breakout_resizing', true) && hasJustFinishedResizing;
+  var isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged || hasJustFinishedResizing;
   var shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging)) &&
   // Skip expensive anchor node decoration recalculations when native anchor support is enabled
   !(expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) || isExperimentEnabled('platform_editor_block_control_migration'));
@@ -1122,7 +1123,9 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           if (api !== null && api !== void 0 && (_api$limitedMode5 = api.limitedMode) !== null && _api$limitedMode5 !== void 0 && (_api$limitedMode5 = _api$limitedMode5.sharedState.currentState()) !== null && _api$limitedMode5 !== void 0 && _api$limitedMode5.enabled) {
             return;
           }
-          startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+          if (!isExperimentEnabled('platform_editor_remove_legacy_perf_events')) {
+            startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+          }
           if (isAdvancedLayoutEnabled) {
             defaultActiveAnchorTracker.reset();
           }

package/dist/esm/ui/consts.js

@@ -63,7 +63,7 @@ export var dragHandleGap = function dragHandleGap(nodeType, parentNodeType) {
   } else {
     breakoutResizableNodesList = expValEqualsNoExposure('platform_editor_lovability_resize_dividers_panels', 'isEnabled', true) ? [].concat(_toConsumableArray(breakoutResizableNodesNew), ['rule', 'panel']) : breakoutResizableNodesNew;
   }
-  if (editorExperiment('platform_editor_breakout_resizing', true) && breakoutResizableNodesList.includes(nodeType)) {
+  if (breakoutResizableNodesList.includes(nodeType)) {
     if (nodeType === 'layoutSection') {
       return DRAG_HANDLE_MAX_GAP + 20;
     } else {
@@ -87,7 +87,7 @@ export var rootElementGap = function rootElementGap(nodeType) {
   } else {
     breakoutResizableNodesList = expValEqualsNoExposure('platform_editor_lovability_resize_dividers_panels', 'isEnabled', true) ? [].concat(_toConsumableArray(breakoutResizableNodesNew), ['rule', 'panel']) : breakoutResizableNodesNew;
   }
-  if (nodeTypeExcludeList.includes(nodeType) || editorExperiment('platform_editor_breakout_resizing', true) && breakoutResizableNodesList.includes(nodeType)) {
+  if (nodeTypeExcludeList.includes(nodeType) || breakoutResizableNodesList.includes(nodeType)) {
     if (nodeType === 'layoutSection') {
       return DRAG_HANDLE_MAX_GAP + 20;
     } else {

package/dist/esm/ui/use-block-controls-surface-drag-source.js

@@ -142,7 +142,9 @@ export var useBlockControlsSurfaceDragSource = function useBlockControlsSurfaceD
         }
 
         // This handle is outside ProseMirror, so it owns the side effects normally started by PM.
-        startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+        if (!isExperimentEnabled('platform_editor_remove_legacy_perf_events')) {
+          startMeasure(EDITOR_BLOCKS_DRAG_INIT);
+        }
         defaultActiveAnchorTracker.reset();
         api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref5) {
           var _api$blockControls$sh2, _resolvedMovingNode$n, _api$blockControls2, _api$analytics;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "25.0.2",
+	"version": "25.0.4",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -61,7 +61,7 @@
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^222.0.0",
+		"@atlaskit/tmp-editor-statsig": "^224.0.0",
 		"@atlaskit/tokens": "^20.3.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@babel/runtime": "^7.0.0",